unify(ww3d2): Merge WW3D and move it to Core - #3012
Conversation
|
| Filename | Overview |
|---|---|
| Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt | Adds the moved WW3D implementation and header to the shared interface source list consumed by both game libraries. |
| Core/Libraries/Source/WWVegas/WW3D2/ww3d.cpp | Relocates the existing Zero Hour WW3D implementation into Core without content changes. |
| Core/Libraries/Source/WWVegas/WW3D2/ww3d.h | Relocates the existing WW3D public interface into Core without content changes. |
| Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt | Stops compiling the deleted Generals-local implementation so the target consumes the shared Core source. |
| GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt | Stops compiling the moved Zero Hour implementation locally so the target consumes the shared Core source. |
| scripts/cpp/unify_move_files.py | Documents the completed WW3D file unification through commented maintenance-script entries. |
Flowchart
%%{init: {'theme': 'neutral'}}%%
flowchart LR
Core["corei_ww3d2<br/>shared ww3d.cpp / ww3d.h"]
Generals["g_ww3d2<br/>RTS_GENERALS"]
ZeroHour["z_ww3d2<br/>RTS_ZEROHOUR"]
Core --> Generals
Core --> ZeroHour
Reviews (5): Last reviewed commit: "unify(ww3d2): Move WW3D to Core" | Re-trigger Greptile
a0dd61d to
902892d
Compare
902892d to
701dc6b
Compare
021c46d to
b285605
Compare
| #include "WWLib/always.h" | ||
| #include "WWLib/bittype.h" | ||
| #include "ww3d.h" | ||
| #include "WW3D2/ww3d.h" |
There was a problem hiding this comment.
I think so. mapper.h and rinfo.h in both game trees still include ww3d.h bare. Those two headers are pulled in from outside the ww3d2 targets, and those get the WWVegas roots but not the WW3D2 subdirs. They're now WW3D2/ww3d.h, matching #3032's rule of qualifying header edges that cross the Core/product partition.
There was a problem hiding this comment.
Right, the headers must have fully qualified paths because they can be included by other libs.
xezon
left a comment
There was a problem hiding this comment.
pull id is missing in commit titles.
Can say ww3d instead of WW3D because of the file name. WW3D is class name.
b285605 to
b7d3181
Compare
Generals and Zero Hour differ only by comments and the disabled WWShade
SHD_FLUSHhook.Now Generals uses the Zero Hour implementation, and
ww3d.cppandww3d.hare moved to Core usingunify_move_files.pyTodo: