Skip to content

refactor(WW3D2): Qualify Core header includes #2873

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CryoTheRenegade wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor(WW3D2): Qualify Core header includes #2873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Core/Libraries/Source/WWVegas/WW3D2/aabtree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,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"



Expand Down
22 changes: 11 additions & 11 deletions Core/Libraries/Source/WWVegas/WW3D2/aabtree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <tri.h>
#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 <WWMath/tri.h>
#include <float.h>


Expand Down
8 changes: 4 additions & 4 deletions Core/Libraries/Source/WWVegas/WW3D2/agg_def.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <windows.h>

Expand Down
6 changes: 3 additions & 3 deletions Core/Libraries/Source/WWVegas/WW3D2/agg_def.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,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"
Expand Down
20 changes: 10 additions & 10 deletions Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Core/Libraries/Source/WWVegas/WW3D2/animatedsoundmgr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"


//////////////////////////////////////////////////////////////////////
Expand Down
6 changes: 3 additions & 3 deletions Core/Libraries/Source/WWVegas/WW3D2/assetstatus.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

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

#pragma once

#include "always.h"
#include "hashtemplate.h"
#include "WWLib/always.h"
#include "WWLib/hashtemplate.h"

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

#include "bitmaphandler.h"
#include "wwdebug.h"
#include "WWDebug/wwdebug.h"
#include "colorspace.h"

void Bitmap_Assert(bool condition)
Expand Down
4 changes: 2 additions & 2 deletions Core/Libraries/Source/WWVegas/WW3D2/bitmaphandler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions Core/Libraries/Source/WWVegas/WW3D2/bmp2d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

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


#include "bwrender.h"
#include "vp.h"
#include "WWMath/vp.h"


BWRenderClass::Buffer::Buffer(unsigned char* buffer_, int scale_)
Expand Down
8 changes: 4 additions & 4 deletions Core/Libraries/Source/WWVegas/WW3D2/bwrender.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WW3D2/classid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

#pragma once

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

/*
** enum of all the WW3D class IDs.
Expand Down
10 changes: 5 additions & 5 deletions Core/Libraries/Source/WWVegas/WW3D2/collect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
6 changes: 3 additions & 3 deletions Core/Libraries/Source/WWVegas/WW3D2/collect.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WW3D2/colorspace.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#pragma once

#include "dx8wrapper.h"
#include <wwmath.h>
#include <WWMath/wwmath.h>

void RGB_To_HSV(Vector3 &hsv,const Vector3 &rgb);
void HSV_To_RGB(Vector3 &rgb, const Vector3 &hsv);
Expand Down
14 changes: 7 additions & 7 deletions Core/Libraries/Source/WWVegas/WW3D2/coltest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WW3D2/composite.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@


#include "composite.h"
#include "wwdebug.h"
#include "WWDebug/wwdebug.h"
#include <stdlib.h>


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

#include "rendobj.h"
#include "wwstring.h"
#include "WWLib/wwstring.h"

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

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


Expand Down
8 changes: 4 additions & 4 deletions Core/Libraries/Source/WWVegas/WW3D2/decalsys.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
16 changes: 8 additions & 8 deletions Core/Libraries/Source/WWVegas/WW3D2/distlod.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

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

#include "always.h"
#include "WWLib/always.h"
#include "dx8caps.h"
#include "dx8wrapper.h"
#include "formconv.h"
Expand Down
2 changes: 1 addition & 1 deletion Core/Libraries/Source/WWVegas/WW3D2/dx8caps.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

#pragma once

#include "always.h"
#include "WWLib/always.h"
#include "ww3dformat.h"
#include <d3d8.h>

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

#include "dx8fvf.h"
#include "wwstring.h"
#include "WWLib/wwstring.h"
#include <d3dx8core.h>

static unsigned Get_FVF_Vertex_Size(unsigned FVF)
Expand Down
4 changes: 2 additions & 2 deletions Core/Libraries/Source/WWVegas/WW3D2/dx8fvf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@

#pragma once

#include "always.h"
#include "WWLib/always.h"
#include <d3d8.h>
#ifdef WWDEBUG
#include "wwdebug.h"
#include "WWDebug/wwdebug.h"
#endif

class StringClass;
Expand Down
Loading
Loading