From 98c61858620a9d22e6ff225fdea9ad07346aefb1 Mon Sep 17 00:00:00 2001 From: Jacob Ledbetter Date: Wed, 29 Jul 2026 10:14:20 -0600 Subject: [PATCH 1/5] fix(wwvegas): Restore component include visibility Expose Core and game-specific WW3D2 directories through target usage requirements, then remove redundant same-component include qualifiers. --- .../Source/WWVegas/WW3D2/CMakeLists.txt | 2 ++ .../Source/WWVegas/WW3D2/aabtree.cpp | 6 ++-- Core/Libraries/Source/WWVegas/WW3D2/aabtree.h | 2 +- .../Source/WWVegas/WW3D2/agg_def.cpp | 2 +- Core/Libraries/Source/WWVegas/WW3D2/agg_def.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/bmp2d.cpp | 4 +-- .../Source/WWVegas/WW3D2/collect.cpp | 6 ++-- Core/Libraries/Source/WWVegas/WW3D2/collect.h | 2 +- .../Source/WWVegas/WW3D2/decalsys.cpp | 6 ++-- .../Source/WWVegas/WW3D2/distlod.cpp | 10 +++--- .../Source/WWVegas/WW3D2/dx8polygonrenderer.h | 4 +-- .../Source/WWVegas/WW3D2/dx8renderer.cpp | 10 +++--- .../Source/WWVegas/WW3D2/dx8renderer.h | 4 +-- .../WWVegas/WW3D2/dx8rendererdebugger.cpp | 4 +-- .../Source/WWVegas/WW3D2/dx8webbrowser.cpp | 2 +- .../Source/WWVegas/WW3D2/dx8wrapper.cpp | 16 ++++----- .../Source/WWVegas/WW3D2/dx8wrapper.h | 6 ++-- .../Source/WWVegas/WW3D2/dynamesh.cpp | 4 +-- .../Libraries/Source/WWVegas/WW3D2/dynamesh.h | 4 +-- .../Libraries/Source/WWVegas/WW3D2/font3d.cpp | 2 +- Core/Libraries/Source/WWVegas/WW3D2/hanim.cpp | 6 ++-- Core/Libraries/Source/WWVegas/WW3D2/hanim.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/hcanim.cpp | 6 ++-- Core/Libraries/Source/WWVegas/WW3D2/hcanim.h | 2 +- .../Source/WWVegas/WW3D2/hmdldef.cpp | 2 +- Core/Libraries/Source/WWVegas/WW3D2/hmdldef.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/htree.cpp | 8 ++--- Core/Libraries/Source/WWVegas/WW3D2/htree.h | 2 +- .../Source/WWVegas/WW3D2/intersec.cpp | 4 +-- .../Source/WWVegas/WW3D2/intersec.inl | 2 +- Core/Libraries/Source/WWVegas/WW3D2/layer.cpp | 4 +-- .../Libraries/Source/WWVegas/WW3D2/line3d.cpp | 8 ++--- Core/Libraries/Source/WWVegas/WW3D2/line3d.h | 2 +- .../Source/WWVegas/WW3D2/matinfo.cpp | 2 +- Core/Libraries/Source/WWVegas/WW3D2/matinfo.h | 4 +-- .../Source/WWVegas/WW3D2/matpass.cpp | 4 +-- Core/Libraries/Source/WWVegas/WW3D2/matpass.h | 2 +- .../Source/WWVegas/WW3D2/meshdam.cpp | 2 +- .../Source/WWVegas/WW3D2/metalmap.cpp | 2 +- Core/Libraries/Source/WWVegas/WW3D2/pivot.h | 2 +- .../Source/WWVegas/WW3D2/pointgr.cpp | 8 ++--- Core/Libraries/Source/WWVegas/WW3D2/pointgr.h | 2 +- .../Source/WWVegas/WW3D2/polyinfo.cpp | 4 +-- .../Source/WWVegas/WW3D2/projector.cpp | 2 +- Core/Libraries/Source/WWVegas/WW3D2/proto.cpp | 4 +-- Core/Libraries/Source/WWVegas/WW3D2/proto.h | 2 +- .../Source/WWVegas/WW3D2/render2dsentence.h | 2 +- .../WWVegas/WW3D2/renderobjectrecycler.cpp | 4 +-- .../Source/WWVegas/WW3D2/rendobj.cpp | 8 ++--- .../Source/WWVegas/WW3D2/ringobj.cpp | 10 +++--- Core/Libraries/Source/WWVegas/WW3D2/ringobj.h | 4 +-- .../Source/WWVegas/WW3D2/segline.cpp | 6 ++-- Core/Libraries/Source/WWVegas/WW3D2/segline.h | 2 +- .../Source/WWVegas/WW3D2/seglinerenderer.cpp | 6 ++-- .../Source/WWVegas/WW3D2/seglinerenderer.h | 2 +- .../Source/WWVegas/WW3D2/shattersystem.cpp | 8 ++--- .../Source/WWVegas/WW3D2/snappts.cpp | 2 +- .../Source/WWVegas/WW3D2/sortingrenderer.cpp | 2 +- .../Source/WWVegas/WW3D2/soundrobj.cpp | 2 +- .../Source/WWVegas/WW3D2/soundrobj.h | 2 +- .../Source/WWVegas/WW3D2/sphereobj.cpp | 10 +++--- .../Source/WWVegas/WW3D2/sphereobj.h | 6 ++-- .../Source/WWVegas/WW3D2/static_sort_list.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/streak.cpp | 6 ++-- Core/Libraries/Source/WWVegas/WW3D2/streak.h | 2 +- .../Source/WWVegas/WW3D2/streakRender.cpp | 4 +-- .../Source/WWVegas/WW3D2/streakRender.h | 2 +- .../Source/WWVegas/WW3D2/texproject.cpp | 10 +++--- .../Source/WWVegas/WW3D2/texproject.h | 2 +- .../Source/WWVegas/WW3D2/texture.cpp | 6 ++-- .../Source/WWVegas/WW3D2/textureloader.cpp | 6 ++-- .../Source/WWVegas/WW3D2/texturethumbnail.cpp | 2 +- .../Source/WWVegas/WW3D2/visrasterizer.cpp | 2 +- .../Source/WWVegas/WW3D2/visrasterizer.h | 2 +- .../Source/WWVegas/WW3D2/w3d_dep.cpp | 2 +- .../Source/WWVegas/WW3D2/w3d_util.cpp | 2 +- .../Libraries/Source/WWVegas/WW3D2/w3d_util.h | 2 +- .../Source/WWVegas/WWDownload/Download.h | 4 +-- .../Libraries/Source/WWVegas/WWDownload/ftp.h | 2 +- .../Source/WWVegas/WWLib/CMakeLists.txt | 12 ++++--- .../Source/WWVegas/WWLib/DbgHelpLoader.h | 4 +-- .../Source/WWVegas/WW3D2/CMakeLists.txt | 7 +++- .../Source/WWVegas/WW3D2/animobj.cpp | 8 ++--- .../Libraries/Source/WWVegas/WW3D2/animobj.h | 6 ++-- .../Source/WWVegas/WW3D2/assetmgr.cpp | 34 +++++++++--------- .../Libraries/Source/WWVegas/WW3D2/assetmgr.h | 2 +- .../Source/WWVegas/WW3D2/boxrobj.cpp | 18 +++++----- .../Libraries/Source/WWVegas/WW3D2/boxrobj.h | 4 +-- .../Libraries/Source/WWVegas/WW3D2/camera.cpp | 2 +- .../Libraries/Source/WWVegas/WW3D2/camera.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/dazzle.cpp | 12 +++---- .../Libraries/Source/WWVegas/WW3D2/dazzle.h | 6 ++-- .../Source/WWVegas/WW3D2/ddsfile.cpp | 8 ++--- .../Libraries/Source/WWVegas/WW3D2/ddsfile.h | 2 +- .../Source/WWVegas/WW3D2/decalmsh.cpp | 12 +++---- .../Source/WWVegas/WW3D2/hanimmgr.cpp | 8 ++--- .../Libraries/Source/WWVegas/WW3D2/hlod.cpp | 6 ++-- .../Libraries/Source/WWVegas/WW3D2/hlod.h | 8 ++--- .../Source/WWVegas/WW3D2/hmorphanim.cpp | 2 +- .../Source/WWVegas/WW3D2/hmorphanim.h | 2 +- .../Source/WWVegas/WW3D2/hrawanim.cpp | 2 +- .../Libraries/Source/WWVegas/WW3D2/hrawanim.h | 2 +- .../Source/WWVegas/WW3D2/htreemgr.cpp | 4 +-- .../Libraries/Source/WWVegas/WW3D2/light.cpp | 8 ++--- .../Libraries/Source/WWVegas/WW3D2/light.h | 4 +-- .../Libraries/Source/WWVegas/WW3D2/mapper.cpp | 8 ++--- .../Libraries/Source/WWVegas/WW3D2/mapper.h | 2 +- .../Source/WWVegas/WW3D2/matrixmapper.cpp | 2 +- .../Libraries/Source/WWVegas/WW3D2/mesh.cpp | 26 +++++++------- .../Libraries/Source/WWVegas/WW3D2/mesh.h | 4 +-- .../Source/WWVegas/WW3D2/meshgeometry.cpp | 2 +- .../Source/WWVegas/WW3D2/meshgeometry.h | 6 ++-- .../Source/WWVegas/WW3D2/meshmatdesc.cpp | 6 ++-- .../Source/WWVegas/WW3D2/meshmdl.cpp | 14 ++++---- .../Libraries/Source/WWVegas/WW3D2/meshmdl.h | 2 +- .../Source/WWVegas/WW3D2/meshmdlio.cpp | 12 +++---- .../Libraries/Source/WWVegas/WW3D2/nullrobj.h | 4 +-- .../Source/WWVegas/WW3D2/part_buf.cpp | 6 ++-- .../Libraries/Source/WWVegas/WW3D2/part_buf.h | 6 ++-- .../Source/WWVegas/WW3D2/part_emt.cpp | 4 +-- .../Libraries/Source/WWVegas/WW3D2/part_emt.h | 4 +-- .../Source/WWVegas/WW3D2/part_ldr.cpp | 4 +-- .../Libraries/Source/WWVegas/WW3D2/part_ldr.h | 8 ++--- .../Source/WWVegas/WW3D2/render2d.cpp | 16 ++++----- .../Libraries/Source/WWVegas/WW3D2/rinfo.cpp | 2 +- .../Libraries/Source/WWVegas/WW3D2/scene.cpp | 8 ++--- .../Libraries/Source/WWVegas/WW3D2/scene.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/shader.cpp | 4 +-- .../Source/WWVegas/WW3D2/vertmaterial.cpp | 6 ++-- .../Source/WWVegas/WW3D2/vertmaterial.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/w3d_file.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/ww3d.cpp | 30 ++++++++-------- .../Libraries/Source/WWVegas/WW3D2/ww3d.h | 6 ++-- .../Source/WWVegas/WW3D2/CMakeLists.txt | 7 +++- .../Source/WWVegas/WW3D2/animobj.cpp | 8 ++--- .../Libraries/Source/WWVegas/WW3D2/animobj.h | 6 ++-- .../Source/WWVegas/WW3D2/assetmgr.cpp | 36 +++++++++---------- .../Libraries/Source/WWVegas/WW3D2/assetmgr.h | 2 +- .../Source/WWVegas/WW3D2/boxrobj.cpp | 18 +++++----- .../Libraries/Source/WWVegas/WW3D2/boxrobj.h | 4 +-- .../Libraries/Source/WWVegas/WW3D2/camera.cpp | 2 +- .../Libraries/Source/WWVegas/WW3D2/camera.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/dazzle.cpp | 14 ++++---- .../Libraries/Source/WWVegas/WW3D2/dazzle.h | 6 ++-- .../Source/WWVegas/WW3D2/ddsfile.cpp | 8 ++--- .../Libraries/Source/WWVegas/WW3D2/ddsfile.h | 2 +- .../Source/WWVegas/WW3D2/decalmsh.cpp | 14 ++++---- .../Source/WWVegas/WW3D2/hanimmgr.cpp | 8 ++--- .../Libraries/Source/WWVegas/WW3D2/hlod.cpp | 6 ++-- .../Libraries/Source/WWVegas/WW3D2/hlod.h | 8 ++--- .../Source/WWVegas/WW3D2/hmorphanim.cpp | 2 +- .../Source/WWVegas/WW3D2/hmorphanim.h | 2 +- .../Source/WWVegas/WW3D2/hrawanim.cpp | 2 +- .../Libraries/Source/WWVegas/WW3D2/hrawanim.h | 2 +- .../Source/WWVegas/WW3D2/htreemgr.cpp | 4 +-- .../Libraries/Source/WWVegas/WW3D2/light.cpp | 8 ++--- .../Libraries/Source/WWVegas/WW3D2/light.h | 4 +-- .../Source/WWVegas/WW3D2/lightenvironment.cpp | 2 +- .../Source/WWVegas/WW3D2/linegrp.cpp | 10 +++--- .../Libraries/Source/WWVegas/WW3D2/mapper.cpp | 8 ++--- .../Libraries/Source/WWVegas/WW3D2/mapper.h | 2 +- .../Source/WWVegas/WW3D2/matrixmapper.cpp | 2 +- .../Libraries/Source/WWVegas/WW3D2/mesh.cpp | 28 +++++++-------- .../Libraries/Source/WWVegas/WW3D2/mesh.h | 4 +-- .../Source/WWVegas/WW3D2/meshgeometry.cpp | 4 +-- .../Source/WWVegas/WW3D2/meshgeometry.h | 6 ++-- .../Source/WWVegas/WW3D2/meshmatdesc.cpp | 6 ++-- .../Source/WWVegas/WW3D2/meshmdl.cpp | 14 ++++---- .../Libraries/Source/WWVegas/WW3D2/meshmdl.h | 2 +- .../Source/WWVegas/WW3D2/meshmdlio.cpp | 12 +++---- .../Libraries/Source/WWVegas/WW3D2/nullrobj.h | 4 +-- .../Source/WWVegas/WW3D2/part_buf.cpp | 6 ++-- .../Libraries/Source/WWVegas/WW3D2/part_buf.h | 6 ++-- .../Source/WWVegas/WW3D2/part_emt.cpp | 4 +-- .../Libraries/Source/WWVegas/WW3D2/part_emt.h | 4 +-- .../Source/WWVegas/WW3D2/part_ldr.cpp | 4 +-- .../Libraries/Source/WWVegas/WW3D2/part_ldr.h | 8 ++--- .../Source/WWVegas/WW3D2/render2d.cpp | 16 ++++----- .../Libraries/Source/WWVegas/WW3D2/rinfo.cpp | 2 +- .../Libraries/Source/WWVegas/WW3D2/scene.cpp | 8 ++--- .../Libraries/Source/WWVegas/WW3D2/scene.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/shader.cpp | 4 +-- .../Source/WWVegas/WW3D2/vertmaterial.cpp | 6 ++-- .../Source/WWVegas/WW3D2/vertmaterial.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/w3d_file.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/ww3d.cpp | 32 ++++++++--------- .../Libraries/Source/WWVegas/WW3D2/ww3d.h | 6 ++-- 187 files changed, 555 insertions(+), 541 deletions(-) diff --git a/Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt b/Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt index ecebd564696..74eecbe396d 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt +++ b/Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt @@ -237,6 +237,8 @@ add_library(corei_ww3d2 INTERFACE) target_sources(corei_ww3d2 INTERFACE ${WW3D2_SRC}) +target_include_directories(corei_ww3d2 INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) + if (MSVC AND NOT IS_VS6_BUILD) target_link_libraries(corei_ww3d2 INTERFACE comsuppw diff --git a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.cpp b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.cpp index c0ded889965..4575787c265 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.cpp @@ -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" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h index 54c21044598..86b965b08ca 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h @@ -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 #include diff --git a/Core/Libraries/Source/WWVegas/WW3D2/agg_def.cpp b/Core/Libraries/Source/WWVegas/WW3D2/agg_def.cpp index e25b3025e97..50b348b8f8a 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/agg_def.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/agg_def.cpp @@ -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" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h b/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h index 97228dfb374..71cdac20e6c 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h @@ -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" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/bmp2d.cpp b/Core/Libraries/Source/WWVegas/WW3D2/bmp2d.cpp index 27090e0293b..e9891096184 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/bmp2d.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/bmp2d.cpp @@ -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" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp b/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp index 21263e451b4..de9f20afc2b 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp @@ -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" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/collect.h b/Core/Libraries/Source/WWVegas/WW3D2/collect.h index 676a4a97157..71f27d83e05 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/collect.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/collect.h @@ -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" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/decalsys.cpp b/Core/Libraries/Source/WWVegas/WW3D2/decalsys.cpp index a7b54dc0b7b..ff6e93eb84d 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/decalsys.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/decalsys.cpp @@ -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" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/distlod.cpp b/Core/Libraries/Source/WWVegas/WW3D2/distlod.cpp index ce5a900357f..c2db8f3d1f6 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/distlod.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/distlod.cpp @@ -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" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h index 17b7558049a..1068e7c3e58 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h @@ -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; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8renderer.cpp b/Core/Libraries/Source/WWVegas/WW3D2/dx8renderer.cpp index 31394a37617..17307f627a2 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8renderer.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8renderer.cpp @@ -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 diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8renderer.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8renderer.h index ff4f593e03a..fcd683c43a2 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8renderer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8renderer.h @@ -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; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.cpp b/Core/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.cpp index bb0b3b0fb6f..11e8c0b789a 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.cpp @@ -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 MeshHash; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.cpp b/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.cpp index ab9bcdce743..180e3aa03e0 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.cpp @@ -31,7 +31,7 @@ //****************************************************************************************** #include "dx8webbrowser.h" -#include "WW3D2/ww3d.h" +#include "ww3d.h" #include "dx8wrapper.h" #if ENABLE_EMBEDDED_BROWSER diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp b/Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp index bc2a6eeeeca..ba897a753a5 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp @@ -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" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h index 8a6f3d26495..f9d68cf13c9 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h @@ -47,8 +47,8 @@ #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" @@ -56,7 +56,7 @@ #include "texture.h" #include "dx8vertexbuffer.h" #include "dx8indexbuffer.h" -#include "WW3D2/vertmaterial.h" +#include "vertmaterial.h" /* ** Registry value names diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.cpp b/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.cpp index 74276b2aecd..08750d2a9dd 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.cpp @@ -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" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h b/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h index 0fcd9c29554..e024ab5d68f 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h @@ -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" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/font3d.cpp b/Core/Libraries/Source/WWVegas/WW3D2/font3d.cpp index b9ef97b93e7..873d0262b31 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/font3d.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/font3d.cpp @@ -38,7 +38,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "font3d.h" -#include "WW3D2/assetmgr.h" +#include "assetmgr.h" #include "texture.h" #include #include diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hanim.cpp b/Core/Libraries/Source/WWVegas/WW3D2/hanim.cpp index 3770dc0ba95..a5430b62c8e 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hanim.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/hanim.cpp @@ -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 diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hanim.h b/Core/Libraries/Source/WWVegas/WW3D2/hanim.h index 3a47500c2e2..28a7e6675ff 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hanim.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/hanim.h @@ -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 diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hcanim.cpp b/Core/Libraries/Source/WWVegas/WW3D2/hcanim.cpp index ace4a88c04d..c9c77237875 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hcanim.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/hcanim.cpp @@ -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 diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h b/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h index b7c85029c57..3dd3d4b4c4d 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h @@ -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" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.cpp b/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.cpp index 7dcbe793b2e..954d3e72bd5 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.cpp @@ -38,7 +38,7 @@ #include "hmdldef.h" #include -#include "WW3D2/w3d_file.h" +#include "w3d_file.h" #include "WWLib/chunkio.h" #include "snapPts.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.h b/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.h index 47570b209fe..141d108f622 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.h @@ -37,7 +37,7 @@ #pragma once #include "WWLib/always.h" -#include "WW3D2/w3d_file.h" +#include "w3d_file.h" class FileClass; class ChunkLoadClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/htree.cpp b/Core/Libraries/Source/WWVegas/WW3D2/htree.cpp index 1f04fa29ba0..fc64894f36b 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/htree.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/htree.cpp @@ -57,11 +57,11 @@ #include #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 * diff --git a/Core/Libraries/Source/WWVegas/WW3D2/htree.h b/Core/Libraries/Source/WWVegas/WW3D2/htree.h index 7bbdb383160..a190ec82e3f 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/htree.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/htree.h @@ -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; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/intersec.cpp b/Core/Libraries/Source/WWVegas/WW3D2/intersec.cpp index f4cd4b15d2e..1709f956bb0 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/intersec.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/intersec.cpp @@ -37,8 +37,8 @@ #include "intersec.h" -#include "WW3D2/camera.h" -#include "WW3D2/scene.h" +#include "camera.h" +#include "scene.h" #include "intersec.inl" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/intersec.inl b/Core/Libraries/Source/WWVegas/WW3D2/intersec.inl index b9ca0b9ff41..3fc05e586fb 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/intersec.inl +++ b/Core/Libraries/Source/WWVegas/WW3D2/intersec.inl @@ -22,7 +22,7 @@ #ifndef INTERSEC_INL #define INTERSEC_INL -#include "WW3D2/camera.h" +#include "camera.h" /// debug code that will be tossed diff --git a/Core/Libraries/Source/WWVegas/WW3D2/layer.cpp b/Core/Libraries/Source/WWVegas/WW3D2/layer.cpp index 65cf42df756..2ea246a4f76 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/layer.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/layer.cpp @@ -46,8 +46,8 @@ #include "layer.h" -#include "WW3D2/scene.h" -#include "WW3D2/camera.h" +#include "scene.h" +#include "camera.h" /*********************************************************************************************** diff --git a/Core/Libraries/Source/WWVegas/WW3D2/line3d.cpp b/Core/Libraries/Source/WWVegas/WW3D2/line3d.cpp index 0bfaa121587..b2baa3f81aa 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/line3d.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/line3d.cpp @@ -48,11 +48,11 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "line3d.h" -#include "WW3D2/vertmaterial.h" -#include "WW3D2/shader.h" +#include "vertmaterial.h" +#include "shader.h" #include "WWDebug/wwdebug.h" -#include "WW3D2/ww3d.h" -#include "WW3D2/rinfo.h" +#include "ww3d.h" +#include "rinfo.h" #include "dx8wrapper.h" #include "dx8vertexbuffer.h" #include "dx8indexbuffer.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/line3d.h b/Core/Libraries/Source/WWVegas/WW3D2/line3d.h index 7fb2be1fad8..327c1a20bf0 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/line3d.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/line3d.h @@ -40,7 +40,7 @@ #include "rendobj.h" #include "WWMath/vector3.h" #include "WWMath/vector4.h" -#include "WW3D2/shader.h" +#include "shader.h" class VertexMaterialClass; class RenderInfoClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/matinfo.cpp b/Core/Libraries/Source/WWVegas/WW3D2/matinfo.cpp index 7113e636137..0926bd796b8 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/matinfo.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/matinfo.cpp @@ -37,7 +37,7 @@ #include "matinfo.h" #include "WWDebug/wwdebug.h" -#include "WW3D2/meshmdl.h" +#include "meshmdl.h" #include "texture.h" MaterialInfoClass::MaterialInfoClass() diff --git a/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h b/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h index a8fe13450ed..14c742440d7 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h @@ -39,9 +39,9 @@ #include "WWLib/always.h" #include "WWDebug/wwdebug.h" #include "WWLib/Vector.h" -#include "WW3D2/vertmaterial.h" +#include "vertmaterial.h" #include "texture.h" -#include "WW3D2/shader.h" +#include "shader.h" #ifdef _UNIX #include "osdep.h" #endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/matpass.cpp b/Core/Libraries/Source/WWVegas/WW3D2/matpass.cpp index d300e5ffe36..f0a6dbb72b9 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/matpass.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/matpass.cpp @@ -47,8 +47,8 @@ #include "matpass.h" -#include "WW3D2/vertmaterial.h" -#include "WW3D2/shader.h" +#include "vertmaterial.h" +#include "shader.h" #include "texture.h" #include "statistics.h" #include "dx8wrapper.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/matpass.h b/Core/Libraries/Source/WWVegas/WW3D2/matpass.h index 53dd32afb62..4f28d900bc3 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/matpass.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/matpass.h @@ -40,7 +40,7 @@ #pragma once #include "WWLib/always.h" -#include "WW3D2/shader.h" +#include "shader.h" class TextureClass; class VertexMaterialClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/meshdam.cpp b/Core/Libraries/Source/WWVegas/WW3D2/meshdam.cpp index e05282725ac..e98445be210 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/meshdam.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/meshdam.cpp @@ -39,7 +39,7 @@ #include "meshdam.h" -#include "WW3D2/w3d_file.h" +#include "w3d_file.h" #include "w3derr.h" #include "WWLib/chunkio.h" //#include diff --git a/Core/Libraries/Source/WWVegas/WW3D2/metalmap.cpp b/Core/Libraries/Source/WWVegas/WW3D2/metalmap.cpp index ba9a32ca3f0..48f5f08199e 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/metalmap.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/metalmap.cpp @@ -49,7 +49,7 @@ #include "metalmap.h" #include "texture.h" #include "ww3dformat.h" -#include "WW3D2/ww3d.h" +#include "ww3d.h" #include #include #include diff --git a/Core/Libraries/Source/WWVegas/WW3D2/pivot.h b/Core/Libraries/Source/WWVegas/WW3D2/pivot.h index 167c0094610..17abc0a49c5 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/pivot.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/pivot.h @@ -41,7 +41,7 @@ #include "WWMath/vector3.h" #include "WWMath/matrix3d.h" #include "WWMath/quat.h" -#include "WW3D2/w3d_file.h" +#include "w3d_file.h" /* diff --git a/Core/Libraries/Source/WWVegas/WW3D2/pointgr.cpp b/Core/Libraries/Source/WWVegas/WW3D2/pointgr.cpp index 4bbbd6f0534..b2eb666b7cd 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/pointgr.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/pointgr.cpp @@ -71,8 +71,8 @@ * PointGroupClass::Peek_Texture -- Peeks texture * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "pointgr.h" -#include "WW3D2/vertmaterial.h" -#include "WW3D2/ww3d.h" +#include "vertmaterial.h" +#include "ww3d.h" #include "WWMath/aabox.h" #include "statistics.h" #include "WWLib/simplevec.h" @@ -83,8 +83,8 @@ #include "dx8wrapper.h" #include "dx8vertexbuffer.h" #include "dx8indexbuffer.h" -#include "WW3D2/rinfo.h" -#include "WW3D2/camera.h" +#include "rinfo.h" +#include "camera.h" #include "dx8fvf.h" #include "d3dx8math.h" #include "sortingrenderer.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h b/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h index 5b1a23d1413..973ad41ea08 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h @@ -37,7 +37,7 @@ #pragma once #include "WWLib/sharebuf.h" -#include "WW3D2/shader.h" +#include "shader.h" #include "WWMath/vector4.h" #include "WWMath/vector3.h" #include "WWMath/vector2.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/polyinfo.cpp b/Core/Libraries/Source/WWVegas/WW3D2/polyinfo.cpp index c4409d4ae4e..0e5751d1939 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/polyinfo.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/polyinfo.cpp @@ -39,8 +39,8 @@ #include "polyinfo.h" #include "texture.h" -#include "WW3D2/vertmaterial.h" -#include "WW3D2/shader.h" +#include "vertmaterial.h" +#include "shader.h" void PolygonInfoClass::Set_Texture(TextureClass *texture) { diff --git a/Core/Libraries/Source/WWVegas/WW3D2/projector.cpp b/Core/Libraries/Source/WWVegas/WW3D2/projector.cpp index c1b70e7ae89..aea6a1777ee 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/projector.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/projector.cpp @@ -46,7 +46,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "projector.h" -#include "WW3D2/matrixmapper.h" +#include "matrixmapper.h" /*********************************************************************************************** diff --git a/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp b/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp index 50529d3a135..d8ef8aa5cd6 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp @@ -41,9 +41,9 @@ #include "proto.h" -#include "WW3D2/mesh.h" +#include "mesh.h" #include "hmdldef.h" -#include "WW3D2/hlod.h" +#include "hlod.h" #include "w3derr.h" /* diff --git a/Core/Libraries/Source/WWVegas/WW3D2/proto.h b/Core/Libraries/Source/WWVegas/WW3D2/proto.h index 07861b87f7b..91af6b43460 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/proto.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/proto.h @@ -38,7 +38,7 @@ #include "WWLib/always.h" #include -#include "WW3D2/w3d_file.h" +#include "w3d_file.h" class RenderObjClass; class ChunkLoadClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h index 15426c1e950..8427d53b289 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h @@ -37,7 +37,7 @@ #pragma once #include "WWLib/always.h" -#include "WW3D2/render2d.h" +#include "render2d.h" #include "WWLib/Vector.h" #include "WWMath/vector2i.h" #include "WWLib/wwstring.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.cpp b/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.cpp index a11b783fdc5..46b1d962fa9 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.cpp @@ -43,8 +43,8 @@ #include "renderobjectrecycler.h" #include "rendobj.h" -#include "WW3D2/assetmgr.h" -#include "WW3D2/part_emt.h" +#include "assetmgr.h" +#include "part_emt.h" #include "WWMath/matrix3d.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp index be20233d3c6..47954075d76 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp @@ -73,10 +73,10 @@ #include "rendobj.h" -#include "WW3D2/assetmgr.h" +#include "assetmgr.h" #include "WWLib/win.h" #include "WWMath/pot.h" -#include "WW3D2/scene.h" +#include "scene.h" #include "WWMath/colmath.h" #include "coltest.h" #include "inttest.h" @@ -84,8 +84,8 @@ #include "matinfo.h" #include "htree.h" #include "predlod.h" -#include "WW3D2/camera.h" -#include "WW3D2/ww3d.h" +#include "camera.h" +#include "ww3d.h" #include "WWLib/chunkio.h" #include "WWSaveLoad/persistfactory.h" #include "WWSaveLoad/saveload.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.cpp b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.cpp index 7f246b51432..9ee3d934f1a 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.cpp @@ -74,18 +74,18 @@ #include "ringobj.h" #include "w3d_util.h" #include "WWDebug/wwdebug.h" -#include "WW3D2/vertmaterial.h" -#include "WW3D2/ww3d.h" +#include "vertmaterial.h" +#include "ww3d.h" #include "WWLib/chunkio.h" -#include "WW3D2/rinfo.h" +#include "rinfo.h" #include "coltest.h" #include "inttest.h" #include "WWMath/matrix3.h" #include "WWMath/wwmath.h" -#include "WW3D2/assetmgr.h" +#include "assetmgr.h" #include "WWLib/wwstring.h" #include "WWLib/bound.h" -#include "WW3D2/camera.h" +#include "camera.h" #include "statistics.h" #include "predlod.h" #include "dx8wrapper.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h index b997bd0c385..24073cf7d64 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h @@ -38,8 +38,8 @@ #include "WWLib/always.h" #include "rendobj.h" -#include "WW3D2/w3d_file.h" -#include "WW3D2/shader.h" +#include "w3d_file.h" +#include "shader.h" #include "proto.h" #include "WWMath/obbox.h" #include "WWMath/quat.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/segline.cpp b/Core/Libraries/Source/WWVegas/WW3D2/segline.cpp index 4cec2125f36..9ae92675552 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/segline.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/segline.cpp @@ -35,13 +35,13 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "segline.h" -#include "WW3D2/ww3d.h" -#include "WW3D2/rinfo.h" +#include "ww3d.h" +#include "rinfo.h" #include "predlod.h" #include "WWMath/v3_rnd.h" #include "texture.h" #include "coltest.h" -#include "WW3D2/w3d_file.h" +#include "w3d_file.h" #include "texture.h" #include "dx8wrapper.h" #include "WWMath/vp.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/segline.h b/Core/Libraries/Source/WWVegas/WW3D2/segline.h index e934adca877..00a4881f695 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/segline.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/segline.h @@ -37,7 +37,7 @@ #pragma once #include "rendobj.h" -#include "WW3D2/shader.h" +#include "shader.h" #include "WWLib/simplevec.h" #include "seglinerenderer.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.cpp b/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.cpp index 0d96c6b3a70..b3e04ad981f 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.cpp @@ -38,15 +38,15 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "seglinerenderer.h" -#include "WW3D2/ww3d.h" -#include "WW3D2/rinfo.h" +#include "ww3d.h" +#include "rinfo.h" #include "dx8wrapper.h" #include "sortingrenderer.h" #include "WWMath/vp.h" #include "WWMath/Vector3i.h" #include "WWLib/RANDOM.h" #include "WWMath/v3_rnd.h" -#include "WW3D2/meshgeometry.h" +#include "meshgeometry.h" /* We have chunking logic which handles N segments at a time. To simplify the subdivision logic, diff --git a/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.h b/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.h index 8053adbf223..9b043f57586 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.h @@ -39,7 +39,7 @@ #pragma once #include "WWLib/always.h" -#include "WW3D2/shader.h" +#include "shader.h" #include "texture.h" #include "WWMath/matrix3d.h" #include "WWMath/vector2.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.cpp b/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.cpp index f216f34d64a..9a1c2de806d 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.cpp @@ -37,16 +37,16 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "shattersystem.h" -#include "WW3D2/assetmgr.h" -#include "WW3D2/mesh.h" -#include "WW3D2/meshmdl.h" +#include "assetmgr.h" +#include "mesh.h" +#include "meshmdl.h" #include "dynamesh.h" #include "htree.h" #include "WWMath/plane.h" #include "WWLib/simplevec.h" #include "WWLib/wwstring.h" #include "WWMath/vp.h" -#include "WW3D2/meshmatdesc.h" +#include "meshmatdesc.h" #include /* diff --git a/Core/Libraries/Source/WWVegas/WW3D2/snappts.cpp b/Core/Libraries/Source/WWVegas/WW3D2/snappts.cpp index 13d453474f8..e285512cb76 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/snappts.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/snappts.cpp @@ -36,7 +36,7 @@ #include "snapPts.h" #include "WWLib/chunkio.h" -#include "WW3D2/w3d_file.h" +#include "w3d_file.h" #include "w3derr.h" WW3DErrorType SnapPointsClass::Load_W3D(ChunkLoadClass & cload) diff --git a/Core/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp b/Core/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp index 14b51020152..66b1a7f873e 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp @@ -42,7 +42,7 @@ #include "dx8vertexbuffer.h" #include "dx8indexbuffer.h" #include "dx8wrapper.h" -#include "WW3D2/vertmaterial.h" +#include "vertmaterial.h" #include "texture.h" #include "d3d8.h" #include "d3dx8math.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.cpp b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.cpp index ce7269dc048..648af77cb82 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.cpp @@ -44,7 +44,7 @@ #include "WWLib/ffactory.h" #include "WWLib/WWFILE.h" #include "WWLib/chunkio.h" -#include "WW3D2/scene.h" +#include "scene.h" ////////////////////////////////////////////////////////////////////////////////// diff --git a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h index 4ca84795fc0..826a2080870 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h @@ -44,7 +44,7 @@ #include "rendobj.h" #include "WWLib/wwstring.h" #include "proto.h" -#include "WW3D2/w3d_file.h" +#include "w3d_file.h" #include "w3derr.h" #include "WWAudio/AudibleSound.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.cpp b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.cpp index ad4bb0bc549..b4d3cde9dad 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.cpp @@ -71,19 +71,19 @@ #include "sphereobj.h" #include "w3d_util.h" #include "WWDebug/wwdebug.h" -#include "WW3D2/vertmaterial.h" -#include "WW3D2/ww3d.h" +#include "vertmaterial.h" +#include "ww3d.h" #include "WWLib/chunkio.h" -#include "WW3D2/rinfo.h" +#include "rinfo.h" #include "coltest.h" #include "WWLib/bound.h" #include "inttest.h" #include "predlod.h" #include "WWMath/matrix3.h" #include "WWMath/wwmath.h" -#include "WW3D2/assetmgr.h" +#include "assetmgr.h" #include "WWLib/wwstring.h" -#include "WW3D2/camera.h" +#include "camera.h" #include "statistics.h" #include "dx8wrapper.h" #include "dx8vertexbuffer.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h index 76328bc3e04..4d911d03fbc 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h @@ -38,14 +38,14 @@ #include "WWLib/always.h" #include "rendobj.h" -#include "WW3D2/w3d_file.h" -#include "WW3D2/shader.h" +#include "w3d_file.h" +#include "shader.h" #include "proto.h" #include "WWMath/obbox.h" #include "WWMath/Vector3i.h" #include "WWMath/quat.h" #include "prim_anim.h" -#include "WW3D2/meshgeometry.h" +#include "meshgeometry.h" class TextureClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h b/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h index 5dd640d8c58..0095b60a746 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h @@ -39,7 +39,7 @@ #pragma once #include "robjlist.h" -#include "WW3D2/w3d_file.h" +#include "w3d_file.h" class RenderInfoClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/streak.cpp b/Core/Libraries/Source/WWVegas/WW3D2/streak.cpp index aec9cd74c56..b373dead1f7 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/streak.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/streak.cpp @@ -35,13 +35,13 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "streak.h" -#include "WW3D2/ww3d.h" -#include "WW3D2/rinfo.h" +#include "ww3d.h" +#include "rinfo.h" #include "predlod.h" #include "WWMath/v3_rnd.h" #include "texture.h" #include "coltest.h" -#include "WW3D2/w3d_file.h" +#include "w3d_file.h" #include "texture.h" #include "dx8wrapper.h" #include "WWMath/vp.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/streak.h b/Core/Libraries/Source/WWVegas/WW3D2/streak.h index 77a242689e0..14b8130fccb 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/streak.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/streak.h @@ -37,7 +37,7 @@ #pragma once #include "rendobj.h" -#include "WW3D2/shader.h" +#include "shader.h" #include "WWLib/simplevec.h" #include "seglinerenderer.h" #include "streakRender.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp b/Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp index 4341c24d7b2..58d67966d7d 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp @@ -26,8 +26,8 @@ #include "streakRender.h" -#include "WW3D2/ww3d.h" -#include "WW3D2/rinfo.h" +#include "ww3d.h" +#include "rinfo.h" #include "dx8wrapper.h" #include "sortingrenderer.h" #include "WWMath/vp.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/streakRender.h b/Core/Libraries/Source/WWVegas/WW3D2/streakRender.h index 46337fea7db..8cd0f2d4e20 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/streakRender.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/streakRender.h @@ -39,7 +39,7 @@ #pragma once #include "WWLib/always.h" -#include "WW3D2/shader.h" +#include "shader.h" #include "texture.h" #include "WWMath/matrix3d.h" #include "WWMath/vector2.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texproject.cpp b/Core/Libraries/Source/WWVegas/WW3D2/texproject.cpp index c0d3b1fd71c..ae718524197 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/texproject.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/texproject.cpp @@ -75,15 +75,15 @@ #include "texproject.h" -#include "WW3D2/vertmaterial.h" -#include "WW3D2/shader.h" +#include "vertmaterial.h" +#include "shader.h" #include "texture.h" #include "rendobj.h" -#include "WW3D2/rinfo.h" -#include "WW3D2/camera.h" +#include "rinfo.h" +#include "camera.h" #include "matpass.h" #include "bwrender.h" -#include "WW3D2/assetmgr.h" +#include "assetmgr.h" #include "dx8wrapper.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texproject.h b/Core/Libraries/Source/WWVegas/WW3D2/texproject.h index 368a1584a59..33c63ff591f 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/texproject.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/texproject.h @@ -44,7 +44,7 @@ #include "WWMath/matrix4.h" #include "WWMath/obbox.h" #include "matpass.h" -#include "WW3D2/matrixmapper.h" +#include "matrixmapper.h" #include "WWMath/cullsys.h" #include "WWLib/multilist.h" #include "projector.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texture.cpp b/Core/Libraries/Source/WWVegas/WW3D2/texture.cpp index 35993b849bf..36d0d362579 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/texture.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/texture.cpp @@ -46,15 +46,15 @@ #include "dx8wrapper.h" #include "WWLib/TARGA.h" #include -#include "WW3D2/w3d_file.h" -#include "WW3D2/assetmgr.h" +#include "w3d_file.h" +#include "assetmgr.h" #include "formconv.h" #include "textureloader.h" #include "missingtexture.h" #include "WWLib/ffactory.h" #include "dx8caps.h" #include "dx8texman.h" -#include "WW3D2/meshmatdesc.h" +#include "meshmatdesc.h" #include "texturethumbnail.h" #include "WWDebug/wwprofile.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp b/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp index a717414d252..4626a7d8fa9 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp @@ -46,8 +46,8 @@ #include "WWLib/ffactory.h" #include "WWLib/wwstring.h" #include "WWLib/bufffile.h" -#include "WW3D2/ww3d.h" -#include "WW3D2/assetmgr.h" +#include "ww3d.h" +#include "assetmgr.h" #include "dx8wrapper.h" #include "dx8caps.h" #include "missingtexture.h" @@ -56,7 +56,7 @@ #include "WWDebug/wwmemlog.h" #include "formconv.h" #include "texturethumbnail.h" -#include "WW3D2/ddsfile.h" +#include "ddsfile.h" #include "bitmaphandler.h" #include "WWDebug/wwprofile.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp b/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp index 0fee1ed70bd..181f18745c9 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp @@ -21,7 +21,7 @@ #include "missingtexture.h" #include "WWLib/TARGA.h" #include "ww3dformat.h" -#include "WW3D2/ddsfile.h" +#include "ddsfile.h" #include "textureloader.h" #include "bitmaphandler.h" #include "WWLib/ffactory.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.cpp b/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.cpp index 6f2f39a666a..ac61acc0257 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.cpp @@ -37,7 +37,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "visrasterizer.h" -#include "WW3D2/camera.h" +#include "camera.h" #include "WWMath/plane.h" #include "WWMath/vp.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.h b/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.h index be4f732fd5e..20081c1ba12 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.h @@ -46,7 +46,7 @@ #include "WWLib/simplevec.h" #include "WWLib/bittype.h" #include "WWMath/plane.h" -#include "WW3D2/meshgeometry.h" +#include "meshgeometry.h" class CameraClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.cpp b/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.cpp index e4cd16f7755..e1dba6df305 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.cpp @@ -60,7 +60,7 @@ class STLSpecialAlloc #include "w3d_dep.h" -#include "WW3D2/w3d_file.h" +#include "w3d_file.h" #include #include #include "WWLib/ffactory.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.cpp b/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.cpp index a2f1c35476b..d18a9c661c1 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.cpp @@ -39,7 +39,7 @@ #include "WWMath/vector3.h" #include "WWMath/vector4.h" #include "WWMath/quat.h" -#include "WW3D2/shader.h" +#include "shader.h" void W3dUtilityClass::Convert_Vector(const W3dVectorStruct & v,Vector3 * set) diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.h b/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.h index 39808bb18df..8a0feb3ca06 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.h @@ -37,7 +37,7 @@ #pragma once #include "WWLib/always.h" -#include "WW3D2/w3d_file.h" +#include "w3d_file.h" class Vector3; class Vector4; diff --git a/Core/Libraries/Source/WWVegas/WWDownload/Download.h b/Core/Libraries/Source/WWVegas/WWDownload/Download.h index bed1916507f..1169f3631ef 100644 --- a/Core/Libraries/Source/WWVegas/WWDownload/Download.h +++ b/Core/Libraries/Source/WWVegas/WWDownload/Download.h @@ -21,8 +21,8 @@ #pragma once //#include "../resource.h" // main symbols -#include "WWDownload/ftp.h" -#include "WWDownload/downloaddefs.h" +#include "ftp.h" +#include "downloaddefs.h" ///////////////////////////////////////////////////////////////////////////// // CDownload diff --git a/Core/Libraries/Source/WWVegas/WWDownload/ftp.h b/Core/Libraries/Source/WWVegas/WWDownload/ftp.h index bfc3ee3f8b3..bc709153784 100644 --- a/Core/Libraries/Source/WWVegas/WWDownload/ftp.h +++ b/Core/Libraries/Source/WWVegas/WWDownload/ftp.h @@ -26,7 +26,7 @@ #include #include -#include "WWDownload/ftpdefs.h" +#include "ftpdefs.h" // FTP server return codes. See RFC 959 diff --git a/Core/Libraries/Source/WWVegas/WWLib/CMakeLists.txt b/Core/Libraries/Source/WWVegas/WWLib/CMakeLists.txt index 4aef55e2082..503e47b02ad 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/CMakeLists.txt +++ b/Core/Libraries/Source/WWVegas/WWLib/CMakeLists.txt @@ -172,13 +172,15 @@ set_target_properties(core_wwlib PROPERTIES OUTPUT_NAME wwlib) target_sources(core_wwlib PRIVATE ${WWLIB_SRC}) +target_include_directories(core_wwlib PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) + target_precompile_headers(core_wwlib PRIVATE [["Utility/CppMacros.h"]] # Must be first, to be removed when abandoning VC6 - [["WWLib/always.h"]] - [["WWLib/STLUtils.h"]] - [["WWLib/win.h"]] - [["WWLib/WWCommon.h"]] - [["WWLib/wwstring.h"]] + [["always.h"]] + [["STLUtils.h"]] + [["win.h"]] + [["WWCommon.h"]] + [["wwstring.h"]] ) diff --git a/Core/Libraries/Source/WWVegas/WWLib/DbgHelpLoader.h b/Core/Libraries/Source/WWVegas/WWLib/DbgHelpLoader.h index fa40554ea67..556cbafcc61 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/DbgHelpLoader.h +++ b/Core/Libraries/Source/WWVegas/WWLib/DbgHelpLoader.h @@ -20,11 +20,11 @@ #include "always.h" -#include +#include "win.h" #include // Must be included after Windows.h #include #ifdef RTS_ENABLE_CRASHDUMP -#include +#include "DbgHelpLoader_minidump.h" #endif #include "mutex.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt b/Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt index ef4965eb60d..f8362a0caed 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt @@ -233,13 +233,18 @@ set_target_properties(g_ww3d2 PROPERTIES OUTPUT_NAME ww3d2) target_sources(g_ww3d2 PRIVATE ${WW3D2_SRC}) +target_include_directories(g_ww3d2 PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} + $ +) + target_compile_definitions(g_ww3d2 PRIVATE $<$:WINVER=0x0500> ) target_precompile_headers(g_ww3d2 PRIVATE [["Utility/CppMacros.h"]] # Must be first, to be removed when abandoning VC6 - [["WW3D2/dx8wrapper.h"]] + [["dx8wrapper.h"]] [["WWLib/always.h"]] [["WWLib/STLUtils.h"]] [["WWLib/win.h"]] diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.cpp index 27b835f0101..40790b0002c 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.cpp @@ -59,13 +59,13 @@ #include "animobj.h" -#include "WW3D2/htree.h" +#include "htree.h" #include "assetmgr.h" -#include "WW3D2/hanim.h" -#include "WW3D2/hcanim.h" +#include "hanim.h" +#include "hcanim.h" #include "ww3d.h" #include "WWDebug/wwmemlog.h" -#include "WW3D2/animatedsoundmgr.h" +#include "animatedsoundmgr.h" /*********************************************************************************************** diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.h index eee665cc393..2f808aa485d 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.h @@ -41,9 +41,9 @@ #pragma once #include "WWLib/always.h" -#include "WW3D2/composite.h" -#include "WW3D2/htree.h" -#include "WW3D2/hanim.h" +#include "composite.h" +#include "htree.h" +#include "hanim.h" class SkinClass; class RenderInfoClass; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp index 3931fdef3b7..a9dac652860 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp @@ -87,35 +87,35 @@ #include "htreemgr.h" #include "hanimmgr.h" -#include "WW3D2/texture.h" -#include "WW3D2/font3d.h" -#include "WW3D2/render2dsentence.h" // for FontCharsClass -#include "WW3D2/proto.h" -#include "WW3D2/hanim.h" -#include "WW3D2/hcanim.h" -#include "WW3D2/htree.h" -#include "WW3D2/collect.h" +#include "texture.h" +#include "font3d.h" +#include "render2dsentence.h" // for FontCharsClass +#include "proto.h" +#include "hanim.h" +#include "hcanim.h" +#include "htree.h" +#include "collect.h" #include "ww3d.h" #include "WWLib/ffactory.h" #include "boxrobj.h" #include "nullrobj.h" -#include "WW3D2/distlod.h" +#include "distlod.h" #include "hlod.h" -#include "WW3D2/agg_def.h" +#include "agg_def.h" #include "WWLib/wwstring.h" #include "WWDebug/wwmemlog.h" #include "dazzle.h" -#include "WW3D2/dx8wrapper.h" -#include "WW3D2/dx8renderer.h" -#include "WW3D2/metalmap.h" -#include "WW3D2/w3dexclusionlist.h" +#include "dx8wrapper.h" +#include "dx8renderer.h" +#include "metalmap.h" +#include "w3dexclusionlist.h" #include #include #include #include "WWDebug/wwprofile.h" -#include "WW3D2/assetstatus.h" -#include "WW3D2/ringobj.h" -#include "WW3D2/sphereobj.h" +#include "assetstatus.h" +#include "ringobj.h" +#include "sphereobj.h" /* ** Static member variable which keeps track of the single instanced asset manager diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h index 68ea6722627..0b3fb564f7c 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h @@ -42,7 +42,7 @@ #include "htreemgr.h" #include "hanimmgr.h" #include "WWLib/SLIST.h" -#include "WW3D2/texture.h" +#include "texture.h" #include "WWLib/hashtemplate.h" #include "WWLib/simplevec.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.cpp index cfca344bb07..367dea479ee 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.cpp @@ -89,20 +89,20 @@ #include "boxrobj.h" -#include "WW3D2/w3d_util.h" +#include "w3d_util.h" #include "WWDebug/wwdebug.h" #include "vertmaterial.h" #include "ww3d.h" #include "WWLib/chunkio.h" #include "rinfo.h" -#include "WW3D2/coltest.h" -#include "WW3D2/inttest.h" -#include "WW3D2/dx8wrapper.h" -#include "WW3D2/dx8indexbuffer.h" -#include "WW3D2/dx8vertexbuffer.h" -#include "WW3D2/dx8fvf.h" -#include "WW3D2/sortingrenderer.h" -#include "WW3D2/visrasterizer.h" +#include "coltest.h" +#include "inttest.h" +#include "dx8wrapper.h" +#include "dx8indexbuffer.h" +#include "dx8vertexbuffer.h" +#include "dx8fvf.h" +#include "sortingrenderer.h" +#include "visrasterizer.h" #include "meshgeometry.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h index 1f3685879ef..721f5e3358c 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h @@ -37,10 +37,10 @@ #pragma once #include "WWLib/always.h" -#include "WW3D2/rendobj.h" +#include "rendobj.h" #include "w3d_file.h" #include "shader.h" -#include "WW3D2/proto.h" +#include "proto.h" #include "WWMath/obbox.h" class VertexMaterialClass; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.cpp index b66ebc26cda..8f838f954a9 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.cpp @@ -74,7 +74,7 @@ #include "camera.h" #include "ww3d.h" #include "WWMath/matrix4.h" -#include "WW3D2/dx8wrapper.h" +#include "dx8wrapper.h" /*********************************************************************************************** diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h index a87058ec235..22403593368 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h @@ -46,7 +46,7 @@ #pragma once #include "WWLib/always.h" -#include "WW3D2/rendobj.h" +#include "rendobj.h" #include "WWMath/plane.h" #include "WWMath/frustum.h" #include "WWMath/obbox.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp index 8115d654606..cd1416c0924 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp @@ -56,12 +56,12 @@ #include "WWLib/WWFILE.h" #include "WWLib/inisup.h" #include "WWSaveLoad/persistfactory.h" -#include "WW3D2/ww3dids.h" -#include "WW3D2/dx8wrapper.h" -#include "WW3D2/dx8vertexbuffer.h" -#include "WW3D2/dx8indexbuffer.h" -#include "WW3D2/sortingrenderer.h" -#include "WW3D2/texture.h" +#include "ww3dids.h" +#include "dx8wrapper.h" +#include "dx8vertexbuffer.h" +#include "dx8indexbuffer.h" +#include "sortingrenderer.h" +#include "texture.h" #include "scene.h" #include "WWDebug/wwprofile.h" #include diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h index f83e7e65678..d03abf15059 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h @@ -21,10 +21,10 @@ #include "WWLib/always.h" #include "WWMath/vector3.h" #include "WWMath/matrix3d.h" -#include "WW3D2/rendobj.h" +#include "rendobj.h" #include "WWLib/wwstring.h" -#include "WW3D2/proto.h" -#include "WW3D2/w3derr.h" +#include "proto.h" +#include "w3derr.h" #include "shader.h" #include "WWMath/matrix4.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.cpp index a21ce614457..8ecaa031565 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.cpp @@ -21,10 +21,10 @@ #include "ddsfile.h" #include "WWLib/ffactory.h" #include "WWLib/bufffile.h" -#include "WW3D2/formconv.h" -#include "WW3D2/dx8wrapper.h" -#include "WW3D2/bitmaphandler.h" -#include "WW3D2/colorspace.h" +#include "formconv.h" +#include "dx8wrapper.h" +#include "bitmaphandler.h" +#include "colorspace.h" #include // ---------------------------------------------------------------------------- diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h index 973b7e71fc0..5d341111a4b 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h @@ -21,7 +21,7 @@ #pragma once #include "WWLib/always.h" -#include "WW3D2/ww3dformat.h" +#include "ww3dformat.h" #include "WWLib/wwstring.h" #include "WWMath/vector3.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.cpp index 79abb668959..3b9c1d07f8d 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.cpp @@ -52,17 +52,17 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "decalmsh.h" -#include "WW3D2/decalsys.h" +#include "decalsys.h" #include "rinfo.h" #include "mesh.h" #include "meshmdl.h" #include "WWMath/plane.h" -#include "WW3D2/statistics.h" -#include "WW3D2/dx8vertexbuffer.h" -#include "WW3D2/dx8indexbuffer.h" +#include "statistics.h" +#include "dx8vertexbuffer.h" +#include "dx8indexbuffer.h" #include "WWLib/simplevec.h" -#include "WW3D2/texture.h" -#include "WW3D2/dx8wrapper.h" +#include "texture.h" +#include "dx8wrapper.h" #define DISABLE_CLIPPING 0 diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.cpp index 039d80db672..3876d84ca7c 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.cpp @@ -47,14 +47,14 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "hanimmgr.h" -#include "WW3D2/hanim.h" +#include "hanim.h" #include "hrawanim.h" -#include "WW3D2/hcanim.h" +#include "hcanim.h" #include "hmorphanim.h" #include "WWLib/chunkio.h" #include "WWDebug/wwmemlog.h" -#include "WW3D2/w3dexclusionlist.h" -#include "WW3D2/animatedsoundmgr.h" +#include "w3dexclusionlist.h" +#include "animatedsoundmgr.h" /*********************************************************************************************** diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp index 9dce50fbc31..00182a473f8 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp @@ -128,10 +128,10 @@ #include "hlod.h" #include "assetmgr.h" -#include "WW3D2/hmdldef.h" -#include "WW3D2/w3derr.h" +#include "hmdldef.h" +#include "w3derr.h" #include "WWLib/chunkio.h" -#include "WW3D2/predlod.h" +#include "predlod.h" #include "rinfo.h" #include #include "WWMath/sphere.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h index 02cc810ec9c..785f5f77c95 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h @@ -38,10 +38,10 @@ #include "animobj.h" #include "WWLib/Vector.h" -#include "WW3D2/snapPts.h" -#include "WW3D2/proto.h" -#include "WW3D2/w3derr.h" -#include "WW3D2/proxy.h" +#include "snapPts.h" +#include "proto.h" +#include "w3derr.h" +#include "proxy.h" class DistLODClass; class HModelClass; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.cpp index 11e86d2ff94..c0e82f399d5 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.cpp @@ -40,7 +40,7 @@ #include "w3d_file.h" #include "WWLib/chunkio.h" #include "assetmgr.h" -#include "WW3D2/htree.h" +#include "htree.h" #include "WWLib/wwstring.h" #include "WWLib/textfile.h" #include "WWLib/simplevec.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h index b2b910fe39c..c842d26d1f8 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h @@ -39,7 +39,7 @@ #pragma once #include "WWLib/always.h" -#include "WW3D2/hanim.h" +#include "hanim.h" #include "WWLib/simplevec.h" class TimeCodedMorphKeysClass; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp index 4e2bbe6e754..06524ad697a 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp @@ -54,7 +54,7 @@ #include "motchan.h" #include "WWLib/chunkio.h" #include "assetmgr.h" -#include "WW3D2/htree.h" +#include "htree.h" /*********************************************************************************************** * NodeMotionStruct::NodeMotionStruct -- constructor * diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h index c7d46afb4e1..f0dbe82995f 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h @@ -39,7 +39,7 @@ #pragma once #include "WWLib/always.h" -#include "WW3D2/hanim.h" +#include "hanim.h" class MotionChannelClass; class BitChannelClass; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.cpp index 3e41c3bd2ad..bd1aad00f70 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.cpp @@ -45,10 +45,10 @@ #include "htreemgr.h" -#include "WW3D2/htree.h" +#include "htree.h" #include "WWLib/chunkio.h" #include "WWDebug/wwmemlog.h" -#include "WW3D2/w3dexclusionlist.h" +#include "w3dexclusionlist.h" /*********************************************************************************************** diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.cpp index ba9b6142001..4018f2ad4d2 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.cpp @@ -58,15 +58,15 @@ #include "light.h" #include "ww3d.h" -#include "WW3D2/ww3dids.h" +#include "ww3dids.h" #include "w3d_file.h" -#include "WW3D2/w3d_util.h" -#include "WW3D2/w3derr.h" +#include "w3d_util.h" +#include "w3derr.h" #include "WWLib/chunkio.h" #include "rinfo.h" #include "scene.h" #include "WWSaveLoad/persistfactory.h" -#include "WW3D2/statistics.h" +#include "statistics.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h index fc83c136f36..dc30acc3f33 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h @@ -37,8 +37,8 @@ #pragma once #include "WWLib/always.h" -#include "WW3D2/rendobj.h" -#include "WW3D2/w3derr.h" +#include "rendobj.h" +#include "w3derr.h" class ChunkLoadClass; class ChunkSaveClass; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.cpp index c1c0d4ba9ca..b60e78bc4c6 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.cpp @@ -39,12 +39,12 @@ #include "ww3d.h" #include "WWLib/INI.h" #include "WWLib/chunkio.h" -#include "WW3D2/w3derr.h" +#include "w3derr.h" #include "meshmatdesc.h" -#include "WW3D2/dx8wrapper.h" +#include "dx8wrapper.h" #include "WWDebug/wwdebug.h" -#include "WW3D2/matinfo.h" -#include "WW3D2/rendobj.h" +#include "matinfo.h" +#include "rendobj.h" #include "mesh.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h index 6673f18b994..c515cebc4e0 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h @@ -41,7 +41,7 @@ #include "WWLib/always.h" #include "w3d_file.h" -#include "WW3D2/w3derr.h" +#include "w3derr.h" #include "WWMath/vector2.h" #include "WWMath/vector3.h" #include "ww3d.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.cpp index 8aaf1b78125..2b8ad39034c 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.cpp @@ -44,7 +44,7 @@ #include "matrixmapper.h" -#include "WW3D2/dx8wrapper.h" +#include "dx8wrapper.h" /*********************************************************************************************** diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp index 6b4ed3c59c2..e73dec6e546 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp @@ -90,32 +90,32 @@ #include #include "w3d_file.h" #include "assetmgr.h" -#include "WW3D2/w3derr.h" +#include "w3derr.h" #include "WWDebug/wwdebug.h" #include "vertmaterial.h" #include "shader.h" -#include "WW3D2/matinfo.h" -#include "WW3D2/htree.h" +#include "matinfo.h" +#include "htree.h" #include "meshbuild.h" #include "WWMath/tri.h" #include "WWMath/aaplane.h" -#include "WW3D2/aabtree.h" +#include "aabtree.h" #include "WWLib/chunkio.h" -#include "WW3D2/w3d_util.h" +#include "w3d_util.h" #include "meshmdl.h" #include "meshgeometry.h" #include "ww3d.h" #include "camera.h" -#include "WW3D2/texture.h" +#include "texture.h" #include "rinfo.h" -#include "WW3D2/coltest.h" -#include "WW3D2/inttest.h" +#include "coltest.h" +#include "inttest.h" #include "decalmsh.h" -#include "WW3D2/decalsys.h" -#include "WW3D2/dx8polygonrenderer.h" -#include "WW3D2/dx8indexbuffer.h" -#include "WW3D2/dx8renderer.h" -#include "WW3D2/visrasterizer.h" +#include "decalsys.h" +#include "dx8polygonrenderer.h" +#include "dx8indexbuffer.h" +#include "dx8renderer.h" +#include "visrasterizer.h" #include "WWDebug/wwmemlog.h" #include diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h index b6a0929dbb3..e44f2affdd1 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h @@ -38,9 +38,9 @@ #pragma once #include "WWLib/always.h" -#include "WW3D2/rendobj.h" +#include "rendobj.h" #include "WWLib/bittype.h" -#include "WW3D2/w3derr.h" +#include "w3derr.h" #include "lightenvironment.h" //added for 'Generals' class MeshBuilderClass; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.cpp index 4da62359afc..9d335b1bd6a 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.cpp @@ -86,7 +86,7 @@ #include "meshgeometry.h" -#include "WW3D2/aabtree.h" +#include "aabtree.h" #include "WWLib/chunkio.h" #include "WWMath/aabox.h" #include "WWMath/obbox.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h index b08dcf14e87..f7953065595 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h @@ -42,14 +42,14 @@ #include "WWLib/bittype.h" #include "WWLib/simplevec.h" #include "WWLib/sharebuf.h" -#include "WW3D2/w3derr.h" +#include "w3derr.h" #include "WWMath/vector3.h" #include "WWMath/Vector3i.h" #include "WWMath/vector4.h" #include "WWDebug/wwdebug.h" #include "WWLib/multilist.h" -#include "WW3D2/coltest.h" -#include "WW3D2/inttest.h" +#include "coltest.h" +#include "inttest.h" class AABoxClass; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.cpp index 8398fd11559..27e556bae5f 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.cpp @@ -37,11 +37,11 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "meshmatdesc.h" -#include "WW3D2/texture.h" +#include "texture.h" #include "vertmaterial.h" #include "WWLib/realcrc.h" -#include "WW3D2/dx8wrapper.h" -#include "WW3D2/dx8caps.h" +#include "dx8wrapper.h" +#include "dx8caps.h" /************************************************************************************************** diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.cpp index e111be52c8b..a4e927226eb 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.cpp @@ -35,15 +35,15 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "meshmdl.h" -#include "WW3D2/matinfo.h" -#include "WW3D2/aabtree.h" -#include "WW3D2/htree.h" +#include "matinfo.h" +#include "aabtree.h" +#include "htree.h" #include "WWMath/vp.h" -#include "WW3D2/visrasterizer.h" -#include "WW3D2/dx8polygonrenderer.h" -#include "WW3D2/bwrender.h" +#include "visrasterizer.h" +#include "dx8polygonrenderer.h" +#include "bwrender.h" #include "camera.h" -#include "WW3D2/dx8renderer.h" +#include "dx8renderer.h" #include "WWLib/hashtemplate.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h index c2902f0a06a..6fc2acf2c9f 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h @@ -51,7 +51,7 @@ #include "rinfo.h" #include "meshgeometry.h" #include "meshmatdesc.h" -#include "WW3D2/dx8list.h" +#include "dx8list.h" class TextureClass; class RenderInfoClass; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp index 6931ed0e505..ed94f8508d1 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp @@ -76,19 +76,19 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "meshmdl.h" -#include "WW3D2/aabtree.h" -#include "WW3D2/matinfo.h" +#include "aabtree.h" +#include "matinfo.h" #include "vertmaterial.h" #include "shader.h" -#include "WW3D2/texture.h" +#include "texture.h" #include "WWLib/chunkio.h" -#include "WW3D2/w3derr.h" +#include "w3derr.h" #include "w3d_file.h" -#include "WW3D2/w3d_util.h" +#include "w3d_util.h" #include "assetmgr.h" #include "WWLib/simplevec.h" #include "WWLib/realcrc.h" -#include "WW3D2/dx8wrapper.h" +#include "dx8wrapper.h" #ifdef _UNIX #include "osdep/osdep.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h index 7151dd0ee63..aebfccdc201 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h @@ -36,8 +36,8 @@ #pragma once -#include "WW3D2/rendobj.h" -#include "WW3D2/proto.h" +#include "rendobj.h" +#include "proto.h" class Null3DObjClass : public RenderObjClass { diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.cpp index a786bcbd143..bbcde0144d0 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.cpp @@ -40,7 +40,7 @@ #include "rinfo.h" #include "scene.h" #include "camera.h" -#include "WW3D2/predlod.h" +#include "predlod.h" #include "WWMath/pot.h" #include "WWLib/bound.h" #include "WWLib/simplevec.h" @@ -48,8 +48,8 @@ #include "WWDebug/wwprofile.h" #include #include "WWMath/vp.h" -#include "WW3D2/texture.h" -#include "WW3D2/dx8wrapper.h" +#include "texture.h" +#include "dx8wrapper.h" #include "WWMath/vector3.h" // A random permutation of the numbers 0 to 15 - used for LOD particle decimation. diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h index cb2d504dfe5..2331a8573dd 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h @@ -36,9 +36,9 @@ #pragma once -#include "WW3D2/rendobj.h" -#include "WW3D2/pointgr.h" -#include "WW3D2/seglinerenderer.h" +#include "rendobj.h" +#include "pointgr.h" +#include "seglinerenderer.h" class ParticleEmitterClass; template struct ParticlePropertyStruct; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp index 6d32d14b4ee..9f644336998 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp @@ -39,9 +39,9 @@ #include "ww3d.h" #include "assetmgr.h" #include "part_ldr.h" -#include "WW3D2/w3derr.h" +#include "w3derr.h" #include "scene.h" -#include "WW3D2/texture.h" +#include "texture.h" #include "WWDebug/wwprofile.h" #include #include diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h index a21082feaa3..fc02284354c 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h @@ -36,12 +36,12 @@ #pragma once -#include "WW3D2/rendobj.h" +#include "rendobj.h" #include "WWLib/RANDOM.h" #include "part_buf.h" #include "WWMath/quat.h" #include "w3d_file.h" -#include "WW3D2/w3derr.h" +#include "w3derr.h" #include "WWMath/v3_rnd.h" // Forward declarations diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.cpp index b39a05becdc..6e36f9cfe00 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.cpp @@ -35,11 +35,11 @@ #include "part_ldr.h" #include "part_emt.h" -#include "WW3D2/w3derr.h" +#include "w3derr.h" #include "WWLib/chunkio.h" #include "WWLib/win.h" // for lstrcpy, can this be improved? #include "assetmgr.h" -#include "WW3D2/texture.h" +#include "texture.h" #ifndef SAFE_DELETE #define SAFE_DELETE(pointer) { delete pointer; pointer = nullptr; } diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h index 0a6b5411a7f..9ff21bee7e7 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h @@ -34,11 +34,11 @@ #pragma once -#include "WW3D2/proto.h" -#include "WW3D2/rendobj.h" +#include "proto.h" +#include "rendobj.h" #include "w3d_file.h" -#include "WW3D2/w3derr.h" -#include "WW3D2/w3d_util.h" +#include "w3derr.h" +#include "w3d_util.h" #include "part_emt.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp index a36cf4a5901..34b430bacf2 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp @@ -35,18 +35,18 @@ #include "render2d.h" #include "WWLib/mutex.h" #include "ww3d.h" -#include "WW3D2/font3d.h" +#include "font3d.h" #include "WWMath/rect.h" -#include "WW3D2/texture.h" +#include "texture.h" #include "WWMath/matrix4.h" #include "WWMath/matrix3d.h" -#include "WW3D2/dx8wrapper.h" -#include "WW3D2/dx8indexbuffer.h" -#include "WW3D2/dx8vertexbuffer.h" -#include "WW3D2/sortingrenderer.h" +#include "dx8wrapper.h" +#include "dx8indexbuffer.h" +#include "dx8vertexbuffer.h" +#include "sortingrenderer.h" #include "vertmaterial.h" -#include "WW3D2/dx8fvf.h" -#include "WW3D2/dx8caps.h" +#include "dx8fvf.h" +#include "dx8caps.h" #include "WWDebug/wwprofile.h" #include "WWDebug/wwmemlog.h" #include "assetmgr.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/rinfo.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/rinfo.cpp index f24caee7a6e..09b57edd8d0 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/rinfo.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/rinfo.cpp @@ -37,7 +37,7 @@ #include "rinfo.h" #include "camera.h" -#include "WW3D2/matpass.h" +#include "matpass.h" /*********************************************************************************************** diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp index 227344784ba..ebcb5a667a0 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp @@ -63,10 +63,10 @@ #include "ww3d.h" #include "rinfo.h" #include "WWLib/chunkio.h" -#include "WW3D2/dx8renderer.h" -#include "WW3D2/dx8wrapper.h" -#include "WW3D2/sortingrenderer.h" -#include "WW3D2/coltest.h" +#include "dx8renderer.h" +#include "dx8wrapper.h" +#include "sortingrenderer.h" +#include "coltest.h" /* diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h index 7aa548c39e3..522efe639e7 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h @@ -38,7 +38,7 @@ #include "WWLib/always.h" #include "WWMath/vector3.h" -#include "WW3D2/robjlist.h" +#include "robjlist.h" #include "WWDebug/wwdebug.h" class RenderObjClass; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/shader.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/shader.cpp index 7d94dbbea6d..b945cfc1708 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/shader.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/shader.cpp @@ -43,8 +43,8 @@ #include "shader.h" #include "w3d_file.h" #include "WWDebug/wwdebug.h" -#include "WW3D2/dx8wrapper.h" -#include "WW3D2/dx8caps.h" +#include "dx8wrapper.h" +#include "dx8caps.h" bool ShaderClass::ShaderDirty=true; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp index a536fe41b05..b202a634b18 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp @@ -40,12 +40,12 @@ #include "vertmaterial.h" #include "WWLib/realcrc.h" #include "WWDebug/wwdebug.h" -#include "WW3D2/w3d_util.h" +#include "w3d_util.h" #include "WWLib/chunkio.h" -#include "WW3D2/w3derr.h" +#include "w3derr.h" #include "WWLib/INI.h" #include "WWLib/XSTRAW.h" -#include "WW3D2/dx8wrapper.h" +#include "dx8wrapper.h" static unsigned int unique=1; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h index 332b644df68..e191a8fe399 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h @@ -41,7 +41,7 @@ #include "WWMath/vector3.h" #include "w3d_file.h" #include "meshbuild.h" -#include "WW3D2/w3derr.h" +#include "w3derr.h" #include "mapper.h" #include "WWLib/wwstring.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h index 252ebd78662..0a78e2b150f 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h @@ -2270,4 +2270,4 @@ struct W3dShdSubMeshHeaderStruct /* ** Include the obsolete structures and chunk ID's */ -#include "WW3D2/w3d_obsolete.h" +#include "w3d_obsolete.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp index c12469332d5..f0bfa5e6951 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp @@ -85,39 +85,39 @@ #include "rinfo.h" #include "assetmgr.h" #include "boxrobj.h" -#include "WW3D2/predlod.h" +#include "predlod.h" #include "camera.h" #include "scene.h" #include "WWLib/registry.h" -#include "WW3D2/segline.h" +#include "segline.h" #include "shader.h" #include "vertmaterial.h" #include "WWDebug/wwdebug.h" #include "WWDebug/wwprofile.h" #include "WWDebug/wwmemlog.h" -#include "WW3D2/shattersystem.h" -#include "WW3D2/textureloader.h" -#include "WW3D2/statistics.h" -#include "WW3D2/pointgr.h" +#include "shattersystem.h" +#include "textureloader.h" +#include "statistics.h" +#include "pointgr.h" #include "WWLib/ffactory.h" #include "WWLib/INI.h" #include "dazzle.h" #include "meshmdl.h" -#include "WW3D2/dx8renderer.h" +#include "dx8renderer.h" #include "render2d.h" #include "WWLib/bound.h" -#include "WW3D2/rddesc.h" +#include "rddesc.h" #include "WWMath/Vector3i.h" -#include "WW3D2/dx8wrapper.h" +#include "dx8wrapper.h" #include "WWLib/TARGA.h" -#include "WW3D2/sortingrenderer.h" +#include "sortingrenderer.h" #include "WWLib/thread.h" #include "WWLib/cpudetect.h" -#include "WW3D2/dx8texman.h" -#include "WW3D2/formconv.h" -#include "WW3D2/animatedsoundmgr.h" -#include "WW3D2/static_sort_list.h" -#include "WW3D2/framgrab.h" +#include "dx8texman.h" +#include "formconv.h" +#include "animatedsoundmgr.h" +#include "static_sort_list.h" +#include "framgrab.h" #include "Lib/BaseType.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h index 0c36c96556e..d89b4dcc133 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h @@ -38,9 +38,9 @@ #include "WWLib/always.h" #include "WWMath/vector3.h" -#include "WW3D2/layer.h" -#include "WW3D2/w3derr.h" -#include "WW3D2/robjlist.h" +#include "layer.h" +#include "w3derr.h" +#include "robjlist.h" class SceneClass; class CameraClass; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt index 52e3470e6fd..ce28e2c067f 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt @@ -238,13 +238,18 @@ set_target_properties(z_ww3d2 PROPERTIES OUTPUT_NAME ww3d2) target_sources(z_ww3d2 PRIVATE ${WW3D2_SRC}) +target_include_directories(z_ww3d2 PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} + $ +) + target_compile_definitions(z_ww3d2 PRIVATE $<$:WINVER=0x0500> ) target_precompile_headers(z_ww3d2 PRIVATE [["Utility/CppMacros.h"]] # Must be first, to be removed when abandoning VC6 - [["WW3D2/dx8wrapper.h"]] + [["dx8wrapper.h"]] [["WWLib/always.h"]] [["WWLib/STLUtils.h"]] [["WWLib/win.h"]] diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.cpp index ed278d37817..32317e69ecd 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.cpp @@ -59,13 +59,13 @@ #include "animobj.h" -#include "WW3D2/htree.h" +#include "htree.h" #include "assetmgr.h" -#include "WW3D2/hanim.h" -#include "WW3D2/hcanim.h" +#include "hanim.h" +#include "hcanim.h" #include "ww3d.h" #include "WWDebug/wwmemlog.h" -#include "WW3D2/animatedsoundmgr.h" +#include "animatedsoundmgr.h" /*********************************************************************************************** diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.h index 4a3c7fbd370..704a169e77e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.h @@ -41,9 +41,9 @@ #pragma once #include "WWLib/always.h" -#include "WW3D2/composite.h" -#include "WW3D2/htree.h" -#include "WW3D2/hanim.h" +#include "composite.h" +#include "htree.h" +#include "hanim.h" class SkinClass; class RenderInfoClass; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp index 9ce8fb48662..ce6f67a0324 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.cpp @@ -88,37 +88,37 @@ #include "htreemgr.h" #include "hanimmgr.h" -#include "WW3D2/texture.h" -#include "WW3D2/font3d.h" -#include "WW3D2/render2dsentence.h" // for FontCharsClass -#include "WW3D2/proto.h" -#include "WW3D2/hanim.h" -#include "WW3D2/hcanim.h" -#include "WW3D2/htree.h" -#include "WW3D2/collect.h" +#include "texture.h" +#include "font3d.h" +#include "render2dsentence.h" // for FontCharsClass +#include "proto.h" +#include "hanim.h" +#include "hcanim.h" +#include "htree.h" +#include "collect.h" #include "ww3d.h" #include "WWLib/ffactory.h" #include "boxrobj.h" #include "nullrobj.h" -#include "WW3D2/distlod.h" +#include "distlod.h" #include "hlod.h" -#include "WW3D2/agg_def.h" +#include "agg_def.h" #include "WWLib/wwstring.h" #include "WWDebug/wwmemlog.h" #include "dazzle.h" -#include "WW3D2/dx8wrapper.h" -#include "WW3D2/dx8renderer.h" -#include "WW3D2/metalmap.h" -#include "WW3D2/w3dexclusionlist.h" +#include "dx8wrapper.h" +#include "dx8renderer.h" +#include "metalmap.h" +#include "w3dexclusionlist.h" #include #include #include #include "WWDebug/wwprofile.h" -#include "WW3D2/assetstatus.h" -#include "WW3D2/ringobj.h" -#include "WW3D2/sphereobj.h" +#include "assetstatus.h" +#include "ringobj.h" +#include "sphereobj.h" -#include "WW3D2/shdlib.h" +#include "shdlib.h" /* ** Static member variable which keeps track of the single instanced asset manager diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h index 757afefbd31..ae7733cc099 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h @@ -42,7 +42,7 @@ #include "htreemgr.h" #include "hanimmgr.h" #include "WWLib/SLIST.h" -#include "WW3D2/texture.h" +#include "texture.h" #include "WWLib/hashtemplate.h" #include "WWLib/simplevec.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.cpp index 2f5dc5f5e9d..1256e5d41eb 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.cpp @@ -89,20 +89,20 @@ #include "boxrobj.h" -#include "WW3D2/w3d_util.h" +#include "w3d_util.h" #include "WWDebug/wwdebug.h" #include "vertmaterial.h" #include "ww3d.h" #include "WWLib/chunkio.h" #include "rinfo.h" -#include "WW3D2/coltest.h" -#include "WW3D2/inttest.h" -#include "WW3D2/dx8wrapper.h" -#include "WW3D2/dx8indexbuffer.h" -#include "WW3D2/dx8vertexbuffer.h" -#include "WW3D2/dx8fvf.h" -#include "WW3D2/sortingrenderer.h" -#include "WW3D2/visrasterizer.h" +#include "coltest.h" +#include "inttest.h" +#include "dx8wrapper.h" +#include "dx8indexbuffer.h" +#include "dx8vertexbuffer.h" +#include "dx8fvf.h" +#include "sortingrenderer.h" +#include "visrasterizer.h" #include "meshgeometry.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h index e7a5bdc6692..ed3f38077fc 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h @@ -37,10 +37,10 @@ #pragma once #include "WWLib/always.h" -#include "WW3D2/rendobj.h" +#include "rendobj.h" #include "w3d_file.h" #include "shader.h" -#include "WW3D2/proto.h" +#include "proto.h" #include "WWMath/obbox.h" class VertexMaterialClass; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.cpp index a42e7e4fe43..90332efb9b4 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.cpp @@ -74,7 +74,7 @@ #include "camera.h" #include "ww3d.h" #include "WWMath/matrix4.h" -#include "WW3D2/dx8wrapper.h" +#include "dx8wrapper.h" /*********************************************************************************************** diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h index f726f6cad07..f9c63b1175e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h @@ -46,7 +46,7 @@ #pragma once #include "WWLib/always.h" -#include "WW3D2/rendobj.h" +#include "rendobj.h" #include "WWMath/plane.h" #include "WWMath/frustum.h" #include "WWMath/obbox.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp index 27fc3cd0230..b242e9be09b 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.cpp @@ -56,15 +56,15 @@ #include "WWLib/WWFILE.h" #include "WWLib/inisup.h" #include "WWSaveLoad/persistfactory.h" -#include "WW3D2/ww3dids.h" -#include "WW3D2/dx8wrapper.h" -#include "WW3D2/dx8vertexbuffer.h" -#include "WW3D2/dx8indexbuffer.h" -#include "WW3D2/sortingrenderer.h" -#include "WW3D2/texture.h" +#include "ww3dids.h" +#include "dx8wrapper.h" +#include "dx8vertexbuffer.h" +#include "dx8indexbuffer.h" +#include "sortingrenderer.h" +#include "texture.h" #include "scene.h" #include "WWDebug/wwprofile.h" -#include "WW3D2/visrasterizer.h" +#include "visrasterizer.h" #include #include diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h index de8e7190bb5..87b1e5ecb52 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h @@ -21,10 +21,10 @@ #include "WWLib/always.h" #include "WWMath/vector3.h" #include "WWMath/matrix3d.h" -#include "WW3D2/rendobj.h" +#include "rendobj.h" #include "WWLib/wwstring.h" -#include "WW3D2/proto.h" -#include "WW3D2/w3derr.h" +#include "proto.h" +#include "w3derr.h" #include "shader.h" #include "WWMath/matrix4.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.cpp index 0fa44e57580..f625baee325 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.cpp @@ -21,10 +21,10 @@ #include "ddsfile.h" #include "WWLib/ffactory.h" #include "WWLib/bufffile.h" -#include "WW3D2/formconv.h" -#include "WW3D2/dx8wrapper.h" -#include "WW3D2/bitmaphandler.h" -#include "WW3D2/colorspace.h" +#include "formconv.h" +#include "dx8wrapper.h" +#include "bitmaphandler.h" +#include "colorspace.h" #include // ---------------------------------------------------------------------------- diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h index 72da3fec4bb..b617a6bbffe 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h @@ -21,7 +21,7 @@ #pragma once #include "WWLib/always.h" -#include "WW3D2/ww3dformat.h" +#include "ww3dformat.h" #include "WWLib/wwstring.h" #include "WWMath/vector3.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.cpp index 4448ba801db..040b3dc230f 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/decalmsh.cpp @@ -52,18 +52,18 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "decalmsh.h" -#include "WW3D2/decalsys.h" +#include "decalsys.h" #include "rinfo.h" #include "mesh.h" #include "meshmdl.h" #include "WWMath/plane.h" -#include "WW3D2/statistics.h" -#include "WW3D2/dx8vertexbuffer.h" -#include "WW3D2/dx8indexbuffer.h" +#include "statistics.h" +#include "dx8vertexbuffer.h" +#include "dx8indexbuffer.h" #include "WWLib/simplevec.h" -#include "WW3D2/texture.h" -#include "WW3D2/dx8wrapper.h" -#include "WW3D2/dx8caps.h" +#include "texture.h" +#include "dx8wrapper.h" +#include "dx8caps.h" #define DISABLE_CLIPPING 0 diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.cpp index a43a1c5e971..60e7e7908c2 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hanimmgr.cpp @@ -47,14 +47,14 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "hanimmgr.h" -#include "WW3D2/hanim.h" +#include "hanim.h" #include "hrawanim.h" -#include "WW3D2/hcanim.h" +#include "hcanim.h" #include "hmorphanim.h" #include "WWLib/chunkio.h" #include "WWDebug/wwmemlog.h" -#include "WW3D2/w3dexclusionlist.h" -#include "WW3D2/animatedsoundmgr.h" +#include "w3dexclusionlist.h" +#include "animatedsoundmgr.h" /*********************************************************************************************** diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp index 4c895325d13..0db93d24ad5 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.cpp @@ -128,10 +128,10 @@ #include "hlod.h" #include "assetmgr.h" -#include "WW3D2/hmdldef.h" -#include "WW3D2/w3derr.h" +#include "hmdldef.h" +#include "w3derr.h" #include "WWLib/chunkio.h" -#include "WW3D2/predlod.h" +#include "predlod.h" #include "rinfo.h" #include #include "WWMath/sphere.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h index f48d74d0f2a..ee080be42d8 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h @@ -38,10 +38,10 @@ #include "animobj.h" #include "WWLib/Vector.h" -#include "WW3D2/snapPts.h" -#include "WW3D2/proto.h" -#include "WW3D2/w3derr.h" -#include "WW3D2/proxy.h" +#include "snapPts.h" +#include "proto.h" +#include "w3derr.h" +#include "proxy.h" class DistLODClass; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.cpp index 9460ded55ae..d1e346c51ec 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.cpp @@ -40,7 +40,7 @@ #include "w3d_file.h" #include "WWLib/chunkio.h" #include "assetmgr.h" -#include "WW3D2/htree.h" +#include "htree.h" #include "WWLib/wwstring.h" #include "WWLib/textfile.h" #include "WWLib/simplevec.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h index 2b0eee80542..b070e2643f1 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h @@ -39,7 +39,7 @@ #pragma once #include "WWLib/always.h" -#include "WW3D2/hanim.h" +#include "hanim.h" #include "WWLib/simplevec.h" class TimeCodedMorphKeysClass; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp index 499285d8f13..8b0406e8869 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.cpp @@ -54,7 +54,7 @@ #include "motchan.h" #include "WWLib/chunkio.h" #include "assetmgr.h" -#include "WW3D2/htree.h" +#include "htree.h" /*********************************************************************************************** * NodeMotionStruct::NodeMotionStruct -- constructor * diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h index 7ad9e67513f..9c6e83b3371 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h @@ -39,7 +39,7 @@ #pragma once #include "WWLib/always.h" -#include "WW3D2/hanim.h" +#include "hanim.h" class MotionChannelClass; class BitChannelClass; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.cpp index 4464df9d312..db7c3a85413 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/htreemgr.cpp @@ -45,10 +45,10 @@ #include "htreemgr.h" -#include "WW3D2/htree.h" +#include "htree.h" #include "WWLib/chunkio.h" #include "WWDebug/wwmemlog.h" -#include "WW3D2/w3dexclusionlist.h" +#include "w3dexclusionlist.h" /*********************************************************************************************** diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.cpp index 7b322bf642b..b2c9e5793fa 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.cpp @@ -58,15 +58,15 @@ #include "light.h" #include "ww3d.h" -#include "WW3D2/ww3dids.h" +#include "ww3dids.h" #include "w3d_file.h" -#include "WW3D2/w3d_util.h" -#include "WW3D2/w3derr.h" +#include "w3d_util.h" +#include "w3derr.h" #include "WWLib/chunkio.h" #include "rinfo.h" #include "scene.h" #include "WWSaveLoad/persistfactory.h" -#include "WW3D2/statistics.h" +#include "statistics.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h index 605cae0115b..aa8dcaddd8b 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h @@ -37,8 +37,8 @@ #pragma once #include "WWLib/always.h" -#include "WW3D2/rendobj.h" -#include "WW3D2/w3derr.h" +#include "rendobj.h" +#include "w3derr.h" class ChunkLoadClass; class ChunkSaveClass; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.cpp index b95d49611e9..9bd45bfc659 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/lightenvironment.cpp @@ -41,7 +41,7 @@ #include "WWMath/matrix3d.h" #include "camera.h" #include "light.h" -#include "WW3D2/colorspace.h" +#include "colorspace.h" /* ** Constants diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/linegrp.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/linegrp.cpp index e61142bc226..797b36fbcb9 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/linegrp.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/linegrp.cpp @@ -39,15 +39,15 @@ #include "WWLib/sharebuf.h" #include "linegrp.h" -#include "WW3D2/texture.h" +#include "texture.h" #include "vertmaterial.h" -#include "WW3D2/dx8wrapper.h" +#include "dx8wrapper.h" #include "WWMath/wwmath.h" #include "rinfo.h" #include "camera.h" -#include "WW3D2/dx8indexbuffer.h" -#include "WW3D2/dx8vertexbuffer.h" -#include "WW3D2/sortingrenderer.h" +#include "dx8indexbuffer.h" +#include "dx8vertexbuffer.h" +#include "sortingrenderer.h" // Line groups are a rendering primitive similar to point groups // They are tetrahedra which are aligned with the view plane with their centers diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.cpp index b08d50c2a89..21d44498110 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.cpp @@ -39,12 +39,12 @@ #include "ww3d.h" #include "WWLib/INI.h" #include "WWLib/chunkio.h" -#include "WW3D2/w3derr.h" +#include "w3derr.h" #include "meshmatdesc.h" -#include "WW3D2/dx8wrapper.h" +#include "dx8wrapper.h" #include "WWDebug/wwdebug.h" -#include "WW3D2/matinfo.h" -#include "WW3D2/rendobj.h" +#include "matinfo.h" +#include "rendobj.h" #include "mesh.h" #include #include diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h index 9650f3f6173..934ee504c23 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h @@ -41,7 +41,7 @@ #include "WWLib/always.h" #include "w3d_file.h" -#include "WW3D2/w3derr.h" +#include "w3derr.h" #include "WWMath/vector2.h" #include "WWMath/vector3.h" #include "ww3d.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.cpp index 7264a7dd3c6..e3be6a87520 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/matrixmapper.cpp @@ -51,7 +51,7 @@ #include "matrixmapper.h" -#include "WW3D2/dx8wrapper.h" +#include "dx8wrapper.h" /*********************************************************************************************** diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp index 0da89d80964..199f5010496 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.cpp @@ -90,34 +90,34 @@ #include #include "w3d_file.h" #include "assetmgr.h" -#include "WW3D2/w3derr.h" +#include "w3derr.h" #include "WWDebug/wwdebug.h" #include "vertmaterial.h" #include "shader.h" -#include "WW3D2/matinfo.h" -#include "WW3D2/htree.h" +#include "matinfo.h" +#include "htree.h" #include "meshbuild.h" #include "WWMath/tri.h" #include "WWMath/aaplane.h" -#include "WW3D2/aabtree.h" +#include "aabtree.h" #include "WWLib/chunkio.h" -#include "WW3D2/w3d_util.h" +#include "w3d_util.h" #include "meshmdl.h" #include "meshgeometry.h" #include "ww3d.h" #include "camera.h" -#include "WW3D2/texture.h" +#include "texture.h" #include "rinfo.h" -#include "WW3D2/coltest.h" -#include "WW3D2/inttest.h" +#include "coltest.h" +#include "inttest.h" #include "decalmsh.h" -#include "WW3D2/decalsys.h" -#include "WW3D2/dx8polygonrenderer.h" -#include "WW3D2/dx8indexbuffer.h" -#include "WW3D2/dx8renderer.h" -#include "WW3D2/visrasterizer.h" +#include "decalsys.h" +#include "dx8polygonrenderer.h" +#include "dx8indexbuffer.h" +#include "dx8renderer.h" +#include "visrasterizer.h" #include "WWDebug/wwmemlog.h" -#include "WW3D2/dx8rendererdebugger.h" +#include "dx8rendererdebugger.h" #include static unsigned MeshDebugIdCount; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h index 930be95d148..fee8cc448c9 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h @@ -38,9 +38,9 @@ #pragma once #include "WWLib/always.h" -#include "WW3D2/rendobj.h" +#include "rendobj.h" #include "WWLib/bittype.h" -#include "WW3D2/w3derr.h" +#include "w3derr.h" #include "lightenvironment.h" //added for 'Generals' class MeshBuilderClass; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.cpp index e54850fda5a..6e05a70c3f7 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.cpp @@ -86,7 +86,7 @@ #include "meshgeometry.h" -#include "WW3D2/aabtree.h" +#include "aabtree.h" #include "WWLib/chunkio.h" #include "WWMath/aabox.h" #include "WWMath/obbox.h" @@ -96,7 +96,7 @@ #include "WWDebug/wwmemlog.h" #include "w3d_file.h" #include "WWMath/vp.h" -#include "WW3D2/htree.h" +#include "htree.h" #include "WWMath/matrix4.h" #include "rinfo.h" #include "camera.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h index 84161f703f5..df7ed99a003 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h @@ -42,14 +42,14 @@ #include "WWLib/bittype.h" #include "WWLib/simplevec.h" #include "WWLib/sharebuf.h" -#include "WW3D2/w3derr.h" +#include "w3derr.h" #include "WWMath/vector3.h" #include "WWMath/Vector3i.h" #include "WWMath/vector4.h" #include "WWDebug/wwdebug.h" #include "WWLib/multilist.h" -#include "WW3D2/coltest.h" -#include "WW3D2/inttest.h" +#include "coltest.h" +#include "inttest.h" class AABoxClass; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.cpp index 5fe1781ecf0..982afc7549e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmatdesc.cpp @@ -37,11 +37,11 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "meshmatdesc.h" -#include "WW3D2/texture.h" +#include "texture.h" #include "vertmaterial.h" #include "WWLib/realcrc.h" -#include "WW3D2/dx8wrapper.h" -#include "WW3D2/dx8caps.h" +#include "dx8wrapper.h" +#include "dx8caps.h" #include "meshmdl.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.cpp index 3a1e60c3c6e..5ceea410902 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.cpp @@ -38,15 +38,15 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "meshmdl.h" -#include "WW3D2/matinfo.h" -#include "WW3D2/aabtree.h" -#include "WW3D2/htree.h" +#include "matinfo.h" +#include "aabtree.h" +#include "htree.h" #include "WWMath/vp.h" -#include "WW3D2/visrasterizer.h" -#include "WW3D2/dx8polygonrenderer.h" -#include "WW3D2/bwrender.h" +#include "visrasterizer.h" +#include "dx8polygonrenderer.h" +#include "bwrender.h" #include "camera.h" -#include "WW3D2/dx8renderer.h" +#include "dx8renderer.h" #include "WWLib/hashtemplate.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h index 293ac575a37..dc037287089 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h @@ -51,7 +51,7 @@ #include "rinfo.h" #include "meshgeometry.h" #include "meshmatdesc.h" -#include "WW3D2/dx8list.h" +#include "dx8list.h" class TextureClass; class RenderInfoClass; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp index 42a9abf3052..7cb67c9ad1e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdlio.cpp @@ -76,19 +76,19 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "meshmdl.h" -#include "WW3D2/aabtree.h" -#include "WW3D2/matinfo.h" +#include "aabtree.h" +#include "matinfo.h" #include "vertmaterial.h" #include "shader.h" -#include "WW3D2/texture.h" +#include "texture.h" #include "WWLib/chunkio.h" -#include "WW3D2/w3derr.h" +#include "w3derr.h" #include "w3d_file.h" -#include "WW3D2/w3d_util.h" +#include "w3d_util.h" #include "assetmgr.h" #include "WWLib/simplevec.h" #include "WWLib/realcrc.h" -#include "WW3D2/dx8wrapper.h" +#include "dx8wrapper.h" #ifdef _UNIX #include "osdep/osdep.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h index 58172b8b63e..08eaf76fbff 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h @@ -36,8 +36,8 @@ #pragma once -#include "WW3D2/rendobj.h" -#include "WW3D2/proto.h" +#include "rendobj.h" +#include "proto.h" class Null3DObjClass : public RenderObjClass { diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.cpp index 29f037e0e16..2d9b057ccb2 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.cpp @@ -40,7 +40,7 @@ #include "rinfo.h" #include "scene.h" #include "camera.h" -#include "WW3D2/predlod.h" +#include "predlod.h" #include "WWMath/pot.h" #include "WWLib/bound.h" #include "WWLib/simplevec.h" @@ -48,8 +48,8 @@ #include "WWDebug/wwprofile.h" #include #include "WWMath/vp.h" -#include "WW3D2/texture.h" -#include "WW3D2/dx8wrapper.h" +#include "texture.h" +#include "dx8wrapper.h" #include "WWMath/vector3.h" // A random permutation of the numbers 0 to 15 - used for LOD particle decimation. diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h index f9dd8a8c480..aa5f1b7900e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h @@ -36,9 +36,9 @@ #pragma once -#include "WW3D2/rendobj.h" -#include "WW3D2/pointgr.h" -#include "WW3D2/seglinerenderer.h" +#include "rendobj.h" +#include "pointgr.h" +#include "seglinerenderer.h" #include "linegrp.h" class ParticleEmitterClass; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp index ca8d9045bcc..bdab80fac63 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.cpp @@ -42,9 +42,9 @@ #include "ww3d.h" #include "assetmgr.h" #include "part_ldr.h" -#include "WW3D2/w3derr.h" +#include "w3derr.h" #include "scene.h" -#include "WW3D2/texture.h" +#include "texture.h" #include "WWDebug/wwprofile.h" #include #include diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h index 742f0ad23e1..c0e99f93e48 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h @@ -36,12 +36,12 @@ #pragma once -#include "WW3D2/rendobj.h" +#include "rendobj.h" #include "WWLib/RANDOM.h" #include "part_buf.h" #include "WWMath/quat.h" #include "w3d_file.h" -#include "WW3D2/w3derr.h" +#include "w3derr.h" #include "WWMath/v3_rnd.h" // Forward declarations diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.cpp index 4b847fd6e2e..eae230609f1 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.cpp @@ -35,11 +35,11 @@ #include "part_ldr.h" #include "part_emt.h" -#include "WW3D2/w3derr.h" +#include "w3derr.h" #include "WWLib/chunkio.h" #include "WWLib/win.h" // for lstrcpy, can this be improved? #include "assetmgr.h" -#include "WW3D2/texture.h" +#include "texture.h" #ifndef SAFE_DELETE #define SAFE_DELETE(pointer) { delete pointer; pointer = nullptr; } diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h index 47bb58cfb3a..7c088c897b8 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h @@ -34,11 +34,11 @@ #pragma once -#include "WW3D2/proto.h" -#include "WW3D2/rendobj.h" +#include "proto.h" +#include "rendobj.h" #include "w3d_file.h" -#include "WW3D2/w3derr.h" -#include "WW3D2/w3d_util.h" +#include "w3derr.h" +#include "w3d_util.h" #include "part_emt.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp index 36592e83276..e8ff2abe59e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/render2d.cpp @@ -42,18 +42,18 @@ #include "render2d.h" #include "WWLib/mutex.h" #include "ww3d.h" -#include "WW3D2/font3d.h" +#include "font3d.h" #include "WWMath/rect.h" -#include "WW3D2/texture.h" +#include "texture.h" #include "WWMath/matrix4.h" #include "WWMath/matrix3d.h" -#include "WW3D2/dx8wrapper.h" -#include "WW3D2/dx8indexbuffer.h" -#include "WW3D2/dx8vertexbuffer.h" -#include "WW3D2/sortingrenderer.h" +#include "dx8wrapper.h" +#include "dx8indexbuffer.h" +#include "dx8vertexbuffer.h" +#include "sortingrenderer.h" #include "vertmaterial.h" -#include "WW3D2/dx8fvf.h" -#include "WW3D2/dx8caps.h" +#include "dx8fvf.h" +#include "dx8caps.h" #include "WWDebug/wwprofile.h" #include "WWDebug/wwmemlog.h" #include "assetmgr.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rinfo.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rinfo.cpp index dc6c07c3887..21e710c59d9 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rinfo.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/rinfo.cpp @@ -40,7 +40,7 @@ #include "rinfo.h" #include "camera.h" -#include "WW3D2/matpass.h" +#include "matpass.h" /*********************************************************************************************** diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp index f76899d71ce..6967adc959e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.cpp @@ -67,10 +67,10 @@ #include "ww3d.h" #include "rinfo.h" #include "WWLib/chunkio.h" -#include "WW3D2/dx8renderer.h" -#include "WW3D2/dx8wrapper.h" -#include "WW3D2/sortingrenderer.h" -#include "WW3D2/coltest.h" +#include "dx8renderer.h" +#include "dx8wrapper.h" +#include "sortingrenderer.h" +#include "coltest.h" /* diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h index a358f9d0a23..c4b2979a46b 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h @@ -38,7 +38,7 @@ #include "WWLib/always.h" #include "WWMath/vector3.h" -#include "WW3D2/robjlist.h" +#include "robjlist.h" #include "WWDebug/wwdebug.h" class RenderObjClass; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.cpp index ec878aca073..c53cdb44783 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/shader.cpp @@ -43,8 +43,8 @@ #include "shader.h" #include "w3d_file.h" #include "WWDebug/wwdebug.h" -#include "WW3D2/dx8wrapper.h" -#include "WW3D2/dx8caps.h" +#include "dx8wrapper.h" +#include "dx8caps.h" bool ShaderClass::ShaderDirty=true; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp index 4467e88bb8f..d5182c0a772 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.cpp @@ -40,12 +40,12 @@ #include "vertmaterial.h" #include "WWLib/realcrc.h" #include "WWDebug/wwdebug.h" -#include "WW3D2/w3d_util.h" +#include "w3d_util.h" #include "WWLib/chunkio.h" -#include "WW3D2/w3derr.h" +#include "w3derr.h" #include "WWLib/INI.h" #include "WWLib/XSTRAW.h" -#include "WW3D2/dx8wrapper.h" +#include "dx8wrapper.h" static unsigned int unique=1; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h index 21119028946..3fd5b23096d 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h @@ -41,7 +41,7 @@ #include "WWMath/vector3.h" #include "w3d_file.h" #include "meshbuild.h" -#include "WW3D2/w3derr.h" +#include "w3derr.h" #include "mapper.h" #include "WWLib/wwstring.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h index d4e94b65bb0..97f95060dc0 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h @@ -2270,4 +2270,4 @@ struct W3dShdSubMeshHeaderStruct /* ** Include the obsolete structures and chunk ID's */ -#include "WW3D2/w3d_obsolete.h" +#include "w3d_obsolete.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp index 5f1c1ac6692..226c8a63c98 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.cpp @@ -85,40 +85,40 @@ #include "rinfo.h" #include "assetmgr.h" #include "boxrobj.h" -#include "WW3D2/predlod.h" +#include "predlod.h" #include "camera.h" #include "scene.h" #include "WWLib/registry.h" -#include "WW3D2/segline.h" +#include "segline.h" #include "shader.h" #include "vertmaterial.h" #include "WWDebug/wwdebug.h" #include "WWDebug/wwprofile.h" #include "WWDebug/wwmemlog.h" -#include "WW3D2/shattersystem.h" -#include "WW3D2/textureloader.h" -#include "WW3D2/statistics.h" -#include "WW3D2/pointgr.h" +#include "shattersystem.h" +#include "textureloader.h" +#include "statistics.h" +#include "pointgr.h" #include "WWLib/ffactory.h" #include "WWLib/INI.h" #include "dazzle.h" #include "meshmdl.h" -#include "WW3D2/dx8renderer.h" +#include "dx8renderer.h" #include "render2d.h" #include "WWLib/bound.h" -#include "WW3D2/rddesc.h" +#include "rddesc.h" #include "WWMath/Vector3i.h" -#include "WW3D2/dx8wrapper.h" +#include "dx8wrapper.h" #include "WWLib/TARGA.h" -#include "WW3D2/sortingrenderer.h" +#include "sortingrenderer.h" #include "WWLib/thread.h" #include "WWLib/cpudetect.h" -#include "WW3D2/dx8texman.h" -#include "WW3D2/formconv.h" -#include "WW3D2/animatedsoundmgr.h" -#include "WW3D2/static_sort_list.h" -#include "WW3D2/shdlib.h" -#include "WW3D2/framgrab.h" +#include "dx8texman.h" +#include "formconv.h" +#include "animatedsoundmgr.h" +#include "static_sort_list.h" +#include "shdlib.h" +#include "framgrab.h" #include "Lib/BaseType.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h index 02207fd8c53..cc50242dbdb 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h @@ -38,9 +38,9 @@ #include "WWLib/always.h" #include "WWMath/vector3.h" -#include "WW3D2/layer.h" -#include "WW3D2/w3derr.h" -#include "WW3D2/robjlist.h" +#include "layer.h" +#include "w3derr.h" +#include "robjlist.h" class SceneClass; class CameraClass; From 9c6f5a130bcf86e837d4e79834e50c21ef4bc482 Mon Sep 17 00:00:00 2001 From: Jacob Ledbetter Date: Thu, 30 Jul 2026 16:25:16 -0600 Subject: [PATCH 2/5] chore(wwlib): Keep precompiled headers qualified Avoid restoring a WWLib component include directory for a library that is not split across source trees. --- Core/Libraries/Source/WWVegas/WWLib/CMakeLists.txt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/Core/Libraries/Source/WWVegas/WWLib/CMakeLists.txt b/Core/Libraries/Source/WWVegas/WWLib/CMakeLists.txt index 503e47b02ad..4aef55e2082 100644 --- a/Core/Libraries/Source/WWVegas/WWLib/CMakeLists.txt +++ b/Core/Libraries/Source/WWVegas/WWLib/CMakeLists.txt @@ -172,15 +172,13 @@ set_target_properties(core_wwlib PROPERTIES OUTPUT_NAME wwlib) target_sources(core_wwlib PRIVATE ${WWLIB_SRC}) -target_include_directories(core_wwlib PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) - target_precompile_headers(core_wwlib PRIVATE [["Utility/CppMacros.h"]] # Must be first, to be removed when abandoning VC6 - [["always.h"]] - [["STLUtils.h"]] - [["win.h"]] - [["WWCommon.h"]] - [["wwstring.h"]] + [["WWLib/always.h"]] + [["WWLib/STLUtils.h"]] + [["WWLib/win.h"]] + [["WWLib/WWCommon.h"]] + [["WWLib/wwstring.h"]] ) From 20a0d569de34762c254b11f2a3588ef903bcacec Mon Sep 17 00:00:00 2001 From: Jacob Ledbetter Date: Thu, 30 Jul 2026 17:14:23 -0600 Subject: [PATCH 3/5] fix(wwvegas): Propagate WW3D2 include overlay --- Core/CMakeLists.txt | 2 ++ Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt | 3 +-- Generals/Code/CMakeLists.txt | 5 +++++ .../Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt | 9 ++++----- .../Code/Libraries/Source/WWVegas/WWAudio/CMakeLists.txt | 1 + GeneralsMD/Code/CMakeLists.txt | 5 +++++ .../Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt | 9 ++++----- .../Code/Libraries/Source/WWVegas/WWAudio/CMakeLists.txt | 1 + 8 files changed, 23 insertions(+), 12 deletions(-) diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt index 110ff1152d0..b7e845cbcbc 100644 --- a/Core/CMakeLists.txt +++ b/Core/CMakeLists.txt @@ -1,5 +1,6 @@ # 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) @@ -7,6 +8,7 @@ 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") diff --git a/Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt b/Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt index 74eecbe396d..aa86e784c74 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt +++ b/Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt @@ -237,8 +237,6 @@ add_library(corei_ww3d2 INTERFACE) target_sources(corei_ww3d2 INTERFACE ${WW3D2_SRC}) -target_include_directories(corei_ww3d2 INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}) - if (MSVC AND NOT IS_VS6_BUILD) target_link_libraries(corei_ww3d2 INTERFACE comsuppw @@ -247,6 +245,7 @@ endif() target_link_libraries(corei_ww3d2 INTERFACE core_browserengine + corei_ww3d2_include core_wwlib core_wwmath ) diff --git a/Generals/Code/CMakeLists.txt b/Generals/Code/CMakeLists.txt index 85838bb94d6..6f2fb8b2ae2 100644 --- a/Generals/Code/CMakeLists.txt +++ b/Generals/Code/CMakeLists.txt @@ -1,11 +1,13 @@ # g stands for Generals, i stands for Interface add_library(gi_gameengine_include INTERFACE) +add_library(gi_ww3d2_include INTERFACE) add_library(gi_libraries_source_wwvegas INTERFACE) add_library(gi_main INTERFACE) add_library(gi_always INTERFACE) add_library(gi_always_no_pch INTERFACE) # Use this for Shared Libs with MFC AFX target_include_directories(gi_gameengine_include INTERFACE "GameEngine/Include") +target_include_directories(gi_ww3d2_include INTERFACE "Libraries/Source/WWVegas/WW3D2") target_include_directories(gi_libraries_source_wwvegas INTERFACE "Libraries/Source/WWVegas") target_include_directories(gi_main INTERFACE "Main") @@ -18,6 +20,9 @@ target_compile_definitions(gi_always_no_pch INTERFACE target_link_libraries(gi_gameengine_include INTERFACE corei_gameengine_include ) +target_link_libraries(gi_ww3d2_include INTERFACE + corei_ww3d2_include +) target_link_libraries(gi_always INTERFACE corei_always # Must stay below so headers from game are included first ) diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt b/Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt index f8362a0caed..beb77ae2e00 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt @@ -233,11 +233,6 @@ set_target_properties(g_ww3d2 PROPERTIES OUTPUT_NAME ww3d2) target_sources(g_ww3d2 PRIVATE ${WW3D2_SRC}) -target_include_directories(g_ww3d2 PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} - $ -) - target_compile_definitions(g_ww3d2 PRIVATE $<$:WINVER=0x0500> ) @@ -253,6 +248,10 @@ target_precompile_headers(g_ww3d2 PRIVATE ) +target_link_libraries(g_ww3d2 PUBLIC + gi_ww3d2_include +) + target_link_libraries(g_ww3d2 PRIVATE core_wwdebug corei_ww3d2 diff --git a/Generals/Code/Libraries/Source/WWVegas/WWAudio/CMakeLists.txt b/Generals/Code/Libraries/Source/WWVegas/WWAudio/CMakeLists.txt index f1d4f7dbffe..ef1b4514421 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WWAudio/CMakeLists.txt +++ b/Generals/Code/Libraries/Source/WWVegas/WWAudio/CMakeLists.txt @@ -5,4 +5,5 @@ target_link_libraries(g_wwaudio PRIVATE corei_wwaudio g_wwcommon gi_always + gi_ww3d2_include ) diff --git a/GeneralsMD/Code/CMakeLists.txt b/GeneralsMD/Code/CMakeLists.txt index a713dcc7c2b..5b98914751f 100644 --- a/GeneralsMD/Code/CMakeLists.txt +++ b/GeneralsMD/Code/CMakeLists.txt @@ -1,11 +1,13 @@ # z stands for Zero Hour, i stands for Interface add_library(zi_gameengine_include INTERFACE) +add_library(zi_ww3d2_include INTERFACE) add_library(zi_libraries_source_wwvegas INTERFACE) add_library(zi_main INTERFACE) add_library(zi_always INTERFACE) add_library(zi_always_no_pch INTERFACE) # Use this for Shared Libs with MFC AFX target_include_directories(zi_gameengine_include INTERFACE "GameEngine/Include") +target_include_directories(zi_ww3d2_include INTERFACE "Libraries/Source/WWVegas/WW3D2") target_include_directories(zi_libraries_source_wwvegas INTERFACE "Libraries/Source/WWVegas") target_include_directories(zi_main INTERFACE "Main") @@ -18,6 +20,9 @@ target_compile_definitions(zi_always_no_pch INTERFACE target_link_libraries(zi_gameengine_include INTERFACE corei_gameengine_include ) +target_link_libraries(zi_ww3d2_include INTERFACE + corei_ww3d2_include +) target_link_libraries(zi_always INTERFACE corei_always # Must stay below so headers from game are included first ) diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt index ce28e2c067f..2be7239370f 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt @@ -238,11 +238,6 @@ set_target_properties(z_ww3d2 PROPERTIES OUTPUT_NAME ww3d2) target_sources(z_ww3d2 PRIVATE ${WW3D2_SRC}) -target_include_directories(z_ww3d2 PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} - $ -) - target_compile_definitions(z_ww3d2 PRIVATE $<$:WINVER=0x0500> ) @@ -258,6 +253,10 @@ target_precompile_headers(z_ww3d2 PRIVATE ) +target_link_libraries(z_ww3d2 PUBLIC + zi_ww3d2_include +) + target_link_libraries(z_ww3d2 PRIVATE core_wwdebug corei_ww3d2 diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WWAudio/CMakeLists.txt b/GeneralsMD/Code/Libraries/Source/WWVegas/WWAudio/CMakeLists.txt index 208ce48da05..8f964330d00 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WWAudio/CMakeLists.txt +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WWAudio/CMakeLists.txt @@ -5,4 +5,5 @@ target_link_libraries(z_wwaudio PRIVATE corei_wwaudio z_wwcommon zi_always + zi_ww3d2_include ) From 43ce165c22d802be7716b52b46dd93b327bb7089 Mon Sep 17 00:00:00 2001 From: Jacob Ledbetter Date: Fri, 31 Jul 2026 13:31:06 -0600 Subject: [PATCH 4/5] fix(wwvegas): Keep WWAudio outside WW3D2 overlay --- Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h | 2 +- Generals/Code/Libraries/Source/WWVegas/WWAudio/CMakeLists.txt | 1 - GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h | 2 +- GeneralsMD/Code/Libraries/Source/WWVegas/WWAudio/CMakeLists.txt | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h index 22403593368..a87058ec235 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/camera.h @@ -46,7 +46,7 @@ #pragma once #include "WWLib/always.h" -#include "rendobj.h" +#include "WW3D2/rendobj.h" #include "WWMath/plane.h" #include "WWMath/frustum.h" #include "WWMath/obbox.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WWAudio/CMakeLists.txt b/Generals/Code/Libraries/Source/WWVegas/WWAudio/CMakeLists.txt index ef1b4514421..f1d4f7dbffe 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WWAudio/CMakeLists.txt +++ b/Generals/Code/Libraries/Source/WWVegas/WWAudio/CMakeLists.txt @@ -5,5 +5,4 @@ target_link_libraries(g_wwaudio PRIVATE corei_wwaudio g_wwcommon gi_always - gi_ww3d2_include ) diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h index f9c63b1175e..f726f6cad07 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/camera.h @@ -46,7 +46,7 @@ #pragma once #include "WWLib/always.h" -#include "rendobj.h" +#include "WW3D2/rendobj.h" #include "WWMath/plane.h" #include "WWMath/frustum.h" #include "WWMath/obbox.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WWAudio/CMakeLists.txt b/GeneralsMD/Code/Libraries/Source/WWVegas/WWAudio/CMakeLists.txt index 8f964330d00..208ce48da05 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WWAudio/CMakeLists.txt +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WWAudio/CMakeLists.txt @@ -5,5 +5,4 @@ target_link_libraries(z_wwaudio PRIVATE corei_wwaudio z_wwcommon zi_always - zi_ww3d2_include ) From 8783bb058dfb7bfaec4c1d011ac4be0c9957726b Mon Sep 17 00:00:00 2001 From: Jacob Ledbetter Date: Fri, 31 Jul 2026 16:52:59 -0600 Subject: [PATCH 5/5] fix(wwvegas): Keep WW3D2 overlay private --- Core/CMakeLists.txt | 2 -- Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt | 5 ++++- Core/Libraries/Source/WWVegas/WW3D2/aabtree.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/agg_def.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/collect.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h | 4 ++-- Core/Libraries/Source/WWVegas/WW3D2/dx8renderer.h | 4 ++-- Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h | 6 +++--- Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h | 4 ++-- Core/Libraries/Source/WWVegas/WW3D2/hanim.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/hcanim.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/hmdldef.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/htree.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/intersec.inl | 2 +- Core/Libraries/Source/WWVegas/WW3D2/line3d.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/matinfo.h | 4 ++-- Core/Libraries/Source/WWVegas/WW3D2/matpass.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/pivot.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/pointgr.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/proto.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/ringobj.h | 4 ++-- Core/Libraries/Source/WWVegas/WW3D2/segline.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h | 6 +++--- Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/streak.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/streakRender.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/texproject.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/w3d_util.h | 2 +- Generals/Code/CMakeLists.txt | 5 ----- .../Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt | 8 ++++---- Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.h | 6 +++--- Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h | 2 +- Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h | 4 ++-- Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h | 6 +++--- Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h | 2 +- Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h | 8 ++++---- Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h | 2 +- Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h | 2 +- Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h | 4 ++-- Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h | 2 +- Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h | 4 ++-- .../Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h | 6 +++--- Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h | 2 +- Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h | 4 ++-- Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h | 6 +++--- Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h | 4 ++-- Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h | 8 ++++---- Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h | 2 +- .../Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h | 2 +- Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h | 2 +- Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h | 6 +++--- GeneralsMD/Code/CMakeLists.txt | 5 ----- .../Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt | 8 ++++---- GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.h | 6 +++--- GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h | 2 +- GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h | 4 ++-- GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h | 6 +++--- GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h | 2 +- GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h | 8 ++++---- .../Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h | 2 +- GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h | 2 +- GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h | 4 ++-- GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h | 2 +- GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h | 4 ++-- .../Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h | 6 +++--- GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h | 2 +- GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h | 4 ++-- GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h | 6 +++--- GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h | 4 ++-- GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h | 8 ++++---- GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h | 2 +- .../Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h | 2 +- GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h | 2 +- GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h | 6 +++--- 78 files changed, 135 insertions(+), 144 deletions(-) diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt index b7e845cbcbc..110ff1152d0 100644 --- a/Core/CMakeLists.txt +++ b/Core/CMakeLists.txt @@ -1,6 +1,5 @@ # 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) @@ -8,7 +7,6 @@ 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") diff --git a/Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt b/Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt index aa86e784c74..357022a1975 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt +++ b/Core/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt @@ -237,6 +237,10 @@ add_library(corei_ww3d2 INTERFACE) target_sources(corei_ww3d2 INTERFACE ${WW3D2_SRC}) +target_include_directories(corei_ww3d2 INTERFACE + "${CMAKE_CURRENT_SOURCE_DIR}" +) + if (MSVC AND NOT IS_VS6_BUILD) target_link_libraries(corei_ww3d2 INTERFACE comsuppw @@ -245,7 +249,6 @@ endif() target_link_libraries(corei_ww3d2 INTERFACE core_browserengine - corei_ww3d2_include core_wwlib core_wwmath ) diff --git a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h index 86b965b08ca..54c21044598 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h @@ -47,7 +47,7 @@ #include "WWLib/bittype.h" #include "WWMath/colmath.h" #include "WWDebug/wwdebug.h" -#include "aabtreebuilder.h" +#include "WW3D2/aabtreebuilder.h" #include "WWMath/obbox.h" #include #include diff --git a/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h b/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h index 71cdac20e6c..97228dfb374 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h @@ -36,7 +36,7 @@ #include "proto.h" #include "rendobj.h" -#include "w3d_file.h" +#include "WW3D2/w3d_file.h" #include "w3derr.h" #include "WWLib/Vector.h" #include "WWLib/bittype.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/collect.h b/Core/Libraries/Source/WWVegas/WW3D2/collect.h index 71f27d83e05..676a4a97157 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/collect.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/collect.h @@ -40,7 +40,7 @@ #include "composite.h" #include "WWLib/Vector.h" #include "proto.h" -#include "w3d_file.h" +#include "WW3D2/w3d_file.h" #include "WWLib/wwstring.h" #include "proxy.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h index 1068e7c3e58..17b7558049a 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h @@ -39,10 +39,10 @@ #pragma once #include "WWLib/always.h" -#include "meshmdl.h" +#include "WW3D2/meshmdl.h" #include "dx8list.h" #include "sortingrenderer.h" -#include "mesh.h" +#include "WW3D2/mesh.h" #include "dx8wrapper.h" class DX8PolygonRendererClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8renderer.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8renderer.h index fcd683c43a2..ff4f593e03a 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8renderer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8renderer.h @@ -44,9 +44,9 @@ #include "WWLib/simplevec.h" #include "WWLib/Vector.h" #include "dx8list.h" -#include "shader.h" +#include "WW3D2/shader.h" #include "dx8wrapper.h" -#include "meshmatdesc.h" +#include "WW3D2/meshmatdesc.h" class IndexBufferClass; class VertexBufferClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h index f9d68cf13c9..8a6f3d26495 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h @@ -47,8 +47,8 @@ #include "WWMath/matrix4.h" #include "statistics.h" #include "WWLib/wwstring.h" -#include "lightenvironment.h" -#include "shader.h" +#include "WW3D2/lightenvironment.h" +#include "WW3D2/shader.h" #include "WWMath/vector4.h" #include "WWLib/cpudetect.h" #include "dx8caps.h" @@ -56,7 +56,7 @@ #include "texture.h" #include "dx8vertexbuffer.h" #include "dx8indexbuffer.h" -#include "vertmaterial.h" +#include "WW3D2/vertmaterial.h" /* ** Registry value names diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h b/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h index e024ab5d68f..0fcd9c29554 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.h @@ -34,8 +34,8 @@ #pragma once -#include "meshgeometry.h" -#include "meshmatdesc.h" +#include "WW3D2/meshgeometry.h" +#include "WW3D2/meshmatdesc.h" #include "matinfo.h" #include "rendobj.h" #include "polyinfo.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hanim.h b/Core/Libraries/Source/WWVegas/WW3D2/hanim.h index 28a7e6675ff..3a47500c2e2 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hanim.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/hanim.h @@ -39,7 +39,7 @@ #include "WWLib/always.h" #include "WWMath/quat.h" -#include "w3d_file.h" +#include "WW3D2/w3d_file.h" #include "WWLib/hash.h" #include "WWLib/mempool.h" #include diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h b/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h index 3dd3d4b4c4d..b7c85029c57 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h @@ -39,7 +39,7 @@ #include "WWLib/always.h" #include "WWMath/quat.h" -#include "w3d_file.h" +#include "WW3D2/w3d_file.h" #include "WWLib/SLIST.h" #include "WWLib/Vector.h" #include "hanim.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.h b/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.h index 141d108f622..47570b209fe 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.h @@ -37,7 +37,7 @@ #pragma once #include "WWLib/always.h" -#include "w3d_file.h" +#include "WW3D2/w3d_file.h" class FileClass; class ChunkLoadClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/htree.h b/Core/Libraries/Source/WWVegas/WW3D2/htree.h index a190ec82e3f..7bbdb383160 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/htree.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/htree.h @@ -42,7 +42,7 @@ #include "WWMath/quat.h" #include "WWMath/matrix3d.h" #include "WWMath/vector3.h" -#include "w3d_file.h" +#include "WW3D2/w3d_file.h" #include "WWDebug/wwdebug.h" class HAnimClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/intersec.inl b/Core/Libraries/Source/WWVegas/WW3D2/intersec.inl index 3fc05e586fb..b9ca0b9ff41 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/intersec.inl +++ b/Core/Libraries/Source/WWVegas/WW3D2/intersec.inl @@ -22,7 +22,7 @@ #ifndef INTERSEC_INL #define INTERSEC_INL -#include "camera.h" +#include "WW3D2/camera.h" /// debug code that will be tossed diff --git a/Core/Libraries/Source/WWVegas/WW3D2/line3d.h b/Core/Libraries/Source/WWVegas/WW3D2/line3d.h index 327c1a20bf0..7fb2be1fad8 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/line3d.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/line3d.h @@ -40,7 +40,7 @@ #include "rendobj.h" #include "WWMath/vector3.h" #include "WWMath/vector4.h" -#include "shader.h" +#include "WW3D2/shader.h" class VertexMaterialClass; class RenderInfoClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h b/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h index 14c742440d7..a8fe13450ed 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h @@ -39,9 +39,9 @@ #include "WWLib/always.h" #include "WWDebug/wwdebug.h" #include "WWLib/Vector.h" -#include "vertmaterial.h" +#include "WW3D2/vertmaterial.h" #include "texture.h" -#include "shader.h" +#include "WW3D2/shader.h" #ifdef _UNIX #include "osdep.h" #endif diff --git a/Core/Libraries/Source/WWVegas/WW3D2/matpass.h b/Core/Libraries/Source/WWVegas/WW3D2/matpass.h index 4f28d900bc3..53dd32afb62 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/matpass.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/matpass.h @@ -40,7 +40,7 @@ #pragma once #include "WWLib/always.h" -#include "shader.h" +#include "WW3D2/shader.h" class TextureClass; class VertexMaterialClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/pivot.h b/Core/Libraries/Source/WWVegas/WW3D2/pivot.h index 17abc0a49c5..167c0094610 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/pivot.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/pivot.h @@ -41,7 +41,7 @@ #include "WWMath/vector3.h" #include "WWMath/matrix3d.h" #include "WWMath/quat.h" -#include "w3d_file.h" +#include "WW3D2/w3d_file.h" /* diff --git a/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h b/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h index 973ad41ea08..5b1a23d1413 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h @@ -37,7 +37,7 @@ #pragma once #include "WWLib/sharebuf.h" -#include "shader.h" +#include "WW3D2/shader.h" #include "WWMath/vector4.h" #include "WWMath/vector3.h" #include "WWMath/vector2.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/proto.h b/Core/Libraries/Source/WWVegas/WW3D2/proto.h index 91af6b43460..07861b87f7b 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/proto.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/proto.h @@ -38,7 +38,7 @@ #include "WWLib/always.h" #include -#include "w3d_file.h" +#include "WW3D2/w3d_file.h" class RenderObjClass; class ChunkLoadClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h index 8427d53b289..15426c1e950 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h @@ -37,7 +37,7 @@ #pragma once #include "WWLib/always.h" -#include "render2d.h" +#include "WW3D2/render2d.h" #include "WWLib/Vector.h" #include "WWMath/vector2i.h" #include "WWLib/wwstring.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h index 24073cf7d64..b997bd0c385 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h @@ -38,8 +38,8 @@ #include "WWLib/always.h" #include "rendobj.h" -#include "w3d_file.h" -#include "shader.h" +#include "WW3D2/w3d_file.h" +#include "WW3D2/shader.h" #include "proto.h" #include "WWMath/obbox.h" #include "WWMath/quat.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/segline.h b/Core/Libraries/Source/WWVegas/WW3D2/segline.h index 00a4881f695..e934adca877 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/segline.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/segline.h @@ -37,7 +37,7 @@ #pragma once #include "rendobj.h" -#include "shader.h" +#include "WW3D2/shader.h" #include "WWLib/simplevec.h" #include "seglinerenderer.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.h b/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.h index 9b043f57586..8053adbf223 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.h @@ -39,7 +39,7 @@ #pragma once #include "WWLib/always.h" -#include "shader.h" +#include "WW3D2/shader.h" #include "texture.h" #include "WWMath/matrix3d.h" #include "WWMath/vector2.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h index 826a2080870..4ca84795fc0 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h @@ -44,7 +44,7 @@ #include "rendobj.h" #include "WWLib/wwstring.h" #include "proto.h" -#include "w3d_file.h" +#include "WW3D2/w3d_file.h" #include "w3derr.h" #include "WWAudio/AudibleSound.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h index 4d911d03fbc..76328bc3e04 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h @@ -38,14 +38,14 @@ #include "WWLib/always.h" #include "rendobj.h" -#include "w3d_file.h" -#include "shader.h" +#include "WW3D2/w3d_file.h" +#include "WW3D2/shader.h" #include "proto.h" #include "WWMath/obbox.h" #include "WWMath/Vector3i.h" #include "WWMath/quat.h" #include "prim_anim.h" -#include "meshgeometry.h" +#include "WW3D2/meshgeometry.h" class TextureClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h b/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h index 0095b60a746..5dd640d8c58 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/static_sort_list.h @@ -39,7 +39,7 @@ #pragma once #include "robjlist.h" -#include "w3d_file.h" +#include "WW3D2/w3d_file.h" class RenderInfoClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/streak.h b/Core/Libraries/Source/WWVegas/WW3D2/streak.h index 14b8130fccb..77a242689e0 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/streak.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/streak.h @@ -37,7 +37,7 @@ #pragma once #include "rendobj.h" -#include "shader.h" +#include "WW3D2/shader.h" #include "WWLib/simplevec.h" #include "seglinerenderer.h" #include "streakRender.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/streakRender.h b/Core/Libraries/Source/WWVegas/WW3D2/streakRender.h index 8cd0f2d4e20..46337fea7db 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/streakRender.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/streakRender.h @@ -39,7 +39,7 @@ #pragma once #include "WWLib/always.h" -#include "shader.h" +#include "WW3D2/shader.h" #include "texture.h" #include "WWMath/matrix3d.h" #include "WWMath/vector2.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texproject.h b/Core/Libraries/Source/WWVegas/WW3D2/texproject.h index 33c63ff591f..368a1584a59 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/texproject.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/texproject.h @@ -44,7 +44,7 @@ #include "WWMath/matrix4.h" #include "WWMath/obbox.h" #include "matpass.h" -#include "matrixmapper.h" +#include "WW3D2/matrixmapper.h" #include "WWMath/cullsys.h" #include "WWLib/multilist.h" #include "projector.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.h b/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.h index 20081c1ba12..be4f732fd5e 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.h @@ -46,7 +46,7 @@ #include "WWLib/simplevec.h" #include "WWLib/bittype.h" #include "WWMath/plane.h" -#include "meshgeometry.h" +#include "WW3D2/meshgeometry.h" class CameraClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.h b/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.h index 8a0feb3ca06..39808bb18df 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.h @@ -37,7 +37,7 @@ #pragma once #include "WWLib/always.h" -#include "w3d_file.h" +#include "WW3D2/w3d_file.h" class Vector3; class Vector4; diff --git a/Generals/Code/CMakeLists.txt b/Generals/Code/CMakeLists.txt index 6f2fb8b2ae2..85838bb94d6 100644 --- a/Generals/Code/CMakeLists.txt +++ b/Generals/Code/CMakeLists.txt @@ -1,13 +1,11 @@ # g stands for Generals, i stands for Interface add_library(gi_gameengine_include INTERFACE) -add_library(gi_ww3d2_include INTERFACE) add_library(gi_libraries_source_wwvegas INTERFACE) add_library(gi_main INTERFACE) add_library(gi_always INTERFACE) add_library(gi_always_no_pch INTERFACE) # Use this for Shared Libs with MFC AFX target_include_directories(gi_gameengine_include INTERFACE "GameEngine/Include") -target_include_directories(gi_ww3d2_include INTERFACE "Libraries/Source/WWVegas/WW3D2") target_include_directories(gi_libraries_source_wwvegas INTERFACE "Libraries/Source/WWVegas") target_include_directories(gi_main INTERFACE "Main") @@ -20,9 +18,6 @@ target_compile_definitions(gi_always_no_pch INTERFACE target_link_libraries(gi_gameengine_include INTERFACE corei_gameengine_include ) -target_link_libraries(gi_ww3d2_include INTERFACE - corei_ww3d2_include -) target_link_libraries(gi_always INTERFACE corei_always # Must stay below so headers from game are included first ) diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt b/Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt index beb77ae2e00..8fc30f2edcf 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt @@ -233,6 +233,10 @@ set_target_properties(g_ww3d2 PROPERTIES OUTPUT_NAME ww3d2) target_sources(g_ww3d2 PRIVATE ${WW3D2_SRC}) +target_include_directories(g_ww3d2 PRIVATE + "${CMAKE_CURRENT_SOURCE_DIR}" +) + target_compile_definitions(g_ww3d2 PRIVATE $<$:WINVER=0x0500> ) @@ -248,10 +252,6 @@ target_precompile_headers(g_ww3d2 PRIVATE ) -target_link_libraries(g_ww3d2 PUBLIC - gi_ww3d2_include -) - target_link_libraries(g_ww3d2 PRIVATE core_wwdebug corei_ww3d2 diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.h index 2f808aa485d..eee665cc393 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/animobj.h @@ -41,9 +41,9 @@ #pragma once #include "WWLib/always.h" -#include "composite.h" -#include "htree.h" -#include "hanim.h" +#include "WW3D2/composite.h" +#include "WW3D2/htree.h" +#include "WW3D2/hanim.h" class SkinClass; class RenderInfoClass; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h index 0b3fb564f7c..68ea6722627 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h @@ -42,7 +42,7 @@ #include "htreemgr.h" #include "hanimmgr.h" #include "WWLib/SLIST.h" -#include "texture.h" +#include "WW3D2/texture.h" #include "WWLib/hashtemplate.h" #include "WWLib/simplevec.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h index 721f5e3358c..1f3685879ef 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h @@ -37,10 +37,10 @@ #pragma once #include "WWLib/always.h" -#include "rendobj.h" +#include "WW3D2/rendobj.h" #include "w3d_file.h" #include "shader.h" -#include "proto.h" +#include "WW3D2/proto.h" #include "WWMath/obbox.h" class VertexMaterialClass; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h index d03abf15059..f83e7e65678 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h @@ -21,10 +21,10 @@ #include "WWLib/always.h" #include "WWMath/vector3.h" #include "WWMath/matrix3d.h" -#include "rendobj.h" +#include "WW3D2/rendobj.h" #include "WWLib/wwstring.h" -#include "proto.h" -#include "w3derr.h" +#include "WW3D2/proto.h" +#include "WW3D2/w3derr.h" #include "shader.h" #include "WWMath/matrix4.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h index 5d341111a4b..973b7e71fc0 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h @@ -21,7 +21,7 @@ #pragma once #include "WWLib/always.h" -#include "ww3dformat.h" +#include "WW3D2/ww3dformat.h" #include "WWLib/wwstring.h" #include "WWMath/vector3.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h index 785f5f77c95..02cc810ec9c 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hlod.h @@ -38,10 +38,10 @@ #include "animobj.h" #include "WWLib/Vector.h" -#include "snapPts.h" -#include "proto.h" -#include "w3derr.h" -#include "proxy.h" +#include "WW3D2/snapPts.h" +#include "WW3D2/proto.h" +#include "WW3D2/w3derr.h" +#include "WW3D2/proxy.h" class DistLODClass; class HModelClass; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h index c842d26d1f8..b2b910fe39c 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h @@ -39,7 +39,7 @@ #pragma once #include "WWLib/always.h" -#include "hanim.h" +#include "WW3D2/hanim.h" #include "WWLib/simplevec.h" class TimeCodedMorphKeysClass; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h index f0dbe82995f..c7d46afb4e1 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h @@ -39,7 +39,7 @@ #pragma once #include "WWLib/always.h" -#include "hanim.h" +#include "WW3D2/hanim.h" class MotionChannelClass; class BitChannelClass; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h index dc30acc3f33..fc83c136f36 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/light.h @@ -37,8 +37,8 @@ #pragma once #include "WWLib/always.h" -#include "rendobj.h" -#include "w3derr.h" +#include "WW3D2/rendobj.h" +#include "WW3D2/w3derr.h" class ChunkLoadClass; class ChunkSaveClass; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h index c515cebc4e0..6673f18b994 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mapper.h @@ -41,7 +41,7 @@ #include "WWLib/always.h" #include "w3d_file.h" -#include "w3derr.h" +#include "WW3D2/w3derr.h" #include "WWMath/vector2.h" #include "WWMath/vector3.h" #include "ww3d.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h index e44f2affdd1..b6a0929dbb3 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/mesh.h @@ -38,9 +38,9 @@ #pragma once #include "WWLib/always.h" -#include "rendobj.h" +#include "WW3D2/rendobj.h" #include "WWLib/bittype.h" -#include "w3derr.h" +#include "WW3D2/w3derr.h" #include "lightenvironment.h" //added for 'Generals' class MeshBuilderClass; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h index f7953065595..b08dcf14e87 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h @@ -42,14 +42,14 @@ #include "WWLib/bittype.h" #include "WWLib/simplevec.h" #include "WWLib/sharebuf.h" -#include "w3derr.h" +#include "WW3D2/w3derr.h" #include "WWMath/vector3.h" #include "WWMath/Vector3i.h" #include "WWMath/vector4.h" #include "WWDebug/wwdebug.h" #include "WWLib/multilist.h" -#include "coltest.h" -#include "inttest.h" +#include "WW3D2/coltest.h" +#include "WW3D2/inttest.h" class AABoxClass; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h index 6fc2acf2c9f..c2902f0a06a 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h @@ -51,7 +51,7 @@ #include "rinfo.h" #include "meshgeometry.h" #include "meshmatdesc.h" -#include "dx8list.h" +#include "WW3D2/dx8list.h" class TextureClass; class RenderInfoClass; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h index aebfccdc201..7151dd0ee63 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h @@ -36,8 +36,8 @@ #pragma once -#include "rendobj.h" -#include "proto.h" +#include "WW3D2/rendobj.h" +#include "WW3D2/proto.h" class Null3DObjClass : public RenderObjClass { diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h index 2331a8573dd..cb2d504dfe5 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h @@ -36,9 +36,9 @@ #pragma once -#include "rendobj.h" -#include "pointgr.h" -#include "seglinerenderer.h" +#include "WW3D2/rendobj.h" +#include "WW3D2/pointgr.h" +#include "WW3D2/seglinerenderer.h" class ParticleEmitterClass; template struct ParticlePropertyStruct; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h index fc02284354c..a21082feaa3 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h @@ -36,12 +36,12 @@ #pragma once -#include "rendobj.h" +#include "WW3D2/rendobj.h" #include "WWLib/RANDOM.h" #include "part_buf.h" #include "WWMath/quat.h" #include "w3d_file.h" -#include "w3derr.h" +#include "WW3D2/w3derr.h" #include "WWMath/v3_rnd.h" // Forward declarations diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h index 9ff21bee7e7..0a6b5411a7f 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h @@ -34,11 +34,11 @@ #pragma once -#include "proto.h" -#include "rendobj.h" +#include "WW3D2/proto.h" +#include "WW3D2/rendobj.h" #include "w3d_file.h" -#include "w3derr.h" -#include "w3d_util.h" +#include "WW3D2/w3derr.h" +#include "WW3D2/w3d_util.h" #include "part_emt.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h index 522efe639e7..7aa548c39e3 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/scene.h @@ -38,7 +38,7 @@ #include "WWLib/always.h" #include "WWMath/vector3.h" -#include "robjlist.h" +#include "WW3D2/robjlist.h" #include "WWDebug/wwdebug.h" class RenderObjClass; diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h index e191a8fe399..332b644df68 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h @@ -41,7 +41,7 @@ #include "WWMath/vector3.h" #include "w3d_file.h" #include "meshbuild.h" -#include "w3derr.h" +#include "WW3D2/w3derr.h" #include "mapper.h" #include "WWLib/wwstring.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h index 0a78e2b150f..252ebd78662 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h @@ -2270,4 +2270,4 @@ struct W3dShdSubMeshHeaderStruct /* ** Include the obsolete structures and chunk ID's */ -#include "w3d_obsolete.h" +#include "WW3D2/w3d_obsolete.h" diff --git a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h index d89b4dcc133..0c36c96556e 100644 --- a/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h +++ b/Generals/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h @@ -38,9 +38,9 @@ #include "WWLib/always.h" #include "WWMath/vector3.h" -#include "layer.h" -#include "w3derr.h" -#include "robjlist.h" +#include "WW3D2/layer.h" +#include "WW3D2/w3derr.h" +#include "WW3D2/robjlist.h" class SceneClass; class CameraClass; diff --git a/GeneralsMD/Code/CMakeLists.txt b/GeneralsMD/Code/CMakeLists.txt index 5b98914751f..a713dcc7c2b 100644 --- a/GeneralsMD/Code/CMakeLists.txt +++ b/GeneralsMD/Code/CMakeLists.txt @@ -1,13 +1,11 @@ # z stands for Zero Hour, i stands for Interface add_library(zi_gameengine_include INTERFACE) -add_library(zi_ww3d2_include INTERFACE) add_library(zi_libraries_source_wwvegas INTERFACE) add_library(zi_main INTERFACE) add_library(zi_always INTERFACE) add_library(zi_always_no_pch INTERFACE) # Use this for Shared Libs with MFC AFX target_include_directories(zi_gameengine_include INTERFACE "GameEngine/Include") -target_include_directories(zi_ww3d2_include INTERFACE "Libraries/Source/WWVegas/WW3D2") target_include_directories(zi_libraries_source_wwvegas INTERFACE "Libraries/Source/WWVegas") target_include_directories(zi_main INTERFACE "Main") @@ -20,9 +18,6 @@ target_compile_definitions(zi_always_no_pch INTERFACE target_link_libraries(zi_gameengine_include INTERFACE corei_gameengine_include ) -target_link_libraries(zi_ww3d2_include INTERFACE - corei_ww3d2_include -) target_link_libraries(zi_always INTERFACE corei_always # Must stay below so headers from game are included first ) diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt index 2be7239370f..42bcf55d46f 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/CMakeLists.txt @@ -238,6 +238,10 @@ set_target_properties(z_ww3d2 PROPERTIES OUTPUT_NAME ww3d2) target_sources(z_ww3d2 PRIVATE ${WW3D2_SRC}) +target_include_directories(z_ww3d2 PRIVATE + "${CMAKE_CURRENT_SOURCE_DIR}" +) + target_compile_definitions(z_ww3d2 PRIVATE $<$:WINVER=0x0500> ) @@ -253,10 +257,6 @@ target_precompile_headers(z_ww3d2 PRIVATE ) -target_link_libraries(z_ww3d2 PUBLIC - zi_ww3d2_include -) - target_link_libraries(z_ww3d2 PRIVATE core_wwdebug corei_ww3d2 diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.h index 704a169e77e..4a3c7fbd370 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/animobj.h @@ -41,9 +41,9 @@ #pragma once #include "WWLib/always.h" -#include "composite.h" -#include "htree.h" -#include "hanim.h" +#include "WW3D2/composite.h" +#include "WW3D2/htree.h" +#include "WW3D2/hanim.h" class SkinClass; class RenderInfoClass; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h index ae7733cc099..757afefbd31 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/assetmgr.h @@ -42,7 +42,7 @@ #include "htreemgr.h" #include "hanimmgr.h" #include "WWLib/SLIST.h" -#include "texture.h" +#include "WW3D2/texture.h" #include "WWLib/hashtemplate.h" #include "WWLib/simplevec.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h index ed3f38077fc..e7a5bdc6692 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/boxrobj.h @@ -37,10 +37,10 @@ #pragma once #include "WWLib/always.h" -#include "rendobj.h" +#include "WW3D2/rendobj.h" #include "w3d_file.h" #include "shader.h" -#include "proto.h" +#include "WW3D2/proto.h" #include "WWMath/obbox.h" class VertexMaterialClass; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h index 87b1e5ecb52..de8e7190bb5 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/dazzle.h @@ -21,10 +21,10 @@ #include "WWLib/always.h" #include "WWMath/vector3.h" #include "WWMath/matrix3d.h" -#include "rendobj.h" +#include "WW3D2/rendobj.h" #include "WWLib/wwstring.h" -#include "proto.h" -#include "w3derr.h" +#include "WW3D2/proto.h" +#include "WW3D2/w3derr.h" #include "shader.h" #include "WWMath/matrix4.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h index b617a6bbffe..72da3fec4bb 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ddsfile.h @@ -21,7 +21,7 @@ #pragma once #include "WWLib/always.h" -#include "ww3dformat.h" +#include "WW3D2/ww3dformat.h" #include "WWLib/wwstring.h" #include "WWMath/vector3.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h index ee080be42d8..f48d74d0f2a 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hlod.h @@ -38,10 +38,10 @@ #include "animobj.h" #include "WWLib/Vector.h" -#include "snapPts.h" -#include "proto.h" -#include "w3derr.h" -#include "proxy.h" +#include "WW3D2/snapPts.h" +#include "WW3D2/proto.h" +#include "WW3D2/w3derr.h" +#include "WW3D2/proxy.h" class DistLODClass; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h index b070e2643f1..2b0eee80542 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hmorphanim.h @@ -39,7 +39,7 @@ #pragma once #include "WWLib/always.h" -#include "hanim.h" +#include "WW3D2/hanim.h" #include "WWLib/simplevec.h" class TimeCodedMorphKeysClass; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h index 9c6e83b3371..7ad9e67513f 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/hrawanim.h @@ -39,7 +39,7 @@ #pragma once #include "WWLib/always.h" -#include "hanim.h" +#include "WW3D2/hanim.h" class MotionChannelClass; class BitChannelClass; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h index aa8dcaddd8b..605cae0115b 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/light.h @@ -37,8 +37,8 @@ #pragma once #include "WWLib/always.h" -#include "rendobj.h" -#include "w3derr.h" +#include "WW3D2/rendobj.h" +#include "WW3D2/w3derr.h" class ChunkLoadClass; class ChunkSaveClass; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h index 934ee504c23..9650f3f6173 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mapper.h @@ -41,7 +41,7 @@ #include "WWLib/always.h" #include "w3d_file.h" -#include "w3derr.h" +#include "WW3D2/w3derr.h" #include "WWMath/vector2.h" #include "WWMath/vector3.h" #include "ww3d.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h index fee8cc448c9..930be95d148 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/mesh.h @@ -38,9 +38,9 @@ #pragma once #include "WWLib/always.h" -#include "rendobj.h" +#include "WW3D2/rendobj.h" #include "WWLib/bittype.h" -#include "w3derr.h" +#include "WW3D2/w3derr.h" #include "lightenvironment.h" //added for 'Generals' class MeshBuilderClass; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h index df7ed99a003..84161f703f5 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshgeometry.h @@ -42,14 +42,14 @@ #include "WWLib/bittype.h" #include "WWLib/simplevec.h" #include "WWLib/sharebuf.h" -#include "w3derr.h" +#include "WW3D2/w3derr.h" #include "WWMath/vector3.h" #include "WWMath/Vector3i.h" #include "WWMath/vector4.h" #include "WWDebug/wwdebug.h" #include "WWLib/multilist.h" -#include "coltest.h" -#include "inttest.h" +#include "WW3D2/coltest.h" +#include "WW3D2/inttest.h" class AABoxClass; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h index dc037287089..293ac575a37 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/meshmdl.h @@ -51,7 +51,7 @@ #include "rinfo.h" #include "meshgeometry.h" #include "meshmatdesc.h" -#include "dx8list.h" +#include "WW3D2/dx8list.h" class TextureClass; class RenderInfoClass; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h index 08eaf76fbff..58172b8b63e 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/nullrobj.h @@ -36,8 +36,8 @@ #pragma once -#include "rendobj.h" -#include "proto.h" +#include "WW3D2/rendobj.h" +#include "WW3D2/proto.h" class Null3DObjClass : public RenderObjClass { diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h index aa5f1b7900e..f9dd8a8c480 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_buf.h @@ -36,9 +36,9 @@ #pragma once -#include "rendobj.h" -#include "pointgr.h" -#include "seglinerenderer.h" +#include "WW3D2/rendobj.h" +#include "WW3D2/pointgr.h" +#include "WW3D2/seglinerenderer.h" #include "linegrp.h" class ParticleEmitterClass; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h index c0e99f93e48..742f0ad23e1 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_emt.h @@ -36,12 +36,12 @@ #pragma once -#include "rendobj.h" +#include "WW3D2/rendobj.h" #include "WWLib/RANDOM.h" #include "part_buf.h" #include "WWMath/quat.h" #include "w3d_file.h" -#include "w3derr.h" +#include "WW3D2/w3derr.h" #include "WWMath/v3_rnd.h" // Forward declarations diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h index 7c088c897b8..47bb58cfb3a 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.h @@ -34,11 +34,11 @@ #pragma once -#include "proto.h" -#include "rendobj.h" +#include "WW3D2/proto.h" +#include "WW3D2/rendobj.h" #include "w3d_file.h" -#include "w3derr.h" -#include "w3d_util.h" +#include "WW3D2/w3derr.h" +#include "WW3D2/w3d_util.h" #include "part_emt.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h index c4b2979a46b..a358f9d0a23 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/scene.h @@ -38,7 +38,7 @@ #include "WWLib/always.h" #include "WWMath/vector3.h" -#include "robjlist.h" +#include "WW3D2/robjlist.h" #include "WWDebug/wwdebug.h" class RenderObjClass; diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h index 3fd5b23096d..21119028946 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/vertmaterial.h @@ -41,7 +41,7 @@ #include "WWMath/vector3.h" #include "w3d_file.h" #include "meshbuild.h" -#include "w3derr.h" +#include "WW3D2/w3derr.h" #include "mapper.h" #include "WWLib/wwstring.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h index 97f95060dc0..d4e94b65bb0 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/w3d_file.h @@ -2270,4 +2270,4 @@ struct W3dShdSubMeshHeaderStruct /* ** Include the obsolete structures and chunk ID's */ -#include "w3d_obsolete.h" +#include "WW3D2/w3d_obsolete.h" diff --git a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h index cc50242dbdb..02207fd8c53 100644 --- a/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h +++ b/GeneralsMD/Code/Libraries/Source/WWVegas/WW3D2/ww3d.h @@ -38,9 +38,9 @@ #include "WWLib/always.h" #include "WWMath/vector3.h" -#include "layer.h" -#include "w3derr.h" -#include "robjlist.h" +#include "WW3D2/layer.h" +#include "WW3D2/w3derr.h" +#include "WW3D2/robjlist.h" class SceneClass; class CameraClass;