unify(client): Move W3DDevice GameClient files to Core#2580
unify(client): Move W3DDevice GameClient files to Core#2580DevGeniusCode wants to merge 6 commits intoTheSuperHackers:mainfrom
Conversation
|
| Filename | Overview |
|---|---|
| Core/GameEngine/CMakeLists.txt | Uncomments ~35 previously-inactive GameClient header and source entries that now live in Core/; no structural issues found. |
| Core/GameEngineDevice/CMakeLists.txt | Uncomments W3DDevice GUI, Gadget, Shadow, and misc sources; mirrors the GameEngine change with no errors detected. |
| Generals/Code/GameEngine/CMakeLists.txt | Comments out the same ~35 entries that now live in Core; Generals-specific files (Drawable.h, CampaignManager.h, etc.) remain active. |
| GeneralsMD/Code/GameEngine/CMakeLists.txt | Comments out the unified set; GeneralsMD-specific files (Drawable.h, SelectionXlat.h, etc.) stay active as expected. |
| scripts/cpp/unify_move_files.py | Helper script that moves files and patches CMakeLists; logic is correct — reads lines, updates in-place, writes once. No functional bugs detected. |
| Core/GameEngineDevice/Source/W3DDevice/GameClient/W3DDynamicLight.cpp | New Core copy of W3DDynamicLight; GPL header present, content matches the GeneralsMD original. |
| Core/GameEngine/Include/GameClient/Shadow.h | New Core copy; uses #pragma once, GPL header present, content is identical to the GeneralsMD original. |
Flowchart
%%{init: {'theme': 'neutral'}}%%
flowchart TD
A["Generals/Code/GameEngine\n(~35 headers + sources)"] -->|"deleted / commented-out\nin CMakeLists"| C
B["GeneralsMD/Code/GameEngine\n(~35 identical headers + sources)"] -->|"deleted / commented-out\nin CMakeLists"| C
C["Core/GameEngine\n(new canonical location)"]
D["Generals/Code/GameEngineDevice\n(W3D GUI, Gadgets, Shadow, Shaders)"] -->|"deleted / commented-out\nin CMakeLists"| F
E["GeneralsMD/Code/GameEngineDevice\n(W3D GUI, Gadgets, Shadow, Shaders)"] -->|"deleted / commented-out\nin CMakeLists"| F
F["Core/GameEngineDevice\n(new canonical location)"]
G["scripts/cpp/unify_move_files.py"] -->|"automates move +\nCMake patch"| C
G -->|"automates move +\nCMake patch"| F
style C fill:#2d6a2d,color:#fff
style F fill:#2d6a2d,color:#fff
style G fill:#555,color:#fff
Reviews (1): Last reviewed commit: "unify(client): Move several GameEngineDe..." | Re-trigger Greptile
|
It is too much in one go. It will cause massive conflicts with other changes. Break it down into smaller units one at a time. |
Summary
Following the previous unification, this PR moves the W3DDevice GameClient files from
GeneralsandGeneralsMDinto theCoredirectory.