From a4f11dcc7de456d420a37460b508e304e530419a Mon Sep 17 00:00:00 2001 From: Jacob Ledbetter Date: Sun, 12 Jul 2026 20:39:33 -0600 Subject: [PATCH] refactor(WW3D2): Qualify headers in aabtree.cpp, aabtree.h, agg_def.cpp, etc --- .../Source/WWVegas/WW3D2/aabtree.cpp | 14 ++++---- Core/Libraries/Source/WWVegas/WW3D2/aabtree.h | 22 ++++++------ .../Source/WWVegas/WW3D2/agg_def.cpp | 8 ++--- Core/Libraries/Source/WWVegas/WW3D2/agg_def.h | 6 ++-- .../Source/WWVegas/WW3D2/animatedsoundmgr.cpp | 20 +++++------ .../Source/WWVegas/WW3D2/animatedsoundmgr.h | 6 ++-- .../Source/WWVegas/WW3D2/assetstatus.cpp | 6 ++-- .../Source/WWVegas/WW3D2/assetstatus.h | 4 +-- .../Source/WWVegas/WW3D2/bitmaphandler.cpp | 2 +- .../Source/WWVegas/WW3D2/bitmaphandler.h | 4 +-- Core/Libraries/Source/WWVegas/WW3D2/bmp2d.cpp | 6 ++-- .../Source/WWVegas/WW3D2/bwrender.cpp | 2 +- .../Libraries/Source/WWVegas/WW3D2/bwrender.h | 8 ++--- Core/Libraries/Source/WWVegas/WW3D2/classid.h | 2 +- .../Source/WWVegas/WW3D2/collect.cpp | 10 +++--- Core/Libraries/Source/WWVegas/WW3D2/collect.h | 6 ++-- .../Source/WWVegas/WW3D2/colorspace.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/coltest.h | 14 ++++---- .../Source/WWVegas/WW3D2/composite.cpp | 2 +- .../Source/WWVegas/WW3D2/composite.h | 2 +- .../Source/WWVegas/WW3D2/decalsys.cpp | 6 ++-- .../Libraries/Source/WWVegas/WW3D2/decalsys.h | 8 ++--- .../Source/WWVegas/WW3D2/distlod.cpp | 16 ++++----- .../Source/WWVegas/WW3D2/dx8caps.cpp | 2 +- Core/Libraries/Source/WWVegas/WW3D2/dx8caps.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/dx8fvf.cpp | 2 +- Core/Libraries/Source/WWVegas/WW3D2/dx8fvf.h | 4 +-- .../Source/WWVegas/WW3D2/dx8indexbuffer.cpp | 6 ++-- .../Source/WWVegas/WW3D2/dx8indexbuffer.h | 6 ++-- Core/Libraries/Source/WWVegas/WW3D2/dx8list.h | 4 +-- .../Source/WWVegas/WW3D2/dx8polygonrenderer.h | 6 ++-- .../Source/WWVegas/WW3D2/dx8renderer.cpp | 18 +++++----- .../Source/WWVegas/WW3D2/dx8renderer.h | 12 +++---- .../WWVegas/WW3D2/dx8rendererdebugger.cpp | 6 ++-- .../WWVegas/WW3D2/dx8rendererdebugger.h | 2 +- .../Source/WWVegas/WW3D2/dx8texman.h | 4 +-- .../Source/WWVegas/WW3D2/dx8vertexbuffer.cpp | 4 +-- .../Source/WWVegas/WW3D2/dx8vertexbuffer.h | 4 +-- .../Source/WWVegas/WW3D2/dx8webbrowser.cpp | 2 +- .../Source/WWVegas/WW3D2/dx8wrapper.cpp | 34 +++++++++---------- .../Source/WWVegas/WW3D2/dx8wrapper.h | 16 ++++----- .../Source/WWVegas/WW3D2/dynamesh.cpp | 4 +-- .../Libraries/Source/WWVegas/WW3D2/dynamesh.h | 4 +-- .../Libraries/Source/WWVegas/WW3D2/font3d.cpp | 6 ++-- Core/Libraries/Source/WWVegas/WW3D2/font3d.h | 8 ++--- .../Libraries/Source/WWVegas/WW3D2/framgrab.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/hanim.cpp | 12 +++---- Core/Libraries/Source/WWVegas/WW3D2/hanim.h | 14 ++++---- .../Libraries/Source/WWVegas/WW3D2/hcanim.cpp | 12 +++---- Core/Libraries/Source/WWVegas/WW3D2/hcanim.h | 10 +++--- .../Source/WWVegas/WW3D2/hmdldef.cpp | 4 +-- Core/Libraries/Source/WWVegas/WW3D2/hmdldef.h | 4 +-- Core/Libraries/Source/WWVegas/WW3D2/htree.cpp | 14 ++++---- Core/Libraries/Source/WWVegas/WW3D2/htree.h | 12 +++---- .../Source/WWVegas/WW3D2/intersec.cpp | 4 +-- .../Libraries/Source/WWVegas/WW3D2/intersec.h | 6 ++-- .../Source/WWVegas/WW3D2/intersec.inl | 2 +- Core/Libraries/Source/WWVegas/WW3D2/inttest.h | 10 +++--- Core/Libraries/Source/WWVegas/WW3D2/layer.cpp | 4 +-- Core/Libraries/Source/WWVegas/WW3D2/layer.h | 6 ++-- .../Libraries/Source/WWVegas/WW3D2/line3d.cpp | 10 +++--- Core/Libraries/Source/WWVegas/WW3D2/line3d.h | 8 ++--- .../Source/WWVegas/WW3D2/matinfo.cpp | 4 +-- Core/Libraries/Source/WWVegas/WW3D2/matinfo.h | 10 +++--- .../Source/WWVegas/WW3D2/matpass.cpp | 4 +-- Core/Libraries/Source/WWVegas/WW3D2/matpass.h | 4 +-- .../Source/WWVegas/WW3D2/meshdam.cpp | 4 +-- Core/Libraries/Source/WWVegas/WW3D2/meshdam.h | 6 ++-- .../Source/WWVegas/WW3D2/metalmap.cpp | 14 ++++---- .../Libraries/Source/WWVegas/WW3D2/metalmap.h | 2 +- .../Source/WWVegas/WW3D2/missingtexture.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/pivot.cpp | 2 +- Core/Libraries/Source/WWVegas/WW3D2/pivot.h | 10 +++--- .../Source/WWVegas/WW3D2/pointgr.cpp | 18 +++++----- Core/Libraries/Source/WWVegas/WW3D2/pointgr.h | 12 +++---- .../Source/WWVegas/WW3D2/polyinfo.cpp | 4 +-- Core/Libraries/Source/WWVegas/WW3D2/predlod.h | 2 +- .../Source/WWVegas/WW3D2/prim_anim.cpp | 2 +- .../Source/WWVegas/WW3D2/prim_anim.h | 4 +-- .../Source/WWVegas/WW3D2/projector.cpp | 2 +- .../Source/WWVegas/WW3D2/projector.h | 10 +++--- Core/Libraries/Source/WWVegas/WW3D2/proto.cpp | 4 +-- Core/Libraries/Source/WWVegas/WW3D2/proto.h | 4 +-- Core/Libraries/Source/WWVegas/WW3D2/proxy.h | 4 +-- Core/Libraries/Source/WWVegas/WW3D2/rddesc.h | 4 +-- .../Source/WWVegas/WW3D2/render2dsentence.cpp | 4 +-- .../Source/WWVegas/WW3D2/render2dsentence.h | 12 +++---- .../WWVegas/WW3D2/renderobjectrecycler.cpp | 6 ++-- .../WWVegas/WW3D2/renderobjectrecycler.h | 2 +- .../Source/WWVegas/WW3D2/rendobj.cpp | 22 ++++++------ Core/Libraries/Source/WWVegas/WW3D2/rendobj.h | 10 +++--- .../Source/WWVegas/WW3D2/ringobj.cpp | 24 ++++++------- Core/Libraries/Source/WWVegas/WW3D2/ringobj.h | 14 ++++---- .../Libraries/Source/WWVegas/WW3D2/robjlist.h | 6 ++-- .../Source/WWVegas/WW3D2/segline.cpp | 12 +++---- Core/Libraries/Source/WWVegas/WW3D2/segline.h | 4 +-- .../Source/WWVegas/WW3D2/seglinerenderer.cpp | 14 ++++---- .../Source/WWVegas/WW3D2/seglinerenderer.h | 8 ++--- .../Source/WWVegas/WW3D2/shattersystem.cpp | 16 ++++----- .../Source/WWVegas/WW3D2/shattersystem.h | 2 +- Core/Libraries/Source/WWVegas/WW3D2/snapPts.h | 6 ++-- .../Source/WWVegas/WW3D2/snappts.cpp | 4 +-- .../Source/WWVegas/WW3D2/sortingrenderer.cpp | 4 +-- .../Source/WWVegas/WW3D2/sortingrenderer.h | 2 +- .../Source/WWVegas/WW3D2/soundrobj.cpp | 14 ++++---- .../Source/WWVegas/WW3D2/soundrobj.h | 6 ++-- .../Source/WWVegas/WW3D2/sphereobj.cpp | 22 ++++++------ .../Source/WWVegas/WW3D2/sphereobj.h | 14 ++++---- .../Source/WWVegas/WW3D2/static_sort_list.h | 2 +- .../Source/WWVegas/WW3D2/statistics.cpp | 4 +-- .../Source/WWVegas/WW3D2/statistics.h | 2 +- .../Libraries/Source/WWVegas/WW3D2/streak.cpp | 12 +++---- Core/Libraries/Source/WWVegas/WW3D2/streak.h | 4 +-- .../Source/WWVegas/WW3D2/streakRender.cpp | 12 +++---- .../Source/WWVegas/WW3D2/streakRender.h | 8 ++--- .../Source/WWVegas/WW3D2/stripoptimizer.cpp | 4 +-- .../Source/WWVegas/WW3D2/stripoptimizer.h | 2 +- .../Source/WWVegas/WW3D2/surfaceclass.cpp | 4 +-- .../Source/WWVegas/WW3D2/surfaceclass.h | 2 +- .../Source/WWVegas/WW3D2/texproject.cpp | 12 +++---- .../Source/WWVegas/WW3D2/texproject.h | 14 ++++---- .../Source/WWVegas/WW3D2/textdraw.cpp | 2 +- .../Libraries/Source/WWVegas/WW3D2/textdraw.h | 2 +- .../Source/WWVegas/WW3D2/texture.cpp | 14 ++++---- Core/Libraries/Source/WWVegas/WW3D2/texture.h | 8 ++--- .../Source/WWVegas/WW3D2/textureloader.cpp | 24 ++++++------- .../Source/WWVegas/WW3D2/textureloader.h | 2 +- .../Source/WWVegas/WW3D2/texturethumbnail.cpp | 12 +++---- .../Source/WWVegas/WW3D2/texturethumbnail.h | 6 ++-- .../Source/WWVegas/WW3D2/visrasterizer.cpp | 6 ++-- .../Source/WWVegas/WW3D2/visrasterizer.h | 18 +++++----- .../Source/WWVegas/WW3D2/w3d_dep.cpp | 6 ++-- .../Source/WWVegas/WW3D2/w3d_util.cpp | 8 ++--- .../Libraries/Source/WWVegas/WW3D2/w3d_util.h | 4 +-- Core/Libraries/Source/WWVegas/WW3D2/w3derr.h | 2 +- .../Source/WWVegas/WW3D2/w3dexclusionlist.h | 8 ++--- .../Source/WWVegas/WW3D2/ww3dformat.cpp | 6 ++-- .../Source/WWVegas/WW3D2/ww3dformat.h | 4 +-- Core/Libraries/Source/WWVegas/WW3D2/ww3dids.h | 2 +- 139 files changed, 521 insertions(+), 521 deletions(-) diff --git a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.cpp b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.cpp index 3978cc5b7c9..c0ded889965 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.cpp @@ -63,15 +63,15 @@ #include "aabtree.h" -#include "aabtreebuilder.h" -#include "wwdebug.h" -#include "tri.h" -#include "meshgeometry.h" +#include "WW3D2/aabtreebuilder.h" +#include "WWDebug/wwdebug.h" +#include "WWMath/tri.h" +#include "WW3D2/meshgeometry.h" #include "coltest.h" #include "inttest.h" -#include "colmathinlines.h" -#include "w3d_file.h" -#include "chunkio.h" +#include "WWMath/colmathinlines.h" +#include "WW3D2/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 8521736b726..54c21044598 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/aabtree.h @@ -39,17 +39,17 @@ #pragma once -#include "always.h" -#include "simplevec.h" -#include "vector3.h" -#include "Vector3i.h" -#include "aaplane.h" -#include "bittype.h" -#include "colmath.h" -#include "wwdebug.h" -#include "aabtreebuilder.h" -#include "obbox.h" -#include +#include "WWLib/always.h" +#include "WWLib/simplevec.h" +#include "WWMath/vector3.h" +#include "WWMath/Vector3i.h" +#include "WWMath/aaplane.h" +#include "WWLib/bittype.h" +#include "WWMath/colmath.h" +#include "WWDebug/wwdebug.h" +#include "WW3D2/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 b4d7d89df7e..e25b3025e97 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/agg_def.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/agg_def.cpp @@ -36,12 +36,12 @@ #include "agg_def.h" #include "htree.h" #include "w3derr.h" -#include "chunkio.h" -#include "wwdebug.h" -#include "assetmgr.h" +#include "WWLib/chunkio.h" +#include "WWDebug/wwdebug.h" +#include "WW3D2/assetmgr.h" #include "matinfo.h" #include "texture.h" -#include "wwstring.h" +#include "WWLib/wwstring.h" #include diff --git a/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h b/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h index 987d423a8f4..97228dfb374 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/agg_def.h @@ -36,10 +36,10 @@ #include "proto.h" #include "rendobj.h" -#include "w3d_file.h" +#include "WW3D2/w3d_file.h" #include "w3derr.h" -#include "Vector.h" -#include "bittype.h" +#include "WWLib/Vector.h" +#include "WWLib/bittype.h" #ifdef _UNIX #include "osdep.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.cpp b/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.cpp index bf89eb93e77..be3d790d3ba 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.cpp @@ -38,20 +38,20 @@ // #include "animatedsoundmgr.h" -#include "INI.h" -#include "inisup.h" -#include "ffactory.h" -#include "WWFILE.h" -#include "definition.h" -#include "definitionmgr.h" -#include "definitionclassids.h" -#include "WWAudio.h" -#include "AudibleSound.h" +#include "WWLib/INI.h" +#include "WWLib/inisup.h" +#include "WWLib/ffactory.h" +#include "WWLib/WWFILE.h" +#include "WWSaveLoad/definition.h" +#include "WWSaveLoad/definitionmgr.h" +#include "WWSaveLoad/definitionclassids.h" +#include "WWAudio/WWAudio.h" +#include "WWAudio/AudibleSound.h" #include "htree.h" #include "hanim.h" #include "soundlibrarybridge.h" -#include "wwdebug.h" +#include "WWDebug/wwdebug.h" ////////////////////////////////////////////////////////////////////// // Static member initialization diff --git a/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.h b/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.h index 1ea067fc463..34aeb811a38 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.h @@ -39,9 +39,9 @@ #pragma once -#include "simplevec.h" -#include "Vector.h" -#include "hashtemplate.h" +#include "WWLib/simplevec.h" +#include "WWLib/Vector.h" +#include "WWLib/hashtemplate.h" ////////////////////////////////////////////////////////////////////// diff --git a/Core/Libraries/Source/WWVegas/WW3D2/assetstatus.cpp b/Core/Libraries/Source/WWVegas/WW3D2/assetstatus.cpp index 22d67d5c716..2423f17c67c 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/assetstatus.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/assetstatus.cpp @@ -17,9 +17,9 @@ */ #include "assetstatus.h" -#include "hashtemplate.h" -#include "wwstring.h" -#include "RAWFILE.h" +#include "WWLib/hashtemplate.h" +#include "WWLib/wwstring.h" +#include "WWLib/RAWFILE.h" AssetStatusClass AssetStatusClass::Instance; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/assetstatus.h b/Core/Libraries/Source/WWVegas/WW3D2/assetstatus.h index bb25aa729ce..f5ea1e4d630 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/assetstatus.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/assetstatus.h @@ -18,8 +18,8 @@ #pragma once -#include "always.h" -#include "hashtemplate.h" +#include "WWLib/always.h" +#include "WWLib/hashtemplate.h" class AssetStatusClass { diff --git a/Core/Libraries/Source/WWVegas/WW3D2/bitmaphandler.cpp b/Core/Libraries/Source/WWVegas/WW3D2/bitmaphandler.cpp index 9bba18e5f34..a4e695f408e 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/bitmaphandler.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/bitmaphandler.cpp @@ -17,7 +17,7 @@ */ #include "bitmaphandler.h" -#include "wwdebug.h" +#include "WWDebug/wwdebug.h" #include "colorspace.h" void Bitmap_Assert(bool condition) diff --git a/Core/Libraries/Source/WWVegas/WW3D2/bitmaphandler.h b/Core/Libraries/Source/WWVegas/WW3D2/bitmaphandler.h index d12ceb63c5d..aeada33dc28 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/bitmaphandler.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/bitmaphandler.h @@ -18,9 +18,9 @@ #pragma once -#include "always.h" +#include "WWLib/always.h" #include "ww3dformat.h" -#include "vector3.h" +#include "WWMath/vector3.h" #include "colorspace.h" void Bitmap_Assert(bool condition); diff --git a/Core/Libraries/Source/WWVegas/WW3D2/bmp2d.cpp b/Core/Libraries/Source/WWVegas/WW3D2/bmp2d.cpp index 50c02411181..27090e0293b 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/bmp2d.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/bmp2d.cpp @@ -38,11 +38,11 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "bmp2d.h" -#include "pot.h" -#include "ww3d.h" +#include "WWMath/pot.h" +#include "WW3D2/ww3d.h" #include "texture.h" #include "surfaceclass.h" -#include "assetmgr.h" +#include "WW3D2/assetmgr.h" #include "textureloader.h" #include "ww3dformat.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/bwrender.cpp b/Core/Libraries/Source/WWVegas/WW3D2/bwrender.cpp index 9f8f9dbfca1..4b508def314 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/bwrender.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/bwrender.cpp @@ -38,7 +38,7 @@ #include "bwrender.h" -#include "vp.h" +#include "WWMath/vp.h" BWRenderClass::Buffer::Buffer(unsigned char* buffer_, int scale_) diff --git a/Core/Libraries/Source/WWVegas/WW3D2/bwrender.h b/Core/Libraries/Source/WWVegas/WW3D2/bwrender.h index 0c6db33b9de..806097cf657 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/bwrender.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/bwrender.h @@ -38,10 +38,10 @@ #pragma once -#include "always.h" -#include "vector2.h" -#include "vector3.h" -#include "Vector3i.h" +#include "WWLib/always.h" +#include "WWMath/vector2.h" +#include "WWMath/vector3.h" +#include "WWMath/Vector3i.h" /** ** BWRenderClass diff --git a/Core/Libraries/Source/WWVegas/WW3D2/classid.h b/Core/Libraries/Source/WWVegas/WW3D2/classid.h index a734133cfb3..31908e043bf 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/classid.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/classid.h @@ -34,7 +34,7 @@ #pragma once -#include "always.h" +#include "WWLib/always.h" /* ** enum of all the WW3D class IDs. diff --git a/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp b/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp index 9d35c5931cb..cff26df1574 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/collect.cpp @@ -72,12 +72,12 @@ #include "collect.h" -#include "chunkio.h" -#include "camera.h" -#include "wwdebug.h" +#include "WWLib/chunkio.h" +#include "WW3D2/camera.h" +#include "WWDebug/wwdebug.h" #include "snapPts.h" -#include "assetmgr.h" -#include "ww3d.h" +#include "WW3D2/assetmgr.h" +#include "WW3D2/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 8fcc589542d..676a4a97157 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/collect.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/collect.h @@ -38,10 +38,10 @@ #include "rendobj.h" #include "composite.h" -#include "Vector.h" +#include "WWLib/Vector.h" #include "proto.h" -#include "w3d_file.h" -#include "wwstring.h" +#include "WW3D2/w3d_file.h" +#include "WWLib/wwstring.h" #include "proxy.h" class CollectionDefClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/colorspace.h b/Core/Libraries/Source/WWVegas/WW3D2/colorspace.h index e4974a00545..4b366e6f895 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/colorspace.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/colorspace.h @@ -39,7 +39,7 @@ #pragma once #include "dx8wrapper.h" -#include +#include void RGB_To_HSV(Vector3 &hsv,const Vector3 &rgb); void HSV_To_RGB(Vector3 &rgb, const Vector3 &hsv); diff --git a/Core/Libraries/Source/WWVegas/WW3D2/coltest.h b/Core/Libraries/Source/WWVegas/WW3D2/coltest.h index 5d86e248b33..7ebc2bce00e 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/coltest.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/coltest.h @@ -39,13 +39,13 @@ #pragma once -#include "always.h" -#include "castres.h" -#include "lineseg.h" -#include "aabox.h" -#include "obbox.h" -#include "tri.h" -#include "colmath.h" +#include "WWLib/always.h" +#include "WWMath/castres.h" +#include "WWMath/lineseg.h" +#include "WWMath/aabox.h" +#include "WWMath/obbox.h" +#include "WWMath/tri.h" +#include "WWMath/colmath.h" #include "coltype.h" class RenderObjClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/composite.cpp b/Core/Libraries/Source/WWVegas/WW3D2/composite.cpp index 6a0d7b0811e..181547c3013 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/composite.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/composite.cpp @@ -56,7 +56,7 @@ #include "composite.h" -#include "wwdebug.h" +#include "WWDebug/wwdebug.h" #include diff --git a/Core/Libraries/Source/WWVegas/WW3D2/composite.h b/Core/Libraries/Source/WWVegas/WW3D2/composite.h index e5a72d73bbc..66762ddde81 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/composite.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/composite.h @@ -37,7 +37,7 @@ #pragma once #include "rendobj.h" -#include "wwstring.h" +#include "WWLib/wwstring.h" /* ** CompositeRenderObjClass diff --git a/Core/Libraries/Source/WWVegas/WW3D2/decalsys.cpp b/Core/Libraries/Source/WWVegas/WW3D2/decalsys.cpp index ff6e93eb84d..a7b54dc0b7b 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 "mesh.h" -#include "decalmsh.h" -#include "matrixmapper.h" +#include "WW3D2/mesh.h" +#include "WW3D2/decalmsh.h" +#include "WW3D2/matrixmapper.h" #include "texture.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/decalsys.h b/Core/Libraries/Source/WWVegas/WW3D2/decalsys.h index 3d48a36426e..4042aad9d9b 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/decalsys.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/decalsys.h @@ -38,10 +38,10 @@ #pragma once -#include "always.h" -#include "matrix3d.h" -#include "matrix4.h" -#include "obbox.h" +#include "WWLib/always.h" +#include "WWMath/matrix3d.h" +#include "WWMath/matrix4.h" +#include "WWMath/obbox.h" #include "robjlist.h" #include "matpass.h" #include "projector.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/distlod.cpp b/Core/Libraries/Source/WWVegas/WW3D2/distlod.cpp index 9e6c66846bf..ce5a900357f 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/distlod.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/distlod.cpp @@ -78,15 +78,15 @@ #include "distlod.h" -#include "nstrdup.h" -#include "ww3d.h" -#include "assetmgr.h" -#include "camera.h" +#include "WWLib/nstrdup.h" +#include "WW3D2/ww3d.h" +#include "WW3D2/assetmgr.h" +#include "WW3D2/camera.h" #include "w3derr.h" -#include "wwdebug.h" -#include "chunkio.h" -#include "hlod.h" -#include "rinfo.h" +#include "WWDebug/wwdebug.h" +#include "WWLib/chunkio.h" +#include "WW3D2/hlod.h" +#include "WW3D2/rinfo.h" #include "coltest.h" #include "inttest.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8caps.cpp b/Core/Libraries/Source/WWVegas/WW3D2/dx8caps.cpp index 7a921f68d65..48e368a31c5 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8caps.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8caps.cpp @@ -37,7 +37,7 @@ * Functions: * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ -#include "always.h" +#include "WWLib/always.h" #include "dx8caps.h" #include "dx8wrapper.h" #include "formconv.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8caps.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8caps.h index 3284979ead0..9ecde597dd0 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8caps.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8caps.h @@ -39,7 +39,7 @@ #pragma once -#include "always.h" +#include "WWLib/always.h" #include "ww3dformat.h" #include diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8fvf.cpp b/Core/Libraries/Source/WWVegas/WW3D2/dx8fvf.cpp index eb8a22d5730..a96d99c130b 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8fvf.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8fvf.cpp @@ -40,7 +40,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "dx8fvf.h" -#include "wwstring.h" +#include "WWLib/wwstring.h" #include static unsigned Get_FVF_Vertex_Size(unsigned FVF) diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8fvf.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8fvf.h index ece477309ec..d4abde6f0fa 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8fvf.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8fvf.h @@ -41,10 +41,10 @@ #pragma once -#include "always.h" +#include "WWLib/always.h" #include #ifdef WWDEBUG -#include "wwdebug.h" +#include "WWDebug/wwdebug.h" #endif class StringClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.cpp b/Core/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.cpp index 9245837f95b..578c6b82aec 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.cpp @@ -41,9 +41,9 @@ #include "dx8indexbuffer.h" #include "dx8wrapper.h" #include "dx8caps.h" -#include "sphere.h" -#include "thread.h" -#include "wwmemlog.h" +#include "WWMath/sphere.h" +#include "WWLib/thread.h" +#include "WWDebug/wwmemlog.h" #define DEFAULT_IB_SIZE 5000 diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h index 7b20cd3db73..3ae18aabe10 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8indexbuffer.h @@ -38,9 +38,9 @@ #pragma once -#include "always.h" -#include "wwdebug.h" -#include "sphere.h" +#include "WWLib/always.h" +#include "WWDebug/wwdebug.h" +#include "WWMath/sphere.h" class DX8Wrapper; class SortingRendererClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8list.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8list.h index 38facb816f7..fdfa2431d12 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8list.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8list.h @@ -39,8 +39,8 @@ #pragma once -#include "always.h" -#include "multilist.h" +#include "WWLib/always.h" +#include "WWLib/multilist.h" /* diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h index 0d9a7a716ac..17b7558049a 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8polygonrenderer.h @@ -38,11 +38,11 @@ #pragma once -#include "always.h" -#include "meshmdl.h" +#include "WWLib/always.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.cpp b/Core/Libraries/Source/WWVegas/WW3D2/dx8renderer.cpp index ac28344b08e..31394a37617 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8renderer.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8renderer.cpp @@ -48,18 +48,18 @@ #include "dx8fvf.h" #include "dx8caps.h" #include "dx8rendererdebugger.h" -#include "wwdebug.h" -#include "wwprofile.h" -#include "wwmemlog.h" -#include "rinfo.h" +#include "WWDebug/wwdebug.h" +#include "WWDebug/wwprofile.h" +#include "WWDebug/wwmemlog.h" +#include "WW3D2/rinfo.h" #include "statistics.h" -#include "meshmdl.h" -#include "vp.h" -#include "decalmsh.h" +#include "WW3D2/meshmdl.h" +#include "WWMath/vp.h" +#include "WW3D2/decalmsh.h" #include "matpass.h" -#include "camera.h" +#include "WW3D2/camera.h" #include "stripoptimizer.h" -#include "meshgeometry.h" +#include "WW3D2/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 0fc178728db..ff4f593e03a 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8renderer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8renderer.h @@ -39,14 +39,14 @@ #pragma once -#include "always.h" -#include "wwstring.h" -#include "simplevec.h" -#include "Vector.h" +#include "WWLib/always.h" +#include "WWLib/wwstring.h" +#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/dx8rendererdebugger.cpp b/Core/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.cpp index 5cb7d0e27cc..bb0b3b0fb6f 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.cpp @@ -17,9 +17,9 @@ */ #include "dx8rendererdebugger.h" -#include "hashtemplate.h" -#include "mesh.h" -#include "meshmdl.h" +#include "WWLib/hashtemplate.h" +#include "WW3D2/mesh.h" +#include "WW3D2/meshmdl.h" static HashTemplateClass MeshHash; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.h index 555e654d70c..905d92d7eaf 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8rendererdebugger.h @@ -38,7 +38,7 @@ #pragma once -#include "always.h" +#include "WWLib/always.h" class StringClass; class MeshClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8texman.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8texman.h index 84b8ebd4e25..c01001cb074 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8texman.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8texman.h @@ -39,12 +39,12 @@ #pragma once -#include "always.h" +#include "WWLib/always.h" #include "texture.h" #include "dx8wrapper.h" #include "ww3dformat.h" #include "dx8list.h" -#include "multilist.h" +#include "WWLib/multilist.h" class DX8TextureManagerClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.cpp b/Core/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.cpp index 027d1c3cf36..a6551553239 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.cpp @@ -43,8 +43,8 @@ #include "dx8wrapper.h" #include "dx8fvf.h" #include "dx8caps.h" -#include "thread.h" -#include "wwmemlog.h" +#include "WWLib/thread.h" +#include "WWDebug/wwmemlog.h" #include #define DEFAULT_VB_SIZE 5000 diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h index 264caa33840..08ec118931b 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8vertexbuffer.h @@ -39,8 +39,8 @@ #pragma once -#include "always.h" -#include "wwdebug.h" +#include "WWLib/always.h" +#include "WWDebug/wwdebug.h" #include "dx8fvf.h" const unsigned dynamic_fvf_type=D3DFVF_XYZ|D3DFVF_NORMAL|D3DFVF_TEX2|D3DFVF_DIFFUSE; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.cpp b/Core/Libraries/Source/WWVegas/WW3D2/dx8webbrowser.cpp index ec11b2dbf03..084ea3f7534 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 "ww3d.h" +#include "WW3D2/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 49e93fcdc40..bc2a6eeeeca 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.cpp @@ -56,34 +56,34 @@ #include "dx8vertexbuffer.h" #include "dx8indexbuffer.h" #include "dx8renderer.h" -#include "ww3d.h" -#include "camera.h" -#include "wwstring.h" -#include "matrix4.h" -#include "vertmaterial.h" +#include "WW3D2/ww3d.h" +#include "WW3D2/camera.h" +#include "WWLib/wwstring.h" +#include "WWMath/matrix4.h" +#include "WW3D2/vertmaterial.h" #include "rddesc.h" -#include "lightenvironment.h" +#include "WW3D2/lightenvironment.h" #include "statistics.h" -#include "registry.h" -#include "boxrobj.h" +#include "WWLib/registry.h" +#include "WW3D2/boxrobj.h" #include "pointgr.h" -#include "render2d.h" +#include "WW3D2/render2d.h" #include "sortingrenderer.h" #include "shattersystem.h" -#include "light.h" -#include "assetmgr.h" +#include "WW3D2/light.h" +#include "WW3D2/assetmgr.h" #include "textureloader.h" #include "missingtexture.h" -#include "thread.h" +#include "WWLib/thread.h" #include -#include "pot.h" -#include "wwprofile.h" -#include "ffactory.h" +#include "WWMath/pot.h" +#include "WWDebug/wwprofile.h" +#include "WWLib/ffactory.h" #include "dx8caps.h" #include "formconv.h" #include "dx8texman.h" -#include "bound.h" -#include "DbgHelpGuard.h" +#include "WWLib/bound.h" +#include "WWLib/DbgHelpGuard.h" #include "shdlib.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h b/Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h index d77e152d227..8a6f3d26495 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/dx8wrapper.h @@ -41,22 +41,22 @@ #pragma once -#include "always.h" +#include "WWLib/always.h" #include "dllist.h" #include "d3d8.h" -#include "matrix4.h" +#include "WWMath/matrix4.h" #include "statistics.h" -#include "wwstring.h" -#include "lightenvironment.h" -#include "shader.h" -#include "vector4.h" -#include "cpudetect.h" +#include "WWLib/wwstring.h" +#include "WW3D2/lightenvironment.h" +#include "WW3D2/shader.h" +#include "WWMath/vector4.h" +#include "WWLib/cpudetect.h" #include "dx8caps.h" #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.cpp b/Core/Libraries/Source/WWVegas/WW3D2/dynamesh.cpp index 03412bce96b..0ab0999a789 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 "rinfo.h" -#include "camera.h" +#include "WW3D2/rinfo.h" +#include "WW3D2/camera.h" #include "dx8fvf.h" 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/font3d.cpp b/Core/Libraries/Source/WWVegas/WW3D2/font3d.cpp index 1eb8462ac3c..b9ef97b93e7 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/font3d.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/font3d.cpp @@ -38,13 +38,13 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "font3d.h" -#include "assetmgr.h" +#include "WW3D2/assetmgr.h" #include "texture.h" #include -#include +#include #include "surfaceclass.h" #include "texture.h" -#include "vector2i.h" +#include "WWMath/vector2i.h" static SurfaceClass *_surface; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/font3d.h b/Core/Libraries/Source/WWVegas/WW3D2/font3d.h index 5d90c75de5f..4105e1ccb37 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/font3d.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/font3d.h @@ -34,10 +34,10 @@ #pragma once -#include "always.h" -#include "vector4.h" -#include "widestring.h" -#include "rect.h" +#include "WWLib/always.h" +#include "WWMath/vector4.h" +#include "WWLib/widestring.h" +#include "WWMath/rect.h" class TextureClass; class SurfaceClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/framgrab.h b/Core/Libraries/Source/WWVegas/WW3D2/framgrab.h index 4ad91b0bb7a..d5d48188d73 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/framgrab.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/framgrab.h @@ -36,7 +36,7 @@ #pragma once -#include "always.h" +#include "WWLib/always.h" #if defined (_MSC_VER) #pragma warning (push, 3) // (gth) system headers complain at warning level 4... diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hanim.cpp b/Core/Libraries/Source/WWVegas/WW3D2/hanim.cpp index 89a64a8f369..3770dc0ba95 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hanim.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/hanim.cpp @@ -37,13 +37,13 @@ #include "hanim.h" -#include "assetmgr.h" +#include "WW3D2/assetmgr.h" #include "htree.h" -#include "motchan.h" -#include "chunkio.h" -#include "w3d_file.h" -#include "wwdebug.h" -#include +#include "WW3D2/motchan.h" +#include "WWLib/chunkio.h" +#include "WW3D2/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 440551eaa41..3a47500c2e2 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hanim.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/hanim.h @@ -37,13 +37,13 @@ #pragma once -#include "always.h" -#include "quat.h" -#include "w3d_file.h" -#include "hash.h" -#include "mempool.h" -#include -#include +#include "WWLib/always.h" +#include "WWMath/quat.h" +#include "WW3D2/w3d_file.h" +#include "WWLib/hash.h" +#include "WWLib/mempool.h" +#include +#include struct NodeMotionStruct; class MotionChannelClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hcanim.cpp b/Core/Libraries/Source/WWVegas/WW3D2/hcanim.cpp index 3bc866b7517..ace4a88c04d 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hcanim.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/hcanim.cpp @@ -50,13 +50,13 @@ #include "hcanim.h" -#include "assetmgr.h" +#include "WW3D2/assetmgr.h" #include "htree.h" -#include "motchan.h" -#include "chunkio.h" -#include "w3d_file.h" -#include "wwdebug.h" -#include +#include "WW3D2/motchan.h" +#include "WWLib/chunkio.h" +#include "WW3D2/w3d_file.h" +#include "WWDebug/wwdebug.h" +#include struct NodeCompressedMotionStruct diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h b/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h index a64805d00fd..b7c85029c57 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/hcanim.h @@ -37,11 +37,11 @@ #pragma once -#include "always.h" -#include "quat.h" -#include "w3d_file.h" -#include "SLIST.h" -#include "Vector.h" +#include "WWLib/always.h" +#include "WWMath/quat.h" +#include "WW3D2/w3d_file.h" +#include "WWLib/SLIST.h" +#include "WWLib/Vector.h" #include "hanim.h" struct NodeCompressedMotionStruct; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.cpp b/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.cpp index caf8039a474..7dcbe793b2e 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.cpp @@ -38,8 +38,8 @@ #include "hmdldef.h" #include -#include "w3d_file.h" -#include "chunkio.h" +#include "WW3D2/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 2f0835819d6..47570b209fe 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/hmdldef.h @@ -36,8 +36,8 @@ #pragma once -#include "always.h" -#include "w3d_file.h" +#include "WWLib/always.h" +#include "WW3D2/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 15158407861..1f04fa29ba0 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/htree.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/htree.cpp @@ -55,13 +55,13 @@ #include "hanim.h" #include "hcanim.h" #include -#include "wwmath.h" -#include "chunkio.h" -#include "w3d_file.h" -#include "wwmemlog.h" -#include "hrawanim.h" -#include "motchan.h" -#include "ww3d.h" +#include "WWMath/wwmath.h" +#include "WWLib/chunkio.h" +#include "WW3D2/w3d_file.h" +#include "WWDebug/wwmemlog.h" +#include "WW3D2/hrawanim.h" +#include "WW3D2/motchan.h" +#include "WW3D2/ww3d.h" /*********************************************************************************************** * HTreeClass::HTreeClass -- constructor * diff --git a/Core/Libraries/Source/WWVegas/WW3D2/htree.h b/Core/Libraries/Source/WWVegas/WW3D2/htree.h index 080968c10f9..7bbdb383160 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/htree.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/htree.h @@ -37,13 +37,13 @@ #pragma once -#include "always.h" +#include "WWLib/always.h" #include "pivot.h" -#include "quat.h" -#include "matrix3d.h" -#include "vector3.h" -#include "w3d_file.h" -#include "wwdebug.h" +#include "WWMath/quat.h" +#include "WWMath/matrix3d.h" +#include "WWMath/vector3.h" +#include "WW3D2/w3d_file.h" +#include "WWDebug/wwdebug.h" class HAnimClass; class HAnimComboClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/intersec.cpp b/Core/Libraries/Source/WWVegas/WW3D2/intersec.cpp index 1709f956bb0..f4cd4b15d2e 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 "camera.h" -#include "scene.h" +#include "WW3D2/camera.h" +#include "WW3D2/scene.h" #include "intersec.inl" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/intersec.h b/Core/Libraries/Source/WWVegas/WW3D2/intersec.h index 75b49640bd1..0914394f27f 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/intersec.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/intersec.h @@ -49,10 +49,10 @@ #pragma once -#include "always.h" -#include "matrix3d.h" +#include "WWLib/always.h" +#include "WWMath/matrix3d.h" #include "layer.h" -#include "sphere.h" +#include "WWMath/sphere.h" #include "coltype.h" 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/inttest.h b/Core/Libraries/Source/WWVegas/WW3D2/inttest.h index 11b189f3e73..de97249bcd1 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/inttest.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/inttest.h @@ -38,11 +38,11 @@ #pragma once -#include "always.h" -#include "aabox.h" -#include "obbox.h" -#include "tri.h" -#include "colmath.h" +#include "WWLib/always.h" +#include "WWMath/aabox.h" +#include "WWMath/obbox.h" +#include "WWMath/tri.h" +#include "WWMath/colmath.h" #include "coltype.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/layer.cpp b/Core/Libraries/Source/WWVegas/WW3D2/layer.cpp index 2ea246a4f76..65cf42df756 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 "scene.h" -#include "camera.h" +#include "WW3D2/scene.h" +#include "WW3D2/camera.h" /*********************************************************************************************** diff --git a/Core/Libraries/Source/WWVegas/WW3D2/layer.h b/Core/Libraries/Source/WWVegas/WW3D2/layer.h index b92316b7abb..449db660d3a 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/layer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/layer.h @@ -36,9 +36,9 @@ #pragma once -#include "always.h" -#include "LISTNODE.h" -#include "vector3.h" +#include "WWLib/always.h" +#include "WWLib/LISTNODE.h" +#include "WWMath/vector3.h" class SceneClass; class CameraClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/line3d.cpp b/Core/Libraries/Source/WWVegas/WW3D2/line3d.cpp index efd53cb0372..0bfaa121587 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 "vertmaterial.h" -#include "shader.h" -#include "wwdebug.h" -#include "ww3d.h" -#include "rinfo.h" +#include "WW3D2/vertmaterial.h" +#include "WW3D2/shader.h" +#include "WWDebug/wwdebug.h" +#include "WW3D2/ww3d.h" +#include "WW3D2/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 a1a325a91dd..7fb2be1fad8 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/line3d.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/line3d.h @@ -36,11 +36,11 @@ #pragma once -#include "always.h" +#include "WWLib/always.h" #include "rendobj.h" -#include "vector3.h" -#include "vector4.h" -#include "shader.h" +#include "WWMath/vector3.h" +#include "WWMath/vector4.h" +#include "WW3D2/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 e8c35fcc087..7113e636137 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/matinfo.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/matinfo.cpp @@ -36,8 +36,8 @@ #include "matinfo.h" -#include "wwdebug.h" -#include "meshmdl.h" +#include "WWDebug/wwdebug.h" +#include "WW3D2/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 61cda2a4278..a8fe13450ed 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/matinfo.h @@ -36,12 +36,12 @@ #pragma once -#include "always.h" -#include "wwdebug.h" -#include "Vector.h" -#include "vertmaterial.h" +#include "WWLib/always.h" +#include "WWDebug/wwdebug.h" +#include "WWLib/Vector.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.cpp b/Core/Libraries/Source/WWVegas/WW3D2/matpass.cpp index f0a6dbb72b9..d300e5ffe36 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 "vertmaterial.h" -#include "shader.h" +#include "WW3D2/vertmaterial.h" +#include "WW3D2/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 2d969892480..53dd32afb62 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/matpass.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/matpass.h @@ -39,8 +39,8 @@ #pragma once -#include "always.h" -#include "shader.h" +#include "WWLib/always.h" +#include "WW3D2/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 e8487eec36f..e05282725ac 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/meshdam.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/meshdam.cpp @@ -39,9 +39,9 @@ #include "meshdam.h" -#include "w3d_file.h" +#include "WW3D2/w3d_file.h" #include "w3derr.h" -#include "chunkio.h" +#include "WWLib/chunkio.h" //#include diff --git a/Core/Libraries/Source/WWVegas/WW3D2/meshdam.h b/Core/Libraries/Source/WWVegas/WW3D2/meshdam.h index 8386f751d61..aadb1944b56 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/meshdam.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/meshdam.h @@ -38,9 +38,9 @@ #pragma once -#include "always.h" -#include "vector3.h" -#include "bittype.h" +#include "WWLib/always.h" +#include "WWMath/vector3.h" +#include "WWLib/bittype.h" #include "w3derr.h" class MeshModelClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/metalmap.cpp b/Core/Libraries/Source/WWVegas/WW3D2/metalmap.cpp index 9f917fbe3f4..ba9a32ca3f0 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/metalmap.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/metalmap.cpp @@ -49,13 +49,13 @@ #include "metalmap.h" #include "texture.h" #include "ww3dformat.h" -#include "ww3d.h" -#include -#include -#include -#include -#include -#include +#include "WW3D2/ww3d.h" +#include +#include +#include +#include +#include +#include /* ** Class static members: diff --git a/Core/Libraries/Source/WWVegas/WW3D2/metalmap.h b/Core/Libraries/Source/WWVegas/WW3D2/metalmap.h index c0d78d41b79..a2d3992e2d6 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/metalmap.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/metalmap.h @@ -36,7 +36,7 @@ #pragma once -#include +#include class TextureClass; class INIClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/missingtexture.h b/Core/Libraries/Source/WWVegas/WW3D2/missingtexture.h index 106ca115125..56081d7a8aa 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/missingtexture.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/missingtexture.h @@ -18,7 +18,7 @@ #pragma once -#include "always.h" +#include "WWLib/always.h" struct IDirect3DTexture8; struct IDirect3DSurface8; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/pivot.cpp b/Core/Libraries/Source/WWVegas/WW3D2/pivot.cpp index 50dbd7ffa0d..80342b1562e 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/pivot.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/pivot.cpp @@ -39,7 +39,7 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "pivot.h" -#include "wwmath.h" +#include "WWMath/wwmath.h" /*********************************************************************************************** diff --git a/Core/Libraries/Source/WWVegas/WW3D2/pivot.h b/Core/Libraries/Source/WWVegas/WW3D2/pivot.h index 241a204df13..167c0094610 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/pivot.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/pivot.h @@ -37,11 +37,11 @@ #pragma once -#include "always.h" -#include "vector3.h" -#include "matrix3d.h" -#include "quat.h" -#include "w3d_file.h" +#include "WWLib/always.h" +#include "WWMath/vector3.h" +#include "WWMath/matrix3d.h" +#include "WWMath/quat.h" +#include "WW3D2/w3d_file.h" /* diff --git a/Core/Libraries/Source/WWVegas/WW3D2/pointgr.cpp b/Core/Libraries/Source/WWVegas/WW3D2/pointgr.cpp index 07d9943ece5..4bbbd6f0534 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/pointgr.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/pointgr.cpp @@ -71,20 +71,20 @@ * PointGroupClass::Peek_Texture -- Peeks texture * * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "pointgr.h" -#include "vertmaterial.h" -#include "ww3d.h" -#include "aabox.h" +#include "WW3D2/vertmaterial.h" +#include "WW3D2/ww3d.h" +#include "WWMath/aabox.h" #include "statistics.h" -#include "simplevec.h" +#include "WWLib/simplevec.h" #include "texture.h" -#include "Vector.h" -#include "vp.h" -#include "matrix4.h" +#include "WWLib/Vector.h" +#include "WWMath/vp.h" +#include "WWMath/matrix4.h" #include "dx8wrapper.h" #include "dx8vertexbuffer.h" #include "dx8indexbuffer.h" -#include "rinfo.h" -#include "camera.h" +#include "WW3D2/rinfo.h" +#include "WW3D2/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 f2a098c19b3..5b1a23d1413 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/pointgr.h @@ -36,12 +36,12 @@ #pragma once -#include "sharebuf.h" -#include "shader.h" -#include "vector4.h" -#include "vector3.h" -#include "vector2.h" -#include "Vector.h" +#include "WWLib/sharebuf.h" +#include "WW3D2/shader.h" +#include "WWMath/vector4.h" +#include "WWMath/vector3.h" +#include "WWMath/vector2.h" +#include "WWLib/Vector.h" class VertexMaterialClass; class RenderInfoClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/polyinfo.cpp b/Core/Libraries/Source/WWVegas/WW3D2/polyinfo.cpp index 0e5751d1939..c4409d4ae4e 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 "vertmaterial.h" -#include "shader.h" +#include "WW3D2/vertmaterial.h" +#include "WW3D2/shader.h" void PolygonInfoClass::Set_Texture(TextureClass *texture) { diff --git a/Core/Libraries/Source/WWVegas/WW3D2/predlod.h b/Core/Libraries/Source/WWVegas/WW3D2/predlod.h index 543b6aa50b8..787c3c7b209 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/predlod.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/predlod.h @@ -45,7 +45,7 @@ #include "rendobj.h" #include "float.h" -#include "Vector.h" +#include "WWLib/Vector.h" class LODHeapNode; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/prim_anim.cpp b/Core/Libraries/Source/WWVegas/WW3D2/prim_anim.cpp index 6777e027479..74e8ddd1c31 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/prim_anim.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/prim_anim.cpp @@ -36,5 +36,5 @@ #include "prim_anim.h" -#include "chunkio.h" +#include "WWLib/chunkio.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/prim_anim.h b/Core/Libraries/Source/WWVegas/WW3D2/prim_anim.h index 56aeaa0a129..6461f28ceb6 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/prim_anim.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/prim_anim.h @@ -36,8 +36,8 @@ #pragma once -#include "simplevec.h" -#include "chunkio.h" +#include "WWLib/simplevec.h" +#include "WWLib/chunkio.h" // Forward declarations diff --git a/Core/Libraries/Source/WWVegas/WW3D2/projector.cpp b/Core/Libraries/Source/WWVegas/WW3D2/projector.cpp index aea6a1777ee..c1b70e7ae89 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 "matrixmapper.h" +#include "WW3D2/matrixmapper.h" /*********************************************************************************************** diff --git a/Core/Libraries/Source/WWVegas/WW3D2/projector.h b/Core/Libraries/Source/WWVegas/WW3D2/projector.h index afcb2ec9cd4..49dc8dd43af 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/projector.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/projector.h @@ -39,11 +39,11 @@ #pragma once -#include "always.h" -#include "matrix3d.h" -#include "matrix4.h" -#include "aabox.h" -#include "obbox.h" +#include "WWLib/always.h" +#include "WWMath/matrix3d.h" +#include "WWMath/matrix4.h" +#include "WWMath/aabox.h" +#include "WWMath/obbox.h" class MatrixMapperClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp b/Core/Libraries/Source/WWVegas/WW3D2/proto.cpp index d8ef8aa5cd6..50529d3a135 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 "mesh.h" +#include "WW3D2/mesh.h" #include "hmdldef.h" -#include "hlod.h" +#include "WW3D2/hlod.h" #include "w3derr.h" /* diff --git a/Core/Libraries/Source/WWVegas/WW3D2/proto.h b/Core/Libraries/Source/WWVegas/WW3D2/proto.h index 5a363e2458d..07861b87f7b 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/proto.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/proto.h @@ -36,9 +36,9 @@ #pragma once -#include "always.h" +#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/proxy.h b/Core/Libraries/Source/WWVegas/WW3D2/proxy.h index cbff57eb6cd..966768c9646 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/proxy.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/proxy.h @@ -36,8 +36,8 @@ #pragma once -#include "wwstring.h" -#include "matrix3d.h" +#include "WWLib/wwstring.h" +#include "WWMath/matrix3d.h" ////////////////////////////////////////////////////////////////////////////////// diff --git a/Core/Libraries/Source/WWVegas/WW3D2/rddesc.h b/Core/Libraries/Source/WWVegas/WW3D2/rddesc.h index 7a2ebcc14d9..1e4c2f6c78b 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/rddesc.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/rddesc.h @@ -36,8 +36,8 @@ #pragma once -#include "Vector.h" -#include "wwstring.h" +#include "WWLib/Vector.h" +#include "WWLib/wwstring.h" #include #include diff --git a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.cpp b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.cpp index 1aa615fee46..5fe9bf9a01a 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.cpp @@ -37,8 +37,8 @@ #include "render2dsentence.h" #include "surfaceclass.h" #include "texture.h" -#include "wwprofile.h" -#include "wwmemlog.h" +#include "WWDebug/wwprofile.h" +#include "WWDebug/wwmemlog.h" #include "dx8wrapper.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h index 5f6c4406381..15426c1e950 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/render2dsentence.h @@ -36,12 +36,12 @@ #pragma once -#include "always.h" -#include "render2d.h" -#include "Vector.h" -#include "vector2i.h" -#include "wwstring.h" -#include "win.h" +#include "WWLib/always.h" +#include "WW3D2/render2d.h" +#include "WWLib/Vector.h" +#include "WWMath/vector2i.h" +#include "WWLib/wwstring.h" +#include "WWLib/win.h" /* ** FontCharsClass diff --git a/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.cpp b/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.cpp index 733a4d08941..a11b783fdc5 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.cpp @@ -43,9 +43,9 @@ #include "renderobjectrecycler.h" #include "rendobj.h" -#include "assetmgr.h" -#include "part_emt.h" -#include "matrix3d.h" +#include "WW3D2/assetmgr.h" +#include "WW3D2/part_emt.h" +#include "WWMath/matrix3d.h" /*********************************************************************************************** diff --git a/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.h b/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.h index 4d54f37659c..20a1904e8f2 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/renderobjectrecycler.h @@ -38,7 +38,7 @@ #pragma once -#include "always.h" +#include "WWLib/always.h" #include "robjlist.h" class RenderObjClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp index 88b50f7bc3e..be20233d3c6 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.cpp @@ -73,22 +73,22 @@ #include "rendobj.h" -#include "assetmgr.h" -#include "win.h" -#include "pot.h" -#include "scene.h" -#include "colmath.h" +#include "WW3D2/assetmgr.h" +#include "WWLib/win.h" +#include "WWMath/pot.h" +#include "WW3D2/scene.h" +#include "WWMath/colmath.h" #include "coltest.h" #include "inttest.h" -#include "wwdebug.h" +#include "WWDebug/wwdebug.h" #include "matinfo.h" #include "htree.h" #include "predlod.h" -#include "camera.h" -#include "ww3d.h" -#include "chunkio.h" -#include "persistfactory.h" -#include "saveload.h" +#include "WW3D2/camera.h" +#include "WW3D2/ww3d.h" +#include "WWLib/chunkio.h" +#include "WWSaveLoad/persistfactory.h" +#include "WWSaveLoad/saveload.h" #include "ww3dids.h" #include "intersec.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h index 65b6e139810..31a986f08c4 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/rendobj.h @@ -40,12 +40,12 @@ #pragma once -#include "always.h" -#include "sphere.h" +#include "WWLib/always.h" +#include "WWMath/sphere.h" #include "coltype.h" -#include "aabox.h" -#include "persist.h" -#include "multilist.h" +#include "WWMath/aabox.h" +#include "WWSaveLoad/persist.h" +#include "WWLib/multilist.h" #include "robjlist.h" #include diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.cpp b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.cpp index 84b80c13a98..7f246b51432 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.cpp @@ -73,26 +73,26 @@ #include "ringobj.h" #include "w3d_util.h" -#include "wwdebug.h" -#include "vertmaterial.h" -#include "ww3d.h" -#include "chunkio.h" -#include "rinfo.h" +#include "WWDebug/wwdebug.h" +#include "WW3D2/vertmaterial.h" +#include "WW3D2/ww3d.h" +#include "WWLib/chunkio.h" +#include "WW3D2/rinfo.h" #include "coltest.h" #include "inttest.h" -#include "matrix3.h" -#include "wwmath.h" -#include "assetmgr.h" -#include "wwstring.h" -#include "bound.h" -#include "camera.h" +#include "WWMath/matrix3.h" +#include "WWMath/wwmath.h" +#include "WW3D2/assetmgr.h" +#include "WWLib/wwstring.h" +#include "WWLib/bound.h" +#include "WW3D2/camera.h" #include "statistics.h" #include "predlod.h" #include "dx8wrapper.h" #include "dx8indexbuffer.h" #include "dx8vertexbuffer.h" #include "sortingrenderer.h" -#include "Vector3i.h" +#include "WWMath/Vector3i.h" #include "visrasterizer.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h index c11a3c87d53..b997bd0c385 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/ringobj.h @@ -36,15 +36,15 @@ #pragma once -#include "always.h" +#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 "obbox.h" -#include "quat.h" -#include "vector3.h" -#include "vector2.h" +#include "WWMath/obbox.h" +#include "WWMath/quat.h" +#include "WWMath/vector3.h" +#include "WWMath/vector2.h" #include "prim_anim.h" class VertexMaterialClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/robjlist.h b/Core/Libraries/Source/WWVegas/WW3D2/robjlist.h index fc24a6ad78b..e41fb946f5e 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/robjlist.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/robjlist.h @@ -36,9 +36,9 @@ #pragma once -#include "always.h" -#include "multilist.h" -#include "wwdebug.h" +#include "WWLib/always.h" +#include "WWLib/multilist.h" +#include "WWDebug/wwdebug.h" class RenderObjClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/segline.cpp b/Core/Libraries/Source/WWVegas/WW3D2/segline.cpp index 60c1a12a33c..4cec2125f36 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/segline.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/segline.cpp @@ -35,17 +35,17 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "segline.h" -#include "ww3d.h" -#include "rinfo.h" +#include "WW3D2/ww3d.h" +#include "WW3D2/rinfo.h" #include "predlod.h" -#include "v3_rnd.h" +#include "WWMath/v3_rnd.h" #include "texture.h" #include "coltest.h" -#include "w3d_file.h" +#include "WW3D2/w3d_file.h" #include "texture.h" #include "dx8wrapper.h" -#include "vp.h" -#include "Vector3i.h" +#include "WWMath/vp.h" +#include "WWMath/Vector3i.h" #include "sortingrenderer.h" static SegLineRendererClass _LineRenderer; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/segline.h b/Core/Libraries/Source/WWVegas/WW3D2/segline.h index 86ac8b635d1..e934adca877 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/segline.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/segline.h @@ -37,8 +37,8 @@ #pragma once #include "rendobj.h" -#include "shader.h" -#include "simplevec.h" +#include "WW3D2/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 9b5970062ee..0d96c6b3a70 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 "ww3d.h" -#include "rinfo.h" +#include "WW3D2/ww3d.h" +#include "WW3D2/rinfo.h" #include "dx8wrapper.h" #include "sortingrenderer.h" -#include "vp.h" -#include "Vector3i.h" -#include "RANDOM.h" -#include "v3_rnd.h" -#include "meshgeometry.h" +#include "WWMath/vp.h" +#include "WWMath/Vector3i.h" +#include "WWLib/RANDOM.h" +#include "WWMath/v3_rnd.h" +#include "WW3D2/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 2a800068efd..8053adbf223 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/seglinerenderer.h @@ -38,11 +38,11 @@ #pragma once -#include "always.h" -#include "shader.h" +#include "WWLib/always.h" +#include "WW3D2/shader.h" #include "texture.h" -#include "matrix3d.h" -#include "vector2.h" +#include "WWMath/matrix3d.h" +#include "WWMath/vector2.h" class RenderInfoClass; class SphereClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.cpp b/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.cpp index c06d1dc1dcf..f216f34d64a 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 "assetmgr.h" -#include "mesh.h" -#include "meshmdl.h" +#include "WW3D2/assetmgr.h" +#include "WW3D2/mesh.h" +#include "WW3D2/meshmdl.h" #include "dynamesh.h" #include "htree.h" -#include "plane.h" -#include "simplevec.h" -#include "wwstring.h" -#include "vp.h" -#include "meshmatdesc.h" +#include "WWMath/plane.h" +#include "WWLib/simplevec.h" +#include "WWLib/wwstring.h" +#include "WWMath/vp.h" +#include "WW3D2/meshmatdesc.h" #include /* diff --git a/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.h b/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.h index 1389493d1bd..2e135df3f1d 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/shattersystem.h @@ -38,7 +38,7 @@ #pragma once -#include "always.h" +#include "WWLib/always.h" class MeshClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h b/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h index d787c45a503..ebe0f693719 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/snapPts.h @@ -36,9 +36,9 @@ #pragma once -#include "always.h" -#include "Vector.h" -#include "vector3.h" +#include "WWLib/always.h" +#include "WWLib/Vector.h" +#include "WWMath/vector3.h" #include "w3derr.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/snappts.cpp b/Core/Libraries/Source/WWVegas/WW3D2/snappts.cpp index 814459f04be..13d453474f8 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/snappts.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/snappts.cpp @@ -35,8 +35,8 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "snapPts.h" -#include "chunkio.h" -#include "w3d_file.h" +#include "WWLib/chunkio.h" +#include "WW3D2/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 7de76b29115..efd86222d9c 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/sortingrenderer.cpp @@ -42,12 +42,12 @@ #include "dx8vertexbuffer.h" #include "dx8indexbuffer.h" #include "dx8wrapper.h" -#include "vertmaterial.h" +#include "WW3D2/vertmaterial.h" #include "texture.h" #include "d3d8.h" #include "d3dx8math.h" #include "statistics.h" -#include +#include #include #include diff --git a/Core/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h b/Core/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h index 6e304f0da7d..14be254b6d4 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/sortingrenderer.h @@ -18,7 +18,7 @@ #pragma once -#include "always.h" +#include "WWLib/always.h" class SortingNodeStruct; class SphereClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.cpp b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.cpp index f18c5b44282..ce7269dc048 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.cpp @@ -38,13 +38,13 @@ #if noWWAUDIO //(gth) removing dependency on wwaudio -#include "AudibleSound.h" -#include "Sound3D.h" -#include "WWAudio.h" -#include "ffactory.h" -#include "WWFILE.h" -#include "chunkio.h" -#include "scene.h" +#include "WWAudio/AudibleSound.h" +#include "WWAudio/Sound3D.h" +#include "WWAudio/WWAudio.h" +#include "WWLib/ffactory.h" +#include "WWLib/WWFILE.h" +#include "WWLib/chunkio.h" +#include "WW3D2/scene.h" ////////////////////////////////////////////////////////////////////////////////// diff --git a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h index 4ece0237ac2..4ca84795fc0 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/soundrobj.h @@ -42,11 +42,11 @@ #if noWWAUDIO // (gth) removing dependency on WWAUDIO #include "rendobj.h" -#include "wwstring.h" +#include "WWLib/wwstring.h" #include "proto.h" -#include "w3d_file.h" +#include "WW3D2/w3d_file.h" #include "w3derr.h" -#include "AudibleSound.h" +#include "WWAudio/AudibleSound.h" ////////////////////////////////////////////////////////////////////////////////// diff --git a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.cpp b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.cpp index e3e927e86b0..ad4bb0bc549 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.cpp @@ -70,20 +70,20 @@ #include "sphereobj.h" #include "w3d_util.h" -#include "wwdebug.h" -#include "vertmaterial.h" -#include "ww3d.h" -#include "chunkio.h" -#include "rinfo.h" +#include "WWDebug/wwdebug.h" +#include "WW3D2/vertmaterial.h" +#include "WW3D2/ww3d.h" +#include "WWLib/chunkio.h" +#include "WW3D2/rinfo.h" #include "coltest.h" -#include "bound.h" +#include "WWLib/bound.h" #include "inttest.h" #include "predlod.h" -#include "matrix3.h" -#include "wwmath.h" -#include "assetmgr.h" -#include "wwstring.h" -#include "camera.h" +#include "WWMath/matrix3.h" +#include "WWMath/wwmath.h" +#include "WW3D2/assetmgr.h" +#include "WWLib/wwstring.h" +#include "WW3D2/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 4222b6b9988..76328bc3e04 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/sphereobj.h @@ -36,16 +36,16 @@ #pragma once -#include "always.h" +#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 "obbox.h" -#include "Vector3i.h" -#include "quat.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/statistics.cpp b/Core/Libraries/Source/WWVegas/WW3D2/statistics.cpp index e703c89e67b..0c6d2311e1e 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/statistics.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/statistics.cpp @@ -17,8 +17,8 @@ */ #include "statistics.h" -#include "wwstring.h" -#include "simplevec.h" +#include "WWLib/wwstring.h" +#include "WWLib/simplevec.h" #include "dx8renderer.h" #include "dx8wrapper.h" #include "dx8caps.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/statistics.h b/Core/Libraries/Source/WWVegas/WW3D2/statistics.h index 1b89610cbc5..c7d1f26a00a 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/statistics.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/statistics.h @@ -18,7 +18,7 @@ #pragma once -#include "always.h" +#include "WWLib/always.h" //#include "wwstring.h" class TextureClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/streak.cpp b/Core/Libraries/Source/WWVegas/WW3D2/streak.cpp index 035ea56ff19..aec9cd74c56 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/streak.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/streak.cpp @@ -35,17 +35,17 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "streak.h" -#include "ww3d.h" -#include "rinfo.h" +#include "WW3D2/ww3d.h" +#include "WW3D2/rinfo.h" #include "predlod.h" -#include "v3_rnd.h" +#include "WWMath/v3_rnd.h" #include "texture.h" #include "coltest.h" -#include "w3d_file.h" +#include "WW3D2/w3d_file.h" #include "texture.h" #include "dx8wrapper.h" -#include "vp.h" -#include "Vector3i.h" +#include "WWMath/vp.h" +#include "WWMath/Vector3i.h" #include "sortingrenderer.h" static SegLineRendererClass _LineRenderer; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/streak.h b/Core/Libraries/Source/WWVegas/WW3D2/streak.h index c80432d7314..77a242689e0 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/streak.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/streak.h @@ -37,8 +37,8 @@ #pragma once #include "rendobj.h" -#include "shader.h" -#include "simplevec.h" +#include "WW3D2/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 b03eafb7c74..4341c24d7b2 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/streakRender.cpp @@ -26,14 +26,14 @@ #include "streakRender.h" -#include "ww3d.h" -#include "rinfo.h" +#include "WW3D2/ww3d.h" +#include "WW3D2/rinfo.h" #include "dx8wrapper.h" #include "sortingrenderer.h" -#include "vp.h" -#include "Vector3i.h" -#include "RANDOM.h" -#include "v3_rnd.h" +#include "WWMath/vp.h" +#include "WWMath/Vector3i.h" +#include "WWLib/RANDOM.h" +#include "WWMath/v3_rnd.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/streakRender.h b/Core/Libraries/Source/WWVegas/WW3D2/streakRender.h index 02203218d47..46337fea7db 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/streakRender.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/streakRender.h @@ -38,11 +38,11 @@ #pragma once -#include "always.h" -#include "shader.h" +#include "WWLib/always.h" +#include "WW3D2/shader.h" #include "texture.h" -#include "matrix3d.h" -#include "vector2.h" +#include "WWMath/matrix3d.h" +#include "WWMath/vector2.h" class RenderInfoClass; class SphereClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/stripoptimizer.cpp b/Core/Libraries/Source/WWVegas/WW3D2/stripoptimizer.cpp index 813ca0b1cbc..7afdefc3c45 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/stripoptimizer.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/stripoptimizer.cpp @@ -17,8 +17,8 @@ */ #include "stripoptimizer.h" -#include "hashtemplate.h" -#include "wwdebug.h" +#include "WWLib/hashtemplate.h" +#include "WWDebug/wwdebug.h" template inline void swap (T& a, T& b) { diff --git a/Core/Libraries/Source/WWVegas/WW3D2/stripoptimizer.h b/Core/Libraries/Source/WWVegas/WW3D2/stripoptimizer.h index 001840bb37e..88c004a419f 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/stripoptimizer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/stripoptimizer.h @@ -18,7 +18,7 @@ #pragma once -#include "always.h" +#include "WWLib/always.h" // strip data = diff --git a/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.cpp b/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.cpp index fc5bfe4d3ab..2de64d69a39 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.cpp @@ -50,9 +50,9 @@ #include "surfaceclass.h" #include "formconv.h" #include "dx8wrapper.h" -#include "vector2i.h" +#include "WWMath/vector2i.h" #include "colorspace.h" -#include "bound.h" +#include "WWLib/bound.h" #include void Convert_Pixel(Vector3 &rgb, const SurfaceClass::SurfaceDescription &sd, const unsigned char * pixel) diff --git a/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h b/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h index 37b4b3aed4c..d68868ebd25 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/surfaceclass.h @@ -38,7 +38,7 @@ #pragma once -#include "always.h" +#include "WWLib/always.h" #include "ww3dformat.h" struct IDirect3DSurface8; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texproject.cpp b/Core/Libraries/Source/WWVegas/WW3D2/texproject.cpp index 59068d97f2d..c0d3b1fd71c 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/texproject.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/texproject.cpp @@ -75,20 +75,20 @@ #include "texproject.h" -#include "vertmaterial.h" -#include "shader.h" +#include "WW3D2/vertmaterial.h" +#include "WW3D2/shader.h" #include "texture.h" #include "rendobj.h" -#include "rinfo.h" -#include "camera.h" +#include "WW3D2/rinfo.h" +#include "WW3D2/camera.h" #include "matpass.h" #include "bwrender.h" -#include "assetmgr.h" +#include "WW3D2/assetmgr.h" #include "dx8wrapper.h" // DEBUG DEBUG -#include "MPU.h" +#include "WWLib/MPU.h" #define DEBUG_SHADOW_RENDERING 0 //#define DEFAULT_TEXTURE_SIZE 64 diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texproject.h b/Core/Libraries/Source/WWVegas/WW3D2/texproject.h index d8a7fa3caeb..368a1584a59 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/texproject.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/texproject.h @@ -39,14 +39,14 @@ #pragma once -#include "always.h" -#include "matrix3d.h" -#include "matrix4.h" -#include "obbox.h" +#include "WWLib/always.h" +#include "WWMath/matrix3d.h" +#include "WWMath/matrix4.h" +#include "WWMath/obbox.h" #include "matpass.h" -#include "matrixmapper.h" -#include "cullsys.h" -#include "multilist.h" +#include "WW3D2/matrixmapper.h" +#include "WWMath/cullsys.h" +#include "WWLib/multilist.h" #include "projector.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/textdraw.cpp b/Core/Libraries/Source/WWVegas/WW3D2/textdraw.cpp index 1cae1544bd8..3f8c1d96d26 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/textdraw.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/textdraw.cpp @@ -36,7 +36,7 @@ #include "textdraw.h" #include "font3d.h" -#include "simplevec.h" +#include "WWLib/simplevec.h" /*********************************************************************************************** * * diff --git a/Core/Libraries/Source/WWVegas/WW3D2/textdraw.h b/Core/Libraries/Source/WWVegas/WW3D2/textdraw.h index 767e93625a8..6d733165602 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/textdraw.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/textdraw.h @@ -34,7 +34,7 @@ #pragma once -#include "always.h" +#include "WWLib/always.h" #include "dynamesh.h" // sgc : wwlib and wwmath contain different rect.h files... diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texture.cpp b/Core/Libraries/Source/WWVegas/WW3D2/texture.cpp index 6f63b8d155e..35993b849bf 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/texture.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/texture.cpp @@ -44,19 +44,19 @@ #include #include #include "dx8wrapper.h" -#include "TARGA.h" -#include -#include "w3d_file.h" -#include "assetmgr.h" +#include "WWLib/TARGA.h" +#include +#include "WW3D2/w3d_file.h" +#include "WW3D2/assetmgr.h" #include "formconv.h" #include "textureloader.h" #include "missingtexture.h" -#include "ffactory.h" +#include "WWLib/ffactory.h" #include "dx8caps.h" #include "dx8texman.h" -#include "meshmatdesc.h" +#include "WW3D2/meshmatdesc.h" #include "texturethumbnail.h" -#include "wwprofile.h" +#include "WWDebug/wwprofile.h" const unsigned DEFAULT_INACTIVATION_TIME=20000; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texture.h b/Core/Libraries/Source/WWVegas/WW3D2/texture.h index 9d98c7b6ba6..0ce681ce531 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/texture.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/texture.h @@ -41,12 +41,12 @@ #pragma once -#include "always.h" -#include "chunkio.h" +#include "WWLib/always.h" +#include "WWLib/chunkio.h" #include "surfaceclass.h" #include "ww3dformat.h" -#include "wwstring.h" -#include "vector3.h" +#include "WWLib/wwstring.h" +#include "WWMath/vector3.h" #include "texturefilter.h" struct IDirect3DBaseTexture8; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp b/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp index bfe9eed0c77..a717414d252 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/textureloader.cpp @@ -39,26 +39,26 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "textureloader.h" -#include "mutex.h" -#include "thread.h" -#include "wwdebug.h" +#include "WWLib/mutex.h" +#include "WWLib/thread.h" +#include "WWDebug/wwdebug.h" #include "texture.h" -#include "ffactory.h" -#include "wwstring.h" -#include "bufffile.h" -#include "ww3d.h" -#include "assetmgr.h" +#include "WWLib/ffactory.h" +#include "WWLib/wwstring.h" +#include "WWLib/bufffile.h" +#include "WW3D2/ww3d.h" +#include "WW3D2/assetmgr.h" #include "dx8wrapper.h" #include "dx8caps.h" #include "missingtexture.h" -#include "TARGA.h" +#include "WWLib/TARGA.h" #include -#include "wwmemlog.h" +#include "WWDebug/wwmemlog.h" #include "formconv.h" #include "texturethumbnail.h" -#include "ddsfile.h" +#include "WW3D2/ddsfile.h" #include "bitmaphandler.h" -#include "wwprofile.h" +#include "WWDebug/wwprofile.h" bool TextureLoader::TextureLoadSuspended; int TextureLoader::TextureInactiveOverrideTime = 0; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/textureloader.h b/Core/Libraries/Source/WWVegas/WW3D2/textureloader.h index 338fff7cbed..b7d1f20b9ab 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/textureloader.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/textureloader.h @@ -39,7 +39,7 @@ #pragma once -#include "always.h" +#include "WWLib/always.h" #include "texture.h" class StringClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp b/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp index 5d05da9d44b..0fee1ed70bd 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.cpp @@ -17,16 +17,16 @@ */ #include "texturethumbnail.h" -#include "hashtemplate.h" +#include "WWLib/hashtemplate.h" #include "missingtexture.h" -#include "TARGA.h" +#include "WWLib/TARGA.h" #include "ww3dformat.h" -#include "ddsfile.h" +#include "WW3D2/ddsfile.h" #include "textureloader.h" #include "bitmaphandler.h" -#include "ffactory.h" -#include "RAWFILE.h" -#include "wwprofile.h" +#include "WWLib/ffactory.h" +#include "WWLib/RAWFILE.h" +#include "WWDebug/wwprofile.h" #include static DLListClass ThumbnailManagerList; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h b/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h index 91ba3037d18..afd06cd9132 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/texturethumbnail.h @@ -20,9 +20,9 @@ #pragma once -#include "always.h" -#include "wwstring.h" -#include "hashtemplate.h" +#include "WWLib/always.h" +#include "WWLib/wwstring.h" +#include "WWLib/hashtemplate.h" #include "dllist.h" #include "ww3dformat.h" diff --git a/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.cpp b/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.cpp index 89bc691f2f1..6f2f39a666a 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.cpp @@ -37,9 +37,9 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "visrasterizer.h" -#include "camera.h" -#include "plane.h" -#include "vp.h" +#include "WW3D2/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 2754cf3200e..be4f732fd5e 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/visrasterizer.h @@ -38,15 +38,15 @@ #pragma once -#include "always.h" -#include "matrix3d.h" -#include "matrix4.h" -#include "Vector3i.h" -#include "vector3.h" -#include "simplevec.h" -#include "bittype.h" -#include "plane.h" -#include "meshgeometry.h" +#include "WWLib/always.h" +#include "WWMath/matrix3d.h" +#include "WWMath/matrix4.h" +#include "WWMath/Vector3i.h" +#include "WWMath/vector3.h" +#include "WWLib/simplevec.h" +#include "WWLib/bittype.h" +#include "WWMath/plane.h" +#include "WW3D2/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 5999cef031e..e4cd16f7755 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/w3d_dep.cpp @@ -60,10 +60,10 @@ class STLSpecialAlloc #include "w3d_dep.h" -#include "w3d_file.h" +#include "WW3D2/w3d_file.h" #include -#include -#include "ffactory.h" +#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 d44420978a1..a2f1c35476b 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.cpp @@ -36,10 +36,10 @@ #include "w3d_util.h" -#include "vector3.h" -#include "vector4.h" -#include "quat.h" -#include "shader.h" +#include "WWMath/vector3.h" +#include "WWMath/vector4.h" +#include "WWMath/quat.h" +#include "WW3D2/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 90b3da3e16f..39808bb18df 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/w3d_util.h @@ -36,8 +36,8 @@ #pragma once -#include "always.h" -#include "w3d_file.h" +#include "WWLib/always.h" +#include "WW3D2/w3d_file.h" class Vector3; class Vector4; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3derr.h b/Core/Libraries/Source/WWVegas/WW3D2/w3derr.h index c600f8ca708..fbf2d6f8cc6 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/w3derr.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/w3derr.h @@ -36,7 +36,7 @@ #pragma once -#include "always.h" +#include "WWLib/always.h" /* ** These are the error codes which should be returned by all WW3D functions that can fail diff --git a/Core/Libraries/Source/WWVegas/WW3D2/w3dexclusionlist.h b/Core/Libraries/Source/WWVegas/WW3D2/w3dexclusionlist.h index 2014e2281c1..8232123b792 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/w3dexclusionlist.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/w3dexclusionlist.h @@ -37,10 +37,10 @@ #pragma once -#include "always.h" -#include "Vector.h" -#include "wwstring.h" -#include "hashtemplate.h" +#include "WWLib/always.h" +#include "WWLib/Vector.h" +#include "WWLib/wwstring.h" +#include "WWLib/hashtemplate.h" class PrototypeClass; class HTreeClass; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ww3dformat.cpp b/Core/Libraries/Source/WWVegas/WW3D2/ww3dformat.cpp index e35e179f160..9fd35d25651 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/ww3dformat.cpp +++ b/Core/Libraries/Source/WWVegas/WW3D2/ww3dformat.cpp @@ -38,9 +38,9 @@ * - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - */ #include "ww3dformat.h" -#include "vector4.h" -#include "wwdebug.h" -#include "TARGA.h" +#include "WWMath/vector4.h" +#include "WWDebug/wwdebug.h" +#include "WWLib/TARGA.h" #include "dx8wrapper.h" #include "dx8caps.h" #include diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ww3dformat.h b/Core/Libraries/Source/WWVegas/WW3D2/ww3dformat.h index 74c3a9d52bb..28b7eb8cd84 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/ww3dformat.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/ww3dformat.h @@ -41,8 +41,8 @@ #pragma once -#include "always.h" -#include "wwstring.h" +#include "WWLib/always.h" +#include "WWLib/wwstring.h" class Vector4; class Targa; diff --git a/Core/Libraries/Source/WWVegas/WW3D2/ww3dids.h b/Core/Libraries/Source/WWVegas/WW3D2/ww3dids.h index d6609919bfc..7fc696a8650 100644 --- a/Core/Libraries/Source/WWVegas/WW3D2/ww3dids.h +++ b/Core/Libraries/Source/WWVegas/WW3D2/ww3dids.h @@ -36,7 +36,7 @@ #pragma once -#include "saveloadids.h" +#include "WWSaveLoad/saveloadids.h" /* ** These are the chunk-id's used by all persistent objects in WW3D. The persistent object