unify(worldbuilder): Move unified WorldBuilder to Core - #3026
Open
OmarAglan wants to merge 3 commits into
Open
Conversation
|
| Filename | Overview |
|---|---|
| Core/Tools/WorldBuilder/CMakeLists.txt | Defines the shared interface target and propagates the complete WorldBuilder source, resource, PCH, include, and platform-link configuration. |
| Core/Tools/CMakeLists.txt | Registers the shared WorldBuilder directory whenever either game’s tools are enabled. |
| Generals/Code/Tools/WorldBuilder/CMakeLists.txt | Reduces the Generals editor to a wrapper while preserving its engine links, compile definition, and output name. |
| GeneralsMD/Code/Tools/WorldBuilder/CMakeLists.txt | Reduces the Zero Hour editor to a wrapper while preserving its additional debug/profile dependencies and output identity. |
| Core/Tools/WorldBuilder/res/WorldBuilder.rc | Consolidates editor resources and selects the game-specific splash bitmap through the consuming target’s compile definition. |
| Generals/Code/GameEngine/Source/GameLogic/Map/PolygonTrigger.cpp | Brings Generals polygon-trigger layer serialization up to the interface expected by the unified editor. |
| Core/Tools/WorldBuilder/src/WHeightMapEdit.cpp | Provides the synchronized shared height-map editor implementation, including game-specific blend-tile serialization behavior. |
Flowchart
%%{init: {'theme': 'neutral'}}%%
flowchart TD
Shared["corei_worldbuilder<br/>shared sources, headers, resources"]
Generals["g_worldbuilder<br/>RTS_GENERALS"]
ZeroHour["z_worldbuilder<br/>RTS_ZEROHOUR"]
GEngine["Generals engine/device"]
ZEngine["Zero Hour engine/device"]
GSplash["WorldBuilderV.bmp"]
ZSplash["WorldBuilderZH.bmp"]
Shared --> Generals
Shared --> ZeroHour
GEngine --> Generals
ZEngine --> ZeroHour
Generals --> GSplash
ZeroHour --> ZSplash
Reviews (1): Last reviewed commit: "unify(worldbuilder): Move WorldBuilder t..." | Re-trigger Greptile
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge with Rebase
After the Generals and Zero Hour WorldBuilder implementations are synchronized, keeping duplicate editor trees would allow them to drift apart again. The shared implementation should live in Core while each game keeps its own executable target and configuration.
This pull moves the unified implementation to Core:
Core/Tools/WorldBuilder.corei_worldbuilderinterface target provides the shared implementation to both games.RTS_GENERALSorRTS_ZEROHOUR.No editor behavior is intentionally changed here. The implementation was synchronized in #3025; this pull only gives the shared files a single owner.
This branch is based on #3025, so GitHub will show the first two commits in the series until #3024 and #3025 are merged with rebase.
Testing
git diff --checkWorldBuilderV.bmpfor Generals andWorldBuilderZH.bmpfor Zero HourNote: i Used Chatgpt Codex In some aspects, to be known.