1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 14:54:30 +01:00
Commit Graph

191 Commits

Author SHA1 Message Date
Aaron van Geffen
bb94ee8bc0 Rename ObjectType enum to follow recent code style (#23810) 2025-02-13 23:07:55 +01:00
73
b9b2c96c97 Rename sprites.h to SpriteIds.h (#23804) 2025-02-13 15:51:46 +00:00
Michael Steenbeek
b0c99fcb6c Refactor more constants to kConstant notation 2025-01-22 16:16:55 +00:00
Aaron van Geffen
5fbe8d0ae1 Centralise external window signatures in Windows.h (#23653) 2025-01-19 15:50:54 +01:00
Aaron van Geffen
bed4d5bdca Move WindowCreate and WindowFocusOrCreate into WindowManager (#23643)
* Move WindowBringToFront into WindowManager

* Move WindowCreate and WindowFocusOrCreate into WindowManager

* Cut back on Context/UiContext includes
2025-01-19 06:58:28 -03:00
Matt
b9f6b6f754 Refactor widgets state (#23621)
* Refactor windows to not share widget state

* First half of refactoring all the windows

* Refactor the remaining windows, compiles but has issues

* Fix drawing only every second widget

* Remove the need of an terminating widget

* Address WidgetIndex signedness issues; use kWidgetIndexNull more

* Address constexpr issue with Widget content union

* Fix tabs in scenery window

* Fix tabs in object selection window

* Adjust custom widget index for CustomTool events

* Use STR_NONE for default tooltip initialisation

* Adjustment for mingw compiler

* Fix bottom toolbar using the widget declaration not instance

* Remove pointless code in Guest window, handled by SetPage

* Prevent out of bounds crash

* Move scroll widgets initialization to SetPage in Cheats window

* Remove special logic in Options window

* Remove special logic in Park window

* Remove special logic for Player window

* Remove special logic for Research window

* Remove special logic for Ride window

* Remove special logic for Staff window

* Remove special logic for Finances window

* Remove special logic for MapGen window

* Remove special logic for editor objective options window

* Remove special logic for editor scenario options window

* Fix widgets not being set since page is initialized to 0

* Remove more redundant code

* Fix remaining access to widget declarations

* Remove unused variable

* Fix editor object selection tabs on successive windows

---------

Co-authored-by: Aaron van Geffen <aaron@aaronweb.net>
2025-01-18 13:45:17 +01:00
Aaron van Geffen
c0505bb164 Fix mapgen window reverting to flatland when selecting heightmap image 2025-01-02 12:30:51 +01:00
Aaron van Geffen
8cf9142b87 Encapsulate map generator in World::MapGenerator namespace 2024-12-30 16:21:22 +01:00
Aaron van Geffen
c5508bcf1d Split off PngTerrainGenerator, SimplexNoise units 2024-12-30 15:11:40 +01:00
Aaron van Geffen
8562545138 Move MapGen and MapHelpers units into map_generator folder 2024-12-30 14:46:47 +01:00
Aaron van Geffen
fa06a49302 Update copyright year to 2025 (#23514) 2024-12-31 20:30:04 +01:00
ζeh Matt
9dfd4f3b19 Rename the callback types 2024-12-04 20:43:55 +02:00
ζeh Matt
e86618e835 Make sure the callback is not converted to void* 2024-12-04 16:46:35 +02:00
Aaron van Geffen
ece199176e Move UnitConversion from Util into its own compilation unit 2024-10-29 11:27:00 +01:00
Aaron van Geffen
1c61c24ec2 Add clamp to map size text input (#23050) 2024-10-25 19:34:26 +02:00
Michael Steenbeek
a2ed026264 Split up remaining tile elements 2024-10-15 22:02:31 +02:00
Aaron van Geffen
717501c646 Make smooth strength field clickable 2024-09-23 14:55:04 +02:00
Aaron van Geffen
0abfce9ba6 Show current height map image file in window 2024-09-23 14:49:52 +02:00
Aaron van Geffen
297be375fb Disable widgets for irrelevant options in flatland terrain mode
This disables the smooth tile edges, max terrain height, and max forest height widgets.
2024-09-23 14:17:04 +02:00
Aaron van Geffen
b1540b84dc Disable map size controls when height map images are used 2024-09-22 21:28:15 +02:00
Aaron van Geffen
daba4310d1 Grey-out tree parameters when tree placement is unchecked 2024-09-22 11:16:50 +02:00
Aaron van Geffen
0be51dd565 Move default settings to MapGen header 2024-09-12 18:17:19 +02:00
Aaron van Geffen
7a7472462b Merge simplex noise options into one
Adjust heightmap source dropdown width; keep open
2024-09-12 17:44:47 +02:00
Aaron van Geffen
9b11e69550 Consolidate base height setting into min land height setting 2024-09-12 17:30:00 +02:00
Aaron van Geffen
c7b4b46d9a Increase min/max land height and tree altitude more logically 2024-09-11 23:26:15 +02:00
Aaron van Geffen
d03fbef0e7 Add text input event to remaining numerical fields 2024-09-11 17:20:08 +02:00
Aaron van Geffen
fcbe1aaf92 Display height units in preferred length measurement unit 2024-09-11 17:08:20 +02:00
Aaron van Geffen
cd5e55a1ba Replace custom constants with map constants 2024-09-10 22:24:12 +02:00
Aaron van Geffen
56ef87cb54 Remove terrain height setting map from GenerateMap 2024-09-10 22:19:15 +02:00
Aaron van Geffen
1ad9bc4786 Change terrain widget order once more 2024-09-10 22:09:49 +02:00
Aaron van Geffen
23edd3c0d0 Deduplicate some code shared between blank and simplex generators 2024-09-10 21:35:46 +02:00
Aaron van Geffen
e10e554872 Change icons for terrain tab and forests tab 2024-09-10 20:57:03 +02:00
Aaron van Geffen
df5dcfce48 Add settings for number of trees, min/max tree altitude 2024-09-10 20:45:38 +02:00
Aaron van Geffen
6f83e44a82 Add custom window captions for each page 2024-09-10 20:10:58 +02:00
Aaron van Geffen
a2b572b6f3 Apply texture preferences to height map images; blank maps 2024-09-10 19:39:21 +02:00
Aaron van Geffen
c5b8b91b17 Move forests tab to the end 2024-09-10 19:19:15 +02:00
Aaron van Geffen
fc5ad2a663 Adjust window dimensions, resize and move widgets 2024-09-10 19:13:37 +02:00
Aaron van Geffen
6d6dc95a91 Consolitate simplex and heightmap settings in generator tab 2024-09-10 17:54:25 +02:00
Aaron van Geffen
457a923178 Move smooth tile edges option to terrain tab, apply to all generators 2024-09-10 15:27:15 +02:00
Aaron van Geffen
eb5471346a Unify min/max land height settings in terrain tab 2024-09-10 15:08:57 +02:00
Aaron van Geffen
0c4429e60f Rename baseHeight, waterLevel, landTexture, edgeTexture settings 2024-09-10 14:56:54 +02:00
Aaron van Geffen
e2d05642ae Unify low/high parameters using kMaximumLandHeight 2024-09-10 14:34:46 +02:00
Aaron van Geffen
b434e1bc35 Clarify height map parameters and integrate into MapGenSettings 2024-09-10 14:13:31 +02:00
Aaron van Geffen
6398c066a7 Unify generator buttons for all tabs 2024-09-10 13:51:14 +02:00
Aaron van Geffen
710fbfbf9a Make beaches around water bodies a general option for all generators 2024-09-10 12:41:28 +02:00
Aaron van Geffen
44268fd758 Make tree placement available to all generator algorithms 2024-09-10 12:17:56 +02:00
Aaron van Geffen
6545ab33f2 Unify interface for calling internal map generator 2024-09-10 12:14:01 +02:00
Aaron van Geffen
403495cacf Rename internal map generator functions 2024-09-10 11:21:09 +02:00
Aaron van Geffen
0607f55f14 Consolidate terrain and water settings in two new dedicated tabs 2024-09-09 20:17:33 +02:00
Aaron van Geffen
0c9c79d186 ChangeMapSize: use templated std::clamp and drop static casts 2024-09-08 22:44:27 +02:00