Skip to content

unify(ww3d2): Merge WW3D and move it to Core #3012

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.

Sign up for GitHub

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
xezon merged 2 commits into from
Aug 1, 2026
Merged

unify(ww3d2): Merge WW3D and move it to Core #3012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d322e7
unify(ww3d2): Merge ww3d (#3012)
bobtista Aug 1, 2026
b7d3181
unify(ww3d2): Move ww3d to Core (#3012)
bobtista Aug 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,8 @@ set(WW3D2_SRC
w3derr.h
w3dexclusionlist.cpp
w3dexclusionlist.h
#ww3d.cpp
#ww3d.h
ww3d.cpp
ww3d.h
ww3dformat.cpp
ww3dformat.h
ww3dids.h
Expand Down
0 ...e/Libraries/Source/WWVegas/WW3D2/ww3d.cpp → Core/Libraries/Source/WWVegas/WW3D2/ww3d.cpp
View file
Open in desktop
File renamed without changes.
0 ...ode/Libraries/Source/WWVegas/WW3D2/ww3d.h → Core/Libraries/Source/WWVegas/WW3D2/ww3d.h
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,8 @@ set(WW3D2_SRC
#w3derr.h
#w3dexclusionlist.cpp
#w3dexclusionlist.h
ww3d.cpp
ww3d.h
# ww3d.cpp
# ww3d.h
#ww3dformat.cpp
#ww3dformat.h
#ww3dids.h
Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#include "WW3D2/w3derr.h"
#include "WWMath/vector2.h"
#include "WWMath/vector3.h"
#include "ww3d.h"
#include "WW3D2/ww3d.h"
#include "WWMath/matrix4.h"

class INIClass;
Expand Down
2 changes: 1 addition & 1 deletion Generals/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

#include "WWLib/always.h"
#include "WWLib/bittype.h"
#include "ww3d.h"
#include "WW3D2/ww3d.h"

@xezon xezon Aug 1, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Is this still needed?

@bobtista bobtista Aug 1, 2026

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

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.

@xezon xezon Aug 1, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Right, the headers must have fully qualified paths because they can be included by other libs.

#include "WWDebug/wwdebug.h"
#include "shader.h"
#include "WWLib/Vector.h"
Expand Down
2,117 changes: 0 additions & 2,117 deletions Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp
View file
Open in desktop

This file was deleted.

484 changes: 0 additions & 484 deletions Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,8 @@ set(WW3D2_SRC
#w3derr.h
#w3dexclusionlist.cpp
#w3dexclusionlist.h
ww3d.cpp
ww3d.h
# ww3d.cpp
# ww3d.h
#ww3dformat.cpp
#ww3dformat.h
#ww3dids.h
Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#include "WW3D2/w3derr.h"
#include "WWMath/vector2.h"
#include "WWMath/vector3.h"
#include "ww3d.h"
#include "WW3D2/ww3d.h"
#include "WWMath/matrix4.h"

class INIClass;
Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rinfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

#include "WWLib/always.h"
#include "WWLib/bittype.h"
#include "ww3d.h"
#include "WW3D2/ww3d.h"
#include "WWDebug/wwdebug.h"
#include "shader.h"
#include "WWLib/Vector.h"
Expand Down
3 changes: 3 additions & 0 deletions scripts/cpp/unify_move_files.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,9 @@ def main():
#unify_file_lib(Game.ZEROHOUR, "Libraries/Source/WWVegas/WW3D2/sortingrenderer.h", Game.CORE, "Libraries/Source/WWVegas/WW3D2/sortingrenderer.h")
#unify_file_lib(Game.ZEROHOUR, "Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp", Game.CORE, "Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp")

#unify_file_lib(Game.ZEROHOUR, "Libraries/Source/WWVegas/WW3D2/ww3d.h", Game.CORE, "Libraries/Source/WWVegas/WW3D2/ww3d.h")
#unify_file_lib(Game.ZEROHOUR, "Libraries/Source/WWVegas/WW3D2/ww3d.cpp", Game.CORE, "Libraries/Source/WWVegas/WW3D2/ww3d.cpp")

#unify_move_file(Game.ZEROHOUR, "GameEngine/Include/Common/AcademyStats.h", Game.CORE, "GameEngine/Include/Common/AcademyStats.h")
#unify_move_file(Game.ZEROHOUR, "GameEngine/Source/Common/RTS/AcademyStats.cpp", Game.CORE, "GameEngine/Source/Common/RTS/AcademyStats.cpp")

Expand Down
Loading