Skip to content

chore: Restore full relative include visibility in WWVegas libraries #3032

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

chore: Restore full relative include visibility in WWVegas libraries #3032

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
98c6185
fix(wwvegas): Restore component include visibility
CryoTheRenegade Jul 29, 2026
9c6f5a1
chore(wwlib): Keep precompiled headers qualified
CryoTheRenegade Jul 30, 2026
20a0d56
fix(wwvegas): Propagate WW3D2 include overlay
CryoTheRenegade Jul 30, 2026
43ce165
fix(wwvegas): Keep WWAudio outside WW3D2 overlay
CryoTheRenegade Jul 31, 2026
8783bb0
fix(wwvegas): Keep WW3D2 overlay private
CryoTheRenegade Jul 31, 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
2 changes: 2 additions & 0 deletions Core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
# i stands for Interface
add_library(corei_gameengine_include INTERFACE)
add_library(corei_ww3d2_include INTERFACE)
add_library(corei_libraries_include INTERFACE)
add_library(corei_libraries_source_wwvegas INTERFACE)
add_library(corei_main INTERFACE)
add_library(corei_always INTERFACE)
add_library(corei_always_no_pch INTERFACE) # Use this for Shared Libs with MFC AFX

target_include_directories(corei_gameengine_include INTERFACE "GameEngine/Include")
target_include_directories(corei_ww3d2_include INTERFACE "Libraries/Source/WWVegas/WW3D2")
target_include_directories(corei_libraries_include INTERFACE "Libraries/Include")
target_include_directories(corei_libraries_source_wwvegas INTERFACE "Libraries/Source/WWVegas")
target_include_directories(corei_main INTERFACE "Main")
Expand Down
1 change: 1 addition & 0 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 @@ -245,6 +245,7 @@ endif()

target_link_libraries(corei_ww3d2 INTERFACE
core_browserengine
corei_ww3d2_include
core_wwlib
core_wwmath
)
6 changes: 3 additions & 3 deletions Core/Libraries/Source/WWVegas/WW3D2/aabtree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@


#include "aabtree.h"
#include "WW3D2/aabtreebuilder.h"
#include "aabtreebuilder.h"
#include "WWDebug/wwdebug.h"
#include "WWMath/tri.h"
#include "WW3D2/meshgeometry.h"
#include "meshgeometry.h"
#include "coltest.h"
#include "inttest.h"
#include "WWMath/colmathinlines.h"
#include "WW3D2/w3d_file.h"
#include "w3d_file.h"
#include "WWLib/chunkio.h"


Expand Down
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WW3D2/aabtree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
#include "WWLib/bittype.h"
#include "WWMath/colmath.h"
#include "WWDebug/wwdebug.h"
#include "WW3D2/aabtreebuilder.h"
#include "aabtreebuilder.h"
#include "WWMath/obbox.h"
#include <WWMath/tri.h>
#include <float.h>
Expand Down
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WW3D2/agg_def.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#include "w3derr.h"
#include "WWLib/chunkio.h"
#include "WWDebug/wwdebug.h"
#include "WW3D2/assetmgr.h"
#include "assetmgr.h"
#include "matinfo.h"
#include "texture.h"
#include "WWLib/wwstring.h"
Expand Down
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WW3D2/agg_def.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

#include "proto.h"
#include "rendobj.h"
#include "WW3D2/w3d_file.h"
#include "w3d_file.h"
#include "w3derr.h"
#include "WWLib/Vector.h"
#include "WWLib/bittype.h"
Expand Down
4 changes: 2 additions & 2 deletions Core/Libraries/Source/WWVegas/WW3D2/bmp2d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@

#include "bmp2d.h"
#include "WWMath/pot.h"
#include "WW3D2/ww3d.h"
#include "ww3d.h"
#include "texture.h"
#include "surfaceclass.h"
#include "WW3D2/assetmgr.h"
#include "assetmgr.h"
#include "textureloader.h"
#include "ww3dformat.h"

Expand Down
6 changes: 3 additions & 3 deletions Core/Libraries/Source/WWVegas/WW3D2/collect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@

#include "collect.h"
#include "WWLib/chunkio.h"
#include "WW3D2/camera.h"
#include "camera.h"
#include "WWDebug/wwdebug.h"
#include "snapPts.h"
#include "WW3D2/assetmgr.h"
#include "WW3D2/ww3d.h"
#include "assetmgr.h"
#include "ww3d.h"
#include "w3derr.h"
//#include "sr.hpp"

Expand Down
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WW3D2/collect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
#include "composite.h"
#include "WWLib/Vector.h"
#include "proto.h"
#include "WW3D2/w3d_file.h"
#include "w3d_file.h"
#include "WWLib/wwstring.h"
#include "proxy.h"

Expand Down
6 changes: 3 additions & 3 deletions Core/Libraries/Source/WWVegas/WW3D2/decalsys.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@

#include "decalsys.h"
#include "rendobj.h"
#include "WW3D2/mesh.h"
#include "WW3D2/decalmsh.h"
#include "WW3D2/matrixmapper.h"
#include "mesh.h"
#include "decalmsh.h"
#include "matrixmapper.h"
#include "texture.h"


Expand Down
10 changes: 5 additions & 5 deletions Core/Libraries/Source/WWVegas/WW3D2/distlod.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,14 @@

#include "distlod.h"
#include "WWLib/nstrdup.h"
#include "WW3D2/ww3d.h"
#include "WW3D2/assetmgr.h"
#include "WW3D2/camera.h"
#include "ww3d.h"
#include "assetmgr.h"
#include "camera.h"
#include "w3derr.h"
#include "WWDebug/wwdebug.h"
#include "WWLib/chunkio.h"
#include "WW3D2/hlod.h"
#include "WW3D2/rinfo.h"
#include "hlod.h"
#include "rinfo.h"
#include "coltest.h"
#include "inttest.h"

Expand Down
4 changes: 2 additions & 2 deletions Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
#pragma once

#include "WWLib/always.h"
#include "WW3D2/meshmdl.h"
#include "meshmdl.h"
#include "dx8list.h"
#include "sortingrenderer.h"
#include "WW3D2/mesh.h"
#include "mesh.h"
#include "dx8wrapper.h"

class DX8PolygonRendererClass;
Expand Down
10 changes: 5 additions & 5 deletions Core/Libraries/Source/WWVegas/WW3D2/dx8renderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@
#include "WWDebug/wwdebug.h"
#include "WWDebug/wwprofile.h"
#include "WWDebug/wwmemlog.h"
#include "WW3D2/rinfo.h"
#include "rinfo.h"
#include "statistics.h"
#include "WW3D2/meshmdl.h"
#include "meshmdl.h"
#include "WWMath/vp.h"
#include "WW3D2/decalmsh.h"
#include "decalmsh.h"
#include "matpass.h"
#include "WW3D2/camera.h"
#include "camera.h"
#include "stripoptimizer.h"
#include "WW3D2/meshgeometry.h"
#include "meshgeometry.h"

/*
** Global Instance of the DX8MeshRender
Expand Down
4 changes: 2 additions & 2 deletions Core/Libraries/Source/WWVegas/WW3D2/dx8renderer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
#include "WWLib/simplevec.h"
#include "WWLib/Vector.h"
#include "dx8list.h"
#include "WW3D2/shader.h"
#include "shader.h"
#include "dx8wrapper.h"
#include "WW3D2/meshmatdesc.h"
#include "meshmatdesc.h"

class IndexBufferClass;
class VertexBufferClass;
Expand Down
4 changes: 2 additions & 2 deletions Core/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@

#include "dx8rendererdebugger.h"
#include "WWLib/hashtemplate.h"
#include "WW3D2/mesh.h"
#include "WW3D2/meshmdl.h"
#include "mesh.h"
#include "meshmdl.h"

static HashTemplateClass<unsigned, MeshClass*> MeshHash;

Expand Down
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
//******************************************************************************************

#include "dx8webbrowser.h"
#include "WW3D2/ww3d.h"
#include "ww3d.h"
#include "dx8wrapper.h"

#if ENABLE_EMBEDDED_BROWSER
Expand Down
16 changes: 8 additions & 8 deletions Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,22 +56,22 @@
#include "dx8vertexbuffer.h"
#include "dx8indexbuffer.h"
#include "dx8renderer.h"
#include "WW3D2/ww3d.h"
#include "WW3D2/camera.h"
#include "ww3d.h"
#include "camera.h"
#include "WWLib/wwstring.h"
#include "WWMath/matrix4.h"
#include "WW3D2/vertmaterial.h"
#include "vertmaterial.h"
#include "rddesc.h"
#include "WW3D2/lightenvironment.h"
#include "lightenvironment.h"
#include "statistics.h"
#include "WWLib/registry.h"
#include "WW3D2/boxrobj.h"
#include "boxrobj.h"
#include "pointgr.h"
#include "WW3D2/render2d.h"
#include "render2d.h"
#include "sortingrenderer.h"
#include "shattersystem.h"
#include "WW3D2/light.h"
#include "WW3D2/assetmgr.h"
#include "light.h"
#include "assetmgr.h"
#include "textureloader.h"
#include "missingtexture.h"
#include "WWLib/thread.h"
Expand Down
6 changes: 3 additions & 3 deletions Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,16 +47,16 @@
#include "WWMath/matrix4.h"
#include "statistics.h"
#include "WWLib/wwstring.h"
#include "WW3D2/lightenvironment.h"
#include "WW3D2/shader.h"
#include "lightenvironment.h"
#include "shader.h"
#include "WWMath/vector4.h"
#include "WWLib/cpudetect.h"
#include "dx8caps.h"

#include "texture.h"
#include "dx8vertexbuffer.h"
#include "dx8indexbuffer.h"
#include "WW3D2/vertmaterial.h"
#include "vertmaterial.h"

/*
** Registry value names
Expand Down
4 changes: 2 additions & 2 deletions Core/Libraries/Source/WWVegas/WW3D2/dynamesh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
#include "dx8indexbuffer.h"
#include "dx8wrapper.h"
#include "sortingrenderer.h"
#include "WW3D2/rinfo.h"
#include "WW3D2/camera.h"
#include "rinfo.h"
#include "camera.h"
#include "dx8fvf.h"


Expand Down
4 changes: 2 additions & 2 deletions Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@

#pragma once

#include "WW3D2/meshgeometry.h"
#include "WW3D2/meshmatdesc.h"
#include "meshgeometry.h"
#include "meshmatdesc.h"
#include "matinfo.h"
#include "rendobj.h"
#include "polyinfo.h"
Expand Down
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WW3D2/font3d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */

#include "font3d.h"
#include "WW3D2/assetmgr.h"
#include "assetmgr.h"
#include "texture.h"
#include <assert.h>
#include <WWDebug/wwdebug.h>
Expand Down
6 changes: 3 additions & 3 deletions Core/Libraries/Source/WWVegas/WW3D2/hanim.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@


#include "hanim.h"
#include "WW3D2/assetmgr.h"
#include "assetmgr.h"
#include "htree.h"
#include "WW3D2/motchan.h"
#include "motchan.h"
#include "WWLib/chunkio.h"
#include "WW3D2/w3d_file.h"
#include "w3d_file.h"
#include "WWDebug/wwdebug.h"
#include <WWLib/nstrdup.h>

Expand Down
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WW3D2/hanim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

#include "WWLib/always.h"
#include "WWMath/quat.h"
#include "WW3D2/w3d_file.h"
#include "w3d_file.h"
#include "WWLib/hash.h"
#include "WWLib/mempool.h"
#include <WWLib/SLIST.h>
Expand Down
6 changes: 3 additions & 3 deletions Core/Libraries/Source/WWVegas/WW3D2/hcanim.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@


#include "hcanim.h"
#include "WW3D2/assetmgr.h"
#include "assetmgr.h"
#include "htree.h"
#include "WW3D2/motchan.h"
#include "motchan.h"
#include "WWLib/chunkio.h"
#include "WW3D2/w3d_file.h"
#include "w3d_file.h"
#include "WWDebug/wwdebug.h"
#include <WWLib/nstrdup.h>

Expand Down
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WW3D2/hcanim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

#include "WWLib/always.h"
#include "WWMath/quat.h"
#include "WW3D2/w3d_file.h"
#include "w3d_file.h"
#include "WWLib/SLIST.h"
#include "WWLib/Vector.h"
#include "hanim.h"
Expand Down
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WW3D2/hmdldef.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

#include "hmdldef.h"
#include <assert.h>
#include "WW3D2/w3d_file.h"
#include "w3d_file.h"
#include "WWLib/chunkio.h"
#include "snapPts.h"

Expand Down
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WW3D2/hmdldef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#pragma once

#include "WWLib/always.h"
#include "WW3D2/w3d_file.h"
#include "w3d_file.h"

class FileClass;
class ChunkLoadClass;
Expand Down
8 changes: 4 additions & 4 deletions Core/Libraries/Source/WWVegas/WW3D2/htree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@
#include <assert.h>
#include "WWMath/wwmath.h"
#include "WWLib/chunkio.h"
#include "WW3D2/w3d_file.h"
#include "w3d_file.h"
#include "WWDebug/wwmemlog.h"
#include "WW3D2/hrawanim.h"
#include "WW3D2/motchan.h"
#include "WW3D2/ww3d.h"
#include "hrawanim.h"
#include "motchan.h"
#include "ww3d.h"

/***********************************************************************************************
* HTreeClass::HTreeClass -- constructor *
Expand Down
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WW3D2/htree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
#include "WWMath/quat.h"
#include "WWMath/matrix3d.h"
#include "WWMath/vector3.h"
#include "WW3D2/w3d_file.h"
#include "w3d_file.h"
#include "WWDebug/wwdebug.h"

class HAnimClass;
Expand Down
4 changes: 2 additions & 2 deletions Core/Libraries/Source/WWVegas/WW3D2/intersec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@


#include "intersec.h"
#include "WW3D2/camera.h"
#include "WW3D2/scene.h"
#include "camera.h"
#include "scene.h"
#include "intersec.inl"


Expand Down
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WW3D2/intersec.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#ifndef INTERSEC_INL
#define INTERSEC_INL

#include "WW3D2/camera.h"
#include "camera.h"


/// debug code that will be tossed
Expand Down
Loading
Loading