Skip to content

Refactor map generator and move it into its own namespace #23509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jan 2, 2025

Conversation

AaronVanGeffen
Copy link
Member

@AaronVanGeffen AaronVanGeffen commented Dec 30, 2024

This PR splits up the map generator compilation unit into smaller, generator-specific units. Along the way, a namespace structure is adopted, making it easier to extend the map generator in the (near) future.

@AaronVanGeffen AaronVanGeffen marked this pull request as ready for review December 30, 2024 15:55
@AaronVanGeffen AaronVanGeffen changed the title Split up map generator file Refactor map generator into smaller units and move it into its own namespace Dec 31, 2024
@AaronVanGeffen AaronVanGeffen changed the title Refactor map generator into smaller units and move it into its own namespace Refactor map generator and move it into its own namespace Dec 31, 2024
Copy link
Member

@tupaschoal tupaschoal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't tested it, but code-wise it seems to be fine, as most commits only move code around. Just need to make sure d997845 is doing as before and it should be good to go.

@AaronVanGeffen
Copy link
Member Author

Just need to make sure d997845 is doing as before and it should be good to go.

That's currently only used by the Simplex Noise generator, fwiw. It seems to work fine on my end.

I think this does need to be tested by someone else before this is merged, though.

@AaronVanGeffen AaronVanGeffen added this to the v0.4.18 milestone Dec 31, 2024
@AaronVanGeffen AaronVanGeffen linked an issue Jan 2, 2025 that may be closed by this pull request
@AaronVanGeffen
Copy link
Member Author

I've done some more thorough testing on my end. This revealed a minor bug which was also present on develop (fixed in c0505bb), and led me to realise what was causing #23135 (fixed in bf13a12).

This is ready to be merged, as far as I'm concerned.

@AaronVanGeffen AaronVanGeffen force-pushed the mapgen-refactor branch 3 times, most recently from 7f099c8 to 167daaa Compare January 2, 2025 12:06
@AaronVanGeffen AaronVanGeffen merged commit 404c72e into OpenRCT2:develop Jan 2, 2025
23 checks passed
@AaronVanGeffen AaronVanGeffen deleted the mapgen-refactor branch January 2, 2025 12:19
janisozaur added a commit that referenced this pull request Jan 5, 2025
- Improved: [#23200] Add banked sloped turns and many other pieces to the Stand-Up and Classic Stand-Up Roller Coaster.
- Improved: [#23260] Add diagonal (block) brakes to LSM Launched Roller Coaster.
- Improved: [#23350] Increased the maximum width of the ride graph window.
- Improved: [#23404] Folders are now paired with an icon in the load/save window.
- Improved: [#23405] Filenames can now be input directly into the file browser (load/save) window.
- Improved: [#23431] Opaque water and Corkscrew Roller Coaster boosters now show up if RCT1 isn’t linked.
- Improved: [objects#369] Updated Russian translation.
- Change: [#23413] The max number of park entrance objects has been raised to 255.
- Fix: [#1122] Trains spawned on a cable lift hill will fall down and crash (original bug).
- Fix: [#19780] Guest screams loop on long drops.
- Fix: [#22742, #22793] In game console does not handle format tokens properly.
- Fix: [#23135] Map generator tree placement has noticable patterns.
- Fix: [#23286] Currency formatted incorrectly in the in game console.
- Fix: [#23348] Console set commands don't print output properly.
- Fix: [#23376] Peeps with balloons, hats and umbrellas may leave artifacts on screen.
- Fix: [#23486] Object selection minimum requirements can be bypassed with close window hotkey.
- Fix: [#23496] Newly spawned vehicles are invisible when spawned while the game is paused.
- Fix: [#23509] Map generator window reverts to flatland after selecting a heightmap image.
- Fix: [objects#359] Fix water colours in Hover Cars preview image.
- Fix: [objects#361] Fix water colours in River Styx boats preview image.
- Fix: [objects#362] Fix water colours in Neptune Ride preview image.
- Fix: [objects#363] Fix water colours in Harpies Trains preview image.
janisozaur added a commit that referenced this pull request Jan 8, 2025
- Improved: [#23200] Add banked sloped turns and many other pieces to the Stand-Up and Classic Stand-Up Roller Coaster.
- Improved: [#23260] Add diagonal (block) brakes to LSM Launched Roller Coaster.
- Improved: [#23350] Increased the maximum width of the ride graph window.
- Improved: [#23404] Folders are now paired with an icon in the load/save window.
- Improved: [#23405] Filenames can now be input directly into the file browser (load/save) window.
- Improved: [#23431] Opaque water and Corkscrew Roller Coaster boosters now show up if RCT1 isn’t linked.
- Improved: [objects#369] Updated Russian translation.
- Change: [#23413] The max number of park entrance objects has been raised to 255.
- Fix: [#1122] Trains spawned on a cable lift hill will fall down and crash (original bug).
- Fix: [#19780] Guest screams loop on long drops.
- Fix: [#22742, #22793] In game console does not handle format tokens properly.
- Fix: [#23135] Map generator tree placement has noticable patterns.
- Fix: [#23286] Currency formatted incorrectly in the in game console.
- Fix: [#23348] Console set commands don't print output properly.
- Fix: [#23376] Peeps with balloons, hats and umbrellas may leave artifacts on screen.
- Fix: [#23486] Object selection minimum requirements can be bypassed with close window hotkey.
- Fix: [#23496] Newly spawned vehicles are invisible when spawned while the game is paused.
- Fix: [#23509] Map generator window reverts to flatland after selecting a heightmap image.
- Fix: [objects#359] Fix water colours in Hover Cars preview image.
- Fix: [objects#361] Fix water colours in River Styx boats preview image.
- Fix: [objects#362] Fix water colours in Neptune Ride preview image.
- Fix: [objects#363] Fix water colours in Harpies Trains preview image.
CorySanin added a commit to CorySanin/OpenRCT2 that referenced this pull request Feb 3, 2025
Release v0.4.18

- Improved: [OpenRCT2#23200] Add banked sloped turns and many other pieces to the Stand-Up and Classic Stand-Up Roller Coaster.
- Improved: [OpenRCT2#23260] Add diagonal (block) brakes to LSM Launched Roller Coaster.
- Improved: [OpenRCT2#23350] Increased the maximum width of the ride graph window.
- Improved: [OpenRCT2#23404] Folders are now paired with an icon in the load/save window.
- Improved: [OpenRCT2#23405] Filenames can now be input directly into the file browser (load/save) window.
- Improved: [OpenRCT2#23431] Opaque water and Corkscrew Roller Coaster boosters now show up if RCT1 isn’t linked.
- Improved: [objects#369] Updated Russian translation.
- Change: [OpenRCT2#23413] The max number of park entrance objects has been raised to 255.
- Fix: [OpenRCT2#1122] Trains spawned on a cable lift hill will fall down and crash (original bug).
- Fix: [OpenRCT2#19780] Guest screams loop on long drops.
- Fix: [OpenRCT2#22742, OpenRCT2#22793] In game console does not handle format tokens properly.
- Fix: [OpenRCT2#23135] Map generator tree placement has noticable patterns.
- Fix: [OpenRCT2#23286] Currency formatted incorrectly in the in game console.
- Fix: [OpenRCT2#23348] Console set commands don't print output properly.
- Fix: [OpenRCT2#23376] Peeps with balloons, hats and umbrellas may leave artifacts on screen.
- Fix: [OpenRCT2#23496] Newly spawned vehicles are invisible when spawned while the game is paused.
- Fix: [OpenRCT2#23509] Map generator window reverts to flatland after selecting a heightmap image.
- Fix: [objects#359] Fix water colours in Hover Cars preview image.
- Fix: [objects#361] Fix water colours in River Styx boats preview image.
- Fix: [objects#362] Fix water colours in Neptune Ride preview image.
- Fix: [objects#363] Fix water colours in Harpies Trains preview image.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Tree placement has noticable patterns
2 participants