diff --git a/.gitignore b/.gitignore index 5e3d8c08..298dfe37 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ *.so *.dll *.dylib +*.pdb # Qt-es @@ -37,5 +38,6 @@ Makefile* bin/*.log bin/dump/* bin/PrimeWorldEditor.exe +bin/PrimeWorldEditor-debug.exe build/* externals/* \ No newline at end of file diff --git a/src/Common/CColor.h b/src/Common/CColor.h index 70fd6980..56efa930 100644 --- a/src/Common/CColor.h +++ b/src/Common/CColor.h @@ -3,7 +3,7 @@ #include #include -#include "CVector4f.h" +#include "Math/CVector4f.h" #include "types.h" class CColor diff --git a/src/Common/CUniqueID.cpp b/src/Common/CUniqueID.cpp index 7e7e87db..b4856738 100644 --- a/src/Common/CUniqueID.cpp +++ b/src/Common/CUniqueID.cpp @@ -1,5 +1,5 @@ #include "CUniqueID.h" -#include +#include "TString.h" #include #include diff --git a/src/Common/Math/CAABox.cpp b/src/Common/Math/CAABox.cpp index fcfe4266..db211a52 100644 --- a/src/Common/Math/CAABox.cpp +++ b/src/Common/Math/CAABox.cpp @@ -1,8 +1,7 @@ #include "CAABox.h" -#include -#include +#include "CTransform4f.h" +#include "Math.h" #include "CRay.h" -#include "SRayIntersection.h" #include CAABox::CAABox() diff --git a/src/Common/Math/CAABox.h b/src/Common/Math/CAABox.h index 59676bef..fcc71867 100644 --- a/src/Common/Math/CAABox.h +++ b/src/Common/Math/CAABox.h @@ -1,9 +1,9 @@ #ifndef CAABOX_H #define CAABOX_H +#include "CVector3f.h" #include #include -#include "CVector3f.h" #include class CRay; diff --git a/src/Common/Math/CFrustumPlanes.cpp b/src/Common/Math/CFrustumPlanes.cpp index 37f23bd3..8b3972c7 100644 --- a/src/Common/Math/CFrustumPlanes.cpp +++ b/src/Common/Math/CFrustumPlanes.cpp @@ -1,6 +1,6 @@ #include "CFrustumPlanes.h" -#include -#include +#include "Math.h" +#include "Common/types.h" CFrustumPlanes::CFrustumPlanes() { diff --git a/src/Common/Math/CFrustumPlanes.h b/src/Common/Math/CFrustumPlanes.h index c9c1c616..d25e9b55 100644 --- a/src/Common/Math/CFrustumPlanes.h +++ b/src/Common/Math/CFrustumPlanes.h @@ -1,9 +1,9 @@ #ifndef CFRUSTUMPLANES_H #define CFRUSTUMPLANES_H -#include -#include -#include +#include "CAABox.h" +#include "CPlane.h" +#include "CVector3f.h" class CFrustumPlanes { diff --git a/src/Common/Math/CQuaternion.cpp b/src/Common/Math/CQuaternion.cpp index 01d551f9..fefb64b7 100644 --- a/src/Common/Math/CQuaternion.cpp +++ b/src/Common/Math/CQuaternion.cpp @@ -1,8 +1,8 @@ #include "CQuaternion.h" +#include "CMatrix4f.h" +#include "Math.h" #include #include -#include "Math.h" -#include "CMatrix4f.h" CQuaternion::CQuaternion() { diff --git a/src/Common/Math/CRay.cpp b/src/Common/Math/CRay.cpp index cf3df7e5..ca99c15b 100644 --- a/src/Common/Math/CRay.cpp +++ b/src/Common/Math/CRay.cpp @@ -1,6 +1,6 @@ #include "CRay.h" -#include -#include +#include "CVector4f.h" +#include "CTransform4f.h" #include CRay::CRay() diff --git a/src/Common/Math/CVector2f.cpp b/src/Common/Math/CVector2f.cpp index 428a86d7..fe35161a 100644 --- a/src/Common/Math/CVector2f.cpp +++ b/src/Common/Math/CVector2f.cpp @@ -1,4 +1,4 @@ -#include "CVector2f.h" +#include "Common/Math/CVector2f.h" CVector2f::CVector2f() { diff --git a/src/Common/Math/Math.cpp b/src/Common/Math/Math.cpp index aeabb7cf..bf16f2ba 100644 --- a/src/Common/Math/Math.cpp +++ b/src/Common/Math/Math.cpp @@ -1,5 +1,5 @@ #include "Math.h" -#include +#include "CMatrix4f.h" #include namespace Math diff --git a/src/Common/Math/Math.h b/src/Common/Math/Math.h index f0a76eac..0fbeaa0a 100644 --- a/src/Common/Math/Math.h +++ b/src/Common/Math/Math.h @@ -1,11 +1,10 @@ -#ifndef MATH -#define MATH +#ifndef MATH_H +#define MATH_H #include "CAABox.h" #include "CRay.h" #include "CPlane.h" #include "CVector3f.h" -#include "SRayIntersection.h" #include namespace Math @@ -43,5 +42,5 @@ static const float skPi = 3.14159265358979323846f; static const float skHalfPi = skPi / 2.f; } -#endif // MATH +#endif // MATH_H diff --git a/src/Core/CAreaAttributes.cpp b/src/Core/CAreaAttributes.cpp index 6b0eb85b..cfdc7a56 100644 --- a/src/Core/CAreaAttributes.cpp +++ b/src/Core/CAreaAttributes.cpp @@ -1,6 +1,6 @@ #include "CAreaAttributes.h" -#include -#include +#include "Core/Resource/Script/CMasterTemplate.h" +#include "Core/Resource/Script/CScriptLayer.h" CAreaAttributes::CAreaAttributes(CScriptObject *pObj) { diff --git a/src/Core/CAreaAttributes.h b/src/Core/CAreaAttributes.h index b108cf7b..ad0cb8dd 100644 --- a/src/Core/CAreaAttributes.h +++ b/src/Core/CAreaAttributes.h @@ -1,7 +1,7 @@ #ifndef CAREAATTRIBUTES_H #define CAREAATTRIBUTES_H -#include +#include "Core/Resource/Script/CScriptObject.h" class CAreaAttributes { diff --git a/src/Core/CLightParameters.h b/src/Core/CLightParameters.h index a85860cf..df92e5b5 100644 --- a/src/Core/CLightParameters.h +++ b/src/Core/CLightParameters.h @@ -1,8 +1,8 @@ #ifndef CLIGHTPARAMETERS_H #define CLIGHTPARAMETERS_H -#include -#include +#include "Core/Resource/CGameArea.h" +#include "Core/Resource/Script/CProperty.h" class CLightParameters { diff --git a/src/Core/CRayCollisionTester.cpp b/src/Core/CRayCollisionTester.cpp index b748db3d..fb473a9b 100644 --- a/src/Core/CRayCollisionTester.cpp +++ b/src/Core/CRayCollisionTester.cpp @@ -1,5 +1,5 @@ #include "CRayCollisionTester.h" -#include +#include "Core/Scene/CSceneNode.h" CRayCollisionTester::CRayCollisionTester(const CRay& Ray) : mRay(Ray) diff --git a/src/Core/CRayCollisionTester.h b/src/Core/CRayCollisionTester.h index fe73bbd3..3dc547ff 100644 --- a/src/Core/CRayCollisionTester.h +++ b/src/Core/CRayCollisionTester.h @@ -1,13 +1,13 @@ #ifndef CRAYCOLLISIONHELPER_H #define CRAYCOLLISIONHELPER_H -#include "CAABox.h" -#include "CRay.h" -#include "CVector3f.h" #include "SRayIntersection.h" -#include "types.h" -#include -#include +#include "Core/Render/SViewInfo.h" +#include "Core/Resource/Model/CBasicModel.h" +#include +#include +#include +#include #include diff --git a/src/Core/Log.cpp b/src/Core/Log.cpp index 72b9bc02..922a32d0 100644 --- a/src/Core/Log.cpp +++ b/src/Core/Log.cpp @@ -1,7 +1,6 @@ +#include #include #include -#include -#include namespace Log { diff --git a/src/Core/OpenGL/CDynamicVertexBuffer.h b/src/Core/OpenGL/CDynamicVertexBuffer.h index 1ea015fa..e2969fef 100644 --- a/src/Core/OpenGL/CDynamicVertexBuffer.h +++ b/src/Core/OpenGL/CDynamicVertexBuffer.h @@ -1,12 +1,13 @@ #ifndef CDYNAMICVERTEXBUFFER_H #define CDYNAMICVERTEXBUFFER_H -#include +#include "Core/Resource/Model/EVertexDescription.h" #include -#include -#include -#include +#include +#include + #include +#include class CDynamicVertexBuffer { diff --git a/src/Core/OpenGL/CFramebuffer.h b/src/Core/OpenGL/CFramebuffer.h index 4d890ced..640ab71d 100644 --- a/src/Core/OpenGL/CFramebuffer.h +++ b/src/Core/OpenGL/CFramebuffer.h @@ -2,8 +2,8 @@ #define CFRAMEBUFFER_H #include "CRenderbuffer.h" -#include -#include +#include "Core/Resource/CTexture.h" +#include class CFramebuffer { diff --git a/src/Core/OpenGL/CIndexBuffer.h b/src/Core/OpenGL/CIndexBuffer.h index c8829ded..79737a8b 100644 --- a/src/Core/OpenGL/CIndexBuffer.h +++ b/src/Core/OpenGL/CIndexBuffer.h @@ -2,8 +2,8 @@ #define CINDEXBUFFER_H #include -#include -#include +#include +#include class CIndexBuffer { diff --git a/src/Core/OpenGL/CRenderbuffer.h b/src/Core/OpenGL/CRenderbuffer.h index 577713bd..33ef78d9 100644 --- a/src/Core/OpenGL/CRenderbuffer.h +++ b/src/Core/OpenGL/CRenderbuffer.h @@ -1,8 +1,8 @@ #ifndef CRENDERBUFFER_H #define CRENDERBUFFER_H -#include #include +#include class CRenderbuffer { diff --git a/src/Core/OpenGL/CShader.cpp b/src/Core/OpenGL/CShader.cpp index c9ef3d07..1e404f84 100644 --- a/src/Core/OpenGL/CShader.cpp +++ b/src/Core/OpenGL/CShader.cpp @@ -1,12 +1,12 @@ #include "CShader.h" +#include "Core/Render/CGraphics.h" +#include #include -#include #include #include #include #include -#include bool gDebugDumpShaders = false; u64 gFailedCompileCount = 0; diff --git a/src/Core/OpenGL/CShader.h b/src/Core/OpenGL/CShader.h index d60a0028..5319015c 100644 --- a/src/Core/OpenGL/CShader.h +++ b/src/Core/OpenGL/CShader.h @@ -1,8 +1,8 @@ #ifndef CSHADER_H #define CSHADER_H -#include #include +#include class CShader { diff --git a/src/Core/OpenGL/CShaderGenerator.cpp b/src/Core/OpenGL/CShaderGenerator.cpp index a8f18cf0..01921b18 100644 --- a/src/Core/OpenGL/CShaderGenerator.cpp +++ b/src/Core/OpenGL/CShaderGenerator.cpp @@ -1,8 +1,8 @@ +#include "CShaderGenerator.h" #include #include #include -#include -#include "CShaderGenerator.h" +#include const TString gkCoordSrc[] = { "RawPosition.xyz", diff --git a/src/Core/OpenGL/CShaderGenerator.h b/src/Core/OpenGL/CShaderGenerator.h index ec521296..0d480cf3 100644 --- a/src/Core/OpenGL/CShaderGenerator.h +++ b/src/Core/OpenGL/CShaderGenerator.h @@ -1,10 +1,9 @@ #ifndef SHADERGEN_H #define SHADERGEN_H -#include - #include "CShader.h" -#include +#include "Core/Resource/CMaterial.h" +#include class CShaderGenerator { diff --git a/src/Core/OpenGL/CUniformBuffer.h b/src/Core/OpenGL/CUniformBuffer.h index 66757d77..5e8d933e 100644 --- a/src/Core/OpenGL/CUniformBuffer.h +++ b/src/Core/OpenGL/CUniformBuffer.h @@ -1,8 +1,8 @@ #ifndef CUNIFORMBUFFER_H #define CUNIFORMBUFFER_H -#include #include +#include class CUniformBuffer { diff --git a/src/Core/OpenGL/CVertexBuffer.cpp b/src/Core/OpenGL/CVertexBuffer.cpp index cd0d6f44..b3b7b34a 100644 --- a/src/Core/OpenGL/CVertexBuffer.cpp +++ b/src/Core/OpenGL/CVertexBuffer.cpp @@ -1,6 +1,5 @@ #include "CVertexBuffer.h" #include "CVertexArrayManager.h" -#include CVertexBuffer::CVertexBuffer() { diff --git a/src/Core/OpenGL/CVertexBuffer.h b/src/Core/OpenGL/CVertexBuffer.h index 31efa47e..f2e8f2c1 100644 --- a/src/Core/OpenGL/CVertexBuffer.h +++ b/src/Core/OpenGL/CVertexBuffer.h @@ -1,10 +1,10 @@ #ifndef CVERTEXBUFFER_H #define CVERTEXBUFFER_H -#include -#include -#include +#include "Core/Resource/Model/CVertex.h" +#include "Core/Resource/Model/EVertexDescription.h" #include +#include class CVertexBuffer { diff --git a/src/Core/OpenGL/GLCommon.h b/src/Core/OpenGL/GLCommon.h index 27f2717a..beba44f5 100644 --- a/src/Core/OpenGL/GLCommon.h +++ b/src/Core/OpenGL/GLCommon.h @@ -1,8 +1,8 @@ #ifndef GLCOMMON_H #define GLCOMMON_H -#include #include +#include enum EBlendFactor { diff --git a/src/Core/Render/CCamera.cpp b/src/Core/Render/CCamera.cpp index 471c2b1b..a970a767 100644 --- a/src/Core/Render/CCamera.cpp +++ b/src/Core/Render/CCamera.cpp @@ -1,7 +1,7 @@ #include "CCamera.h" #include "CGraphics.h" -#include -#include +#include +#include #include CCamera::CCamera() diff --git a/src/Core/Render/CCamera.h b/src/Core/Render/CCamera.h index ea7d87c3..fac736f4 100644 --- a/src/Core/Render/CCamera.h +++ b/src/Core/Render/CCamera.h @@ -1,12 +1,12 @@ #ifndef CCAMERA_H #define CCAMERA_H -#include "CFrustumPlanes.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -22,8 +22,8 @@ enum ECameraMoveMode * value via the const get functions. They are not modified in const functions * beyond ensuring that all data is valid and synced with everything else (eg * mPosition is only modified to ensure it's correct in orbit mode given the - * target/distance/pitch/yaw; it won't be modified as a camera snap in a const - * function). */ + * target/distance/pitch/yaw; it won't be snapped to a different location in a + * const function). */ class CCamera { ECameraMoveMode mMode; diff --git a/src/Core/Render/CDrawUtil.cpp b/src/Core/Render/CDrawUtil.cpp index d2f788cd..019b88ad 100644 --- a/src/Core/Render/CDrawUtil.cpp +++ b/src/Core/Render/CDrawUtil.cpp @@ -1,9 +1,9 @@ #include "CDrawUtil.h" #include "CGraphics.h" -#include "CResCache.h" -#include +#include "Core/Resource/CResCache.h" +#include "Core/Log.h" +#include #include -#include "Log.h" // ************ MEMBER INITIALIZATION ************ CVertexBuffer CDrawUtil::mGridVertices; diff --git a/src/Core/Render/CDrawUtil.h b/src/Core/Render/CDrawUtil.h index 5c7f4991..6fe5ba3d 100644 --- a/src/Core/Render/CDrawUtil.h +++ b/src/Core/Render/CDrawUtil.h @@ -1,15 +1,15 @@ #ifndef CDRAWUTIL #define CDRAWUTIL -#include -#include -#include -#include -#include +#include "Core/OpenGL/CVertexBuffer.h" +#include "Core/OpenGL/CDynamicVertexBuffer.h" +#include "Core/OpenGL/CIndexBuffer.h" +#include "Core/Resource/model/CModel.h" +#include "Core/Resource/CLight.h" -// todo: CDrawUtil should work with CRenderer to queue primitives for rendering -// rather than trying to draw them straight away, so that CDrawUtil functions can -// be called from anywhere in the codebase and still function correctly +/* todo: CDrawUtil should work with CRenderer to queue primitives for rendering + * rather than trying to draw them straight away, so that CDrawUtil functions can + * be called from anywhere in the codebase and still function correctly */ class CDrawUtil { // 7x7 Grid diff --git a/src/Core/Render/CGraphics.cpp b/src/Core/Render/CGraphics.cpp index 244e7c69..229e03f4 100644 --- a/src/Core/Render/CGraphics.cpp +++ b/src/Core/Render/CGraphics.cpp @@ -1,7 +1,7 @@ #include "CGraphics.h" -#include -#include -#include "Log.h" +#include "Core/OpenGL/CShader.h" +#include "Core/Resource/CMaterial.h" +#include "Core/Log.h" // ************ MEMBER INITIALIZATION ************ CUniformBuffer* CGraphics::mpMVPBlockBuffer; diff --git a/src/Core/Render/CGraphics.h b/src/Core/Render/CGraphics.h index 14023322..b00b8288 100644 --- a/src/Core/Render/CGraphics.h +++ b/src/Core/Render/CGraphics.h @@ -1,15 +1,20 @@ #ifndef CGRAPHICS_H #define CGRAPHICS_H +#include "Core/OpenGL/CUniformBuffer.h" +#include "Core/OpenGL/CVertexArrayManager.h" +#include "Core/Resource/CLight.h" #include -#include -#include -#include +#include +#include +#include #include -#include -#include -#include +/** + * todo: should probably be replaced with a CGraphicsState class which + * can be instantiated and is probably more safe/functional than global access. + * also, + */ class CGraphics { static CUniformBuffer *mpMVPBlockBuffer; diff --git a/src/Core/Render/CRenderBucket.cpp b/src/Core/Render/CRenderBucket.cpp index 170306ed..aae4b26b 100644 --- a/src/Core/Render/CRenderBucket.cpp +++ b/src/Core/Render/CRenderBucket.cpp @@ -1,8 +1,8 @@ #include "CRenderBucket.h" -#include #include "CDrawUtil.h" #include "CGraphics.h" #include "CRenderer.h" +#include CRenderBucket::CRenderBucket() { diff --git a/src/Core/Render/CRenderer.cpp b/src/Core/Render/CRenderer.cpp index 371cdd88..6d263b9a 100644 --- a/src/Core/Render/CRenderer.cpp +++ b/src/Core/Render/CRenderer.cpp @@ -2,10 +2,10 @@ #include "CDrawUtil.h" #include "CGraphics.h" -#include "CResCache.h" +#include "Core/Resource/CResCache.h" +#include "Core/Resource/Factory/CTextureDecoder.h" #include -#include -#include +#include #include #include diff --git a/src/Core/Render/CRenderer.h b/src/Core/Render/CRenderer.h index e2ae9505..5a9da09e 100644 --- a/src/Core/Render/CRenderer.h +++ b/src/Core/Render/CRenderer.h @@ -1,8 +1,6 @@ #ifndef CRENDERER_H #define CRENDERER_H -#include - #include "CCamera.h" #include "CGraphics.h" #include "CRenderBucket.h" @@ -10,15 +8,17 @@ #include "ERenderCommand.h" #include "SRenderablePtr.h" #include "SViewInfo.h" -#include +#include "Core/OpenGL/CFramebuffer.h" +#include "Core/Resource/CFont.h" +#include "Core/Resource/CLight.h" +#include "Core/Resource/CTexture.h" +#include "Core/Scene/CSceneNode.h" + +#include +#include #include -#include -#include -#include -#include -#include -#include -#include + +#include class CRenderer { diff --git a/src/Core/Render/SRenderablePtr.h b/src/Core/Render/SRenderablePtr.h index f471c009..5c7ede86 100644 --- a/src/Core/Render/SRenderablePtr.h +++ b/src/Core/Render/SRenderablePtr.h @@ -1,11 +1,11 @@ #ifndef SRENDERABLEPTR_H #define SRENDERABLEPTR_H -#include +#include "ERenderCommand.h" +#include "Core/Resource/CMaterial.h" +#include "Core/Scene/CSceneNode.h" +#include #include -#include -#include -#include struct SRenderablePtr { diff --git a/src/Core/Render/SViewInfo.h b/src/Core/Render/SViewInfo.h index fb898966..c148494e 100644 --- a/src/Core/Render/SViewInfo.h +++ b/src/Core/Render/SViewInfo.h @@ -1,9 +1,9 @@ #ifndef SVIEWINFO #define SVIEWINFO -#include "CFrustumPlanes.h" -#include -#include +#include +#include +#include struct SViewInfo { diff --git a/src/Core/Resource/CAnimSet.cpp b/src/Core/Resource/CAnimSet.cpp index 9b79b4c9..b9d069d1 100644 --- a/src/Core/Resource/CAnimSet.cpp +++ b/src/Core/Resource/CAnimSet.cpp @@ -1,5 +1,4 @@ #include "CAnimSet.h" -#include CAnimSet::CAnimSet() : CResource() { diff --git a/src/Core/Resource/CAnimSet.h b/src/Core/Resource/CAnimSet.h index 0da4818b..42e41a20 100644 --- a/src/Core/Resource/CAnimSet.h +++ b/src/Core/Resource/CAnimSet.h @@ -1,11 +1,12 @@ #ifndef CANIMSET_H #define CANIMSET_H -#include -#include -#include -#include "model/CModel.h" +#include "TResPtr.h" #include "CResource.h" +#include "Core/Resource/Model/CModel.h" +#include + +#include // will expand later! this is where animation support will come in class CAnimSet : public CResource diff --git a/src/Core/Resource/CAnimationParameters.cpp b/src/Core/Resource/CAnimationParameters.cpp index 9936ee52..36c8fb4d 100644 --- a/src/Core/Resource/CAnimationParameters.cpp +++ b/src/Core/Resource/CAnimationParameters.cpp @@ -1,7 +1,7 @@ #include "CAnimationParameters.h" #include "CAnimSet.h" -#include -#include +#include "CResCache.h" +#include "Core/Log.h" #include CAnimationParameters::CAnimationParameters() diff --git a/src/Core/Resource/CAnimationParameters.h b/src/Core/Resource/CAnimationParameters.h index 2182c6b8..b3e16033 100644 --- a/src/Core/Resource/CAnimationParameters.h +++ b/src/Core/Resource/CAnimationParameters.h @@ -2,9 +2,9 @@ #define CANIMATIONPARAMETERS_H #include "CResource.h" -#include "model/CModel.h" -#include +#include "TResPtr.h" #include "EFormatVersion.h" +#include "Core/Resource/Model/CModel.h" class CAnimationParameters { diff --git a/src/Core/Resource/CCollisionMesh.cpp b/src/Core/Resource/CCollisionMesh.cpp index 74fd89c6..1e43d836 100644 --- a/src/Core/Resource/CCollisionMesh.cpp +++ b/src/Core/Resource/CCollisionMesh.cpp @@ -1,5 +1,5 @@ #include "CCollisionMesh.h" -#include +#include "Core/Render/CRenderer.h" CCollisionMesh::CCollisionMesh() { diff --git a/src/Core/Resource/CCollisionMesh.h b/src/Core/Resource/CCollisionMesh.h index d7257a99..91233587 100644 --- a/src/Core/Resource/CCollisionMesh.h +++ b/src/Core/Resource/CCollisionMesh.h @@ -1,10 +1,10 @@ #ifndef CCOLLISIONMESH_H #define CCOLLISIONMESH_H -#include -#include -#include #include "CResource.h" +#include "Core/OpenGL/CVertexBuffer.h" +#include "Core/OpenGL/CIndexBuffer.h" +#include class CCollisionMesh { diff --git a/src/Core/Resource/CCollisionMeshGroup.h b/src/Core/Resource/CCollisionMeshGroup.h index c357c097..ee30933f 100644 --- a/src/Core/Resource/CCollisionMeshGroup.h +++ b/src/Core/Resource/CCollisionMeshGroup.h @@ -3,7 +3,7 @@ #include "CResource.h" #include "CCollisionMesh.h" -#include +#include "TResPtr.h" #include class CCollisionMeshGroup : public CResource diff --git a/src/Core/Resource/CFont.cpp b/src/Core/Resource/CFont.cpp index 5af7706d..0de10b7a 100644 --- a/src/Core/Resource/CFont.cpp +++ b/src/Core/Resource/CFont.cpp @@ -1,7 +1,7 @@ #include "CFont.h" -#include -#include -#include +#include "CResCache.h" +#include "Core/Render/CDrawUtil.h" +#include "Core/Render/CRenderer.h" #include CDynamicVertexBuffer CFont::smGlyphVertices; diff --git a/src/Core/Resource/CFont.h b/src/Core/Resource/CFont.h index dc51b25f..deed82eb 100644 --- a/src/Core/Resource/CFont.h +++ b/src/Core/Resource/CFont.h @@ -3,11 +3,11 @@ #include "CResource.h" #include "CTexture.h" -#include "model/CVertex.h" +#include "TResPtr.h" +#include "Core/Resource/Model/CVertex.h" +#include "Core/OpenGL/CDynamicVertexBuffer.h" +#include "Core/OpenGL/CIndexBuffer.h" #include -#include -#include -#include #include #include diff --git a/src/Core/Resource/CGameArea.cpp b/src/Core/Resource/CGameArea.cpp index fc1f5f4f..c518d7bb 100644 --- a/src/Core/Resource/CGameArea.cpp +++ b/src/Core/Resource/CGameArea.cpp @@ -1,6 +1,6 @@ #include "CGameArea.h" -#include "script/CScriptLayer.h" -#include +#include "Core/Resource/Script/CScriptLayer.h" +#include "Core/Render/CRenderer.h" CGameArea::CGameArea() : CResource() { diff --git a/src/Core/Resource/CGameArea.h b/src/Core/Resource/CGameArea.h index 7695b519..9ac0c3c0 100644 --- a/src/Core/Resource/CGameArea.h +++ b/src/Core/Resource/CGameArea.h @@ -1,14 +1,15 @@ #ifndef CGAMEAREA_H #define CGAMEAREA_H +#include "CResource.h" #include "CCollisionMeshGroup.h" #include "CLight.h" #include "CMaterialSet.h" -#include "model/CModel.h" -#include "model/CStaticModel.h" -#include "CResource.h" +#include "Core/Resource/Model/CModel.h" +#include "Core/Resource/Model/CStaticModel.h" #include -#include +#include + #include class CScriptLayer; diff --git a/src/Core/Resource/CLight.cpp b/src/Core/Resource/CLight.cpp index 35a6b26e..c7bbe109 100644 --- a/src/Core/Resource/CLight.cpp +++ b/src/Core/Resource/CLight.cpp @@ -1,7 +1,7 @@ #include "CLight.h" +#include "Core/Render/CGraphics.h" #include #include -#include #define CLIGHT_NO_RADIUS 0x40 #define CLIGHT_NO_INTENSITY 0x80 diff --git a/src/Core/Resource/CLight.h b/src/Core/Resource/CLight.h index 7c4f7403..2c43dccc 100644 --- a/src/Core/Resource/CLight.h +++ b/src/Core/Resource/CLight.h @@ -3,8 +3,7 @@ #include #include -#include -#include +#include /* CLight is currently heavily based on the lights system from Metroid Prime, * including code reverse engineered from the game's executable. Not yet sure diff --git a/src/Core/Resource/CMaterial.cpp b/src/Core/Resource/CMaterial.cpp index 2ff19abb..9fee6fd6 100644 --- a/src/Core/Resource/CMaterial.cpp +++ b/src/Core/Resource/CMaterial.cpp @@ -1,13 +1,13 @@ #include "CMaterial.h" +#include "CResCache.h" +#include "Core/Render/CDrawUtil.h" +#include "Core/Render/CRenderer.h" +#include "Core/OpenGL/GLCommon.h" +#include "Core/OpenGL/CShaderGenerator.h" #include -#include -#include -#include -#include -#include #include -#include +#include u64 CMaterial::sCurrentMaterial = 0; CColor CMaterial::sCurrentTint = CColor::skWhite; diff --git a/src/Core/Resource/CMaterial.h b/src/Core/Resource/CMaterial.h index 3a7040ec..dfcff717 100644 --- a/src/Core/Resource/CMaterial.h +++ b/src/Core/Resource/CMaterial.h @@ -4,15 +4,15 @@ #include "CMaterialPass.h" #include "CTexture.h" #include "EFormatVersion.h" -#include "model/EVertexDescription.h" +#include "TResPtr.h" +#include "Core/Resource/Model/EVertexDescription.h" +#include "Core/Render/ERenderOptions.h" +#include "Core/OpenGL/CShader.h" + #include #include #include -#include -#include #include -#include -#include class CMaterialSet; diff --git a/src/Core/Resource/CMaterialPass.cpp b/src/Core/Resource/CMaterialPass.cpp index 4e7e0d52..3d2f9b07 100644 --- a/src/Core/Resource/CMaterialPass.cpp +++ b/src/Core/Resource/CMaterialPass.cpp @@ -1,7 +1,7 @@ #include "CMaterialPass.h" #include "CMaterial.h" +#include "Core/Render/CGraphics.h" #include -#include CMaterialPass::CMaterialPass(CMaterial *pParent) { diff --git a/src/Core/Resource/CMaterialPass.h b/src/Core/Resource/CMaterialPass.h index 72050e5d..d5036f1a 100644 --- a/src/Core/Resource/CMaterialPass.h +++ b/src/Core/Resource/CMaterialPass.h @@ -1,12 +1,12 @@ #ifndef CMATERIALPASS_H #define CMATERIALPASS_H +#include "TResPtr.h" +#include "CTexture.h" +#include "ETevEnums.h" +#include "Core/Render/ERenderOptions.h" #include #include -#include -#include -#include -#include "ETevEnums.h" class CMaterial; diff --git a/src/Core/Resource/CMaterialSet.cpp b/src/Core/Resource/CMaterialSet.cpp index 3372569c..f78b3f1f 100644 --- a/src/Core/Resource/CMaterialSet.cpp +++ b/src/Core/Resource/CMaterialSet.cpp @@ -1,5 +1,5 @@ #include "CMaterialSet.h" -#include +#include "CResCache.h" #include CMaterialSet::CMaterialSet() diff --git a/src/Core/Resource/CMaterialSet.h b/src/Core/Resource/CMaterialSet.h index aba62e2c..e9e1b823 100644 --- a/src/Core/Resource/CMaterialSet.h +++ b/src/Core/Resource/CMaterialSet.h @@ -1,10 +1,10 @@ #ifndef CMATERIALSET_H #define CMATERIALSET_H -#include -#include -#include +#include "CMaterial.h" +#include "CTexture.h" #include "EFormatVersion.h" +#include class CMaterialSet { diff --git a/src/Core/Resource/CPakFile.cpp b/src/Core/Resource/CPakFile.cpp index 4d6854ad..b91d4e56 100644 --- a/src/Core/Resource/CPakFile.cpp +++ b/src/Core/Resource/CPakFile.cpp @@ -2,6 +2,7 @@ #include #include #include + #include #include #include diff --git a/src/Core/Resource/CPakFile.h b/src/Core/Resource/CPakFile.h index 862295df..dfa604cc 100644 --- a/src/Core/Resource/CPakFile.h +++ b/src/Core/Resource/CPakFile.h @@ -1,10 +1,10 @@ #ifndef CPAKFILE_H #define CPAKFILE_H -#include -#include #include "SNamedResource.h" #include "SResInfo.h" +#include +#include #include class CPakFile diff --git a/src/Core/Resource/CResCache.cpp b/src/Core/Resource/CResCache.cpp index a00a7815..bb9af87a 100644 --- a/src/Core/Resource/CResCache.cpp +++ b/src/Core/Resource/CResCache.cpp @@ -1,20 +1,18 @@ #include "CResCache.h" -#include "Log.h" +#include "Core/Resource/Factory/CAreaLoader.h" +#include "Core/Resource/Factory/CAnimSetLoader.h" +#include "Core/Resource/Factory/CCollisionLoader.h" +#include "Core/Resource/Factory/CFontLoader.h" +#include "Core/Resource/Factory/CModelLoader.h" +#include "Core/Resource/Factory/CScanLoader.h" +#include "Core/Resource/Factory/CStringLoader.h" +#include "Core/Resource/Factory/CTextureDecoder.h" +#include "Core/Resource/Factory/CWorldLoader.h" +#include "Core/Log.h" + #include #include #include -#include - -// Loaders -#include -#include -#include -#include -#include -#include -#include -#include -#include CResCache::CResCache() { diff --git a/src/Core/Resource/CResCache.h b/src/Core/Resource/CResCache.h index fde23ef4..212fb299 100644 --- a/src/Core/Resource/CResCache.h +++ b/src/Core/Resource/CResCache.h @@ -1,10 +1,10 @@ #ifndef CRESCACHE_H #define CRESCACHE_H +#include "CPakFile.h" +#include "CResource.h" #include #include -#include -#include #include struct SResSource diff --git a/src/Core/Resource/CResource.cpp b/src/Core/Resource/CResource.cpp index bbee8cc0..a380029e 100644 --- a/src/Core/Resource/CResource.cpp +++ b/src/Core/Resource/CResource.cpp @@ -1,5 +1,5 @@ #include "CResource.h" -#include +#include "CResCache.h" #include CResource::CResource() diff --git a/src/Core/Resource/CScan.h b/src/Core/Resource/CScan.h index fff1edc7..e517b648 100644 --- a/src/Core/Resource/CScan.h +++ b/src/Core/Resource/CScan.h @@ -4,7 +4,7 @@ #include "CResource.h" #include "CStringTable.h" #include "EFormatVersion.h" -#include +#include "TResPtr.h" class CScan : public CResource { diff --git a/src/Core/Resource/CStringTable.h b/src/Core/Resource/CStringTable.h index 56bd33f0..9239599d 100644 --- a/src/Core/Resource/CStringTable.h +++ b/src/Core/Resource/CStringTable.h @@ -2,10 +2,10 @@ #define CSTRINGTABLE_H #include "CResource.h" -#include #include +#include +#include #include -#include class CStringTable : public CResource { diff --git a/src/Core/Resource/CTexture.h b/src/Core/Resource/CTexture.h index 2550d5db..8a0076ab 100644 --- a/src/Core/Resource/CTexture.h +++ b/src/Core/Resource/CTexture.h @@ -1,12 +1,13 @@ #ifndef CTEXTURE_H #define CTEXTURE_H -#include -#include -#include -#include #include "CResource.h" #include "ETexelFormat.h" +#include +#include +#include + +#include class CTexture : public CResource { diff --git a/src/Core/Resource/CWorld.cpp b/src/Core/Resource/CWorld.cpp index f8b26131..a60b669b 100644 --- a/src/Core/Resource/CWorld.cpp +++ b/src/Core/Resource/CWorld.cpp @@ -1,6 +1,6 @@ #include "CWorld.h" -#include "script/CScriptLayer.h" -#include +#include "CResCache.h" +#include "Core/Resource/Script/CScriptLayer.h" CWorld::CWorld() : CResource() { diff --git a/src/Core/Resource/CWorld.h b/src/Core/Resource/CWorld.h index 864ceb1b..d20df61b 100644 --- a/src/Core/Resource/CWorld.h +++ b/src/Core/Resource/CWorld.h @@ -5,8 +5,8 @@ #include "CGameArea.h" #include "CStringTable.h" #include "SDependency.h" -#include "model/CModel.h" -#include +#include "Core/Resource/Model/CModel.h" +#include class CWorld : public CResource { diff --git a/src/Core/Resource/Cooker/CMaterialCooker.cpp b/src/Core/Resource/Cooker/CMaterialCooker.cpp index b9262eb7..bc1a4312 100644 --- a/src/Core/Resource/Cooker/CMaterialCooker.cpp +++ b/src/Core/Resource/Cooker/CMaterialCooker.cpp @@ -1,5 +1,4 @@ #include "CMaterialCooker.h" - #include CMaterialCooker::CMaterialCooker() diff --git a/src/Core/Resource/Cooker/CMaterialCooker.h b/src/Core/Resource/Cooker/CMaterialCooker.h index 72f1975f..f30164cd 100644 --- a/src/Core/Resource/Cooker/CMaterialCooker.h +++ b/src/Core/Resource/Cooker/CMaterialCooker.h @@ -1,9 +1,9 @@ #ifndef CMATERIALCOOKER_H #define CMATERIALCOOKER_H -#include "../CMaterial.h" -#include "../CMaterialSet.h" -#include "../EFormatVersion.h" +#include "Core/Resource/CMaterial.h" +#include "Core/Resource/CMaterialSet.h" +#include "Core/Resource/EFormatVersion.h" class CMaterialCooker { diff --git a/src/Core/Resource/Cooker/CModelCooker.h b/src/Core/Resource/Cooker/CModelCooker.h index b4ea3775..84d67054 100644 --- a/src/Core/Resource/Cooker/CModelCooker.h +++ b/src/Core/Resource/Cooker/CModelCooker.h @@ -1,8 +1,8 @@ #ifndef CMODELCOOKER_H #define CMODELCOOKER_H -#include "../model/CModel.h" -#include "../EFormatVersion.h" +#include "Core/Resource/Model/CModel.h" +#include "Core/Resource/EFormatVersion.h" #include class CModelCooker diff --git a/src/Core/Resource/Cooker/CSectionMgrOut.h b/src/Core/Resource/Cooker/CSectionMgrOut.h index da17743e..c576993b 100644 --- a/src/Core/Resource/Cooker/CSectionMgrOut.h +++ b/src/Core/Resource/Cooker/CSectionMgrOut.h @@ -1,8 +1,8 @@ #ifndef CBLOCKMGROUT_H #define CBLOCKMGROUT_H -#include #include +#include #include // Small class to manage file sections for CMDL/MREA output diff --git a/src/Core/Resource/Cooker/CTemplateWriter.cpp b/src/Core/Resource/Cooker/CTemplateWriter.cpp index 974f394d..26081dda 100644 --- a/src/Core/Resource/Cooker/CTemplateWriter.cpp +++ b/src/Core/Resource/Cooker/CTemplateWriter.cpp @@ -1,7 +1,8 @@ #include "CTemplateWriter.h" -#include "../cooker/CWorldCooker.h" -#include +#include "CWorldCooker.h" + #include +#include using namespace tinyxml2; diff --git a/src/Core/Resource/Cooker/CTemplateWriter.h b/src/Core/Resource/Cooker/CTemplateWriter.h index ed6c1b40..1ff2fa70 100644 --- a/src/Core/Resource/Cooker/CTemplateWriter.h +++ b/src/Core/Resource/Cooker/CTemplateWriter.h @@ -1,8 +1,9 @@ #ifndef CTEMPLATEWRITER_H #define CTEMPLATEWRITER_H -#include "../script/CMasterTemplate.h" -#include "../script/CScriptTemplate.h" +#include "Core/Resource/Script/CMasterTemplate.h" +#include "Core/Resource/Script/CScriptTemplate.h" +#include class CTemplateWriter { diff --git a/src/Core/Resource/Cooker/CTextureEncoder.h b/src/Core/Resource/Cooker/CTextureEncoder.h index 899eaf8b..21a01903 100644 --- a/src/Core/Resource/Cooker/CTextureEncoder.h +++ b/src/Core/Resource/Cooker/CTextureEncoder.h @@ -1,8 +1,8 @@ #ifndef CTEXTUREENCODER_H #define CTEXTUREENCODER_H -#include "../CTexture.h" -#include +#include "Core/Resource/CTexture.h" +#include "Core/Resource/TResPtr.h" // Class contains basic functionality right now - only supports directly converting DXT1 to CMPR // More advanced functions (including actual encoding!) coming later diff --git a/src/Core/Resource/Cooker/CWorldCooker.h b/src/Core/Resource/Cooker/CWorldCooker.h index e1b03597..2c0ec173 100644 --- a/src/Core/Resource/Cooker/CWorldCooker.h +++ b/src/Core/Resource/Cooker/CWorldCooker.h @@ -1,8 +1,8 @@ #ifndef CWORLDCOOKER_H #define CWORLDCOOKER_H +#include "Core/Resource/EFormatVersion.h" #include -#include "../EFormatVersion.h" class CWorldCooker { diff --git a/src/Core/Resource/Factory/CAnimSetLoader.cpp b/src/Core/Resource/Factory/CAnimSetLoader.cpp index 0aacc9e1..b3d98e9f 100644 --- a/src/Core/Resource/Factory/CAnimSetLoader.cpp +++ b/src/Core/Resource/Factory/CAnimSetLoader.cpp @@ -1,6 +1,6 @@ #include "CAnimSetLoader.h" -#include -#include +#include "Core/Resource/CResCache.h" +#include "Core/Log.h" CAnimSetLoader::CAnimSetLoader() { diff --git a/src/Core/Resource/Factory/CAnimSetLoader.h b/src/Core/Resource/Factory/CAnimSetLoader.h index 4dd1f420..27ae0c83 100644 --- a/src/Core/Resource/Factory/CAnimSetLoader.h +++ b/src/Core/Resource/Factory/CAnimSetLoader.h @@ -1,9 +1,9 @@ #ifndef CCHARACTERLOADER_H #define CCHARACTERLOADER_H -#include "../CAnimSet.h" -#include "../EFormatVersion.h" -#include +#include "Core/Resource/CAnimSet.h" +#include "Core/Resource/EFormatVersion.h" +#include "Core/Resource/CResCache.h" class CAnimSetLoader { diff --git a/src/Core/Resource/Factory/CAreaLoader.cpp b/src/Core/Resource/Factory/CAreaLoader.cpp index 005f5936..7a14de97 100644 --- a/src/Core/Resource/Factory/CAreaLoader.cpp +++ b/src/Core/Resource/Factory/CAreaLoader.cpp @@ -3,10 +3,12 @@ #include "CModelLoader.h" #include "CMaterialLoader.h" #include "CScriptLoader.h" +#include "Core/Log.h" + #include #include + #include -#include CAreaLoader::CAreaLoader() { diff --git a/src/Core/Resource/Factory/CAreaLoader.h b/src/Core/Resource/Factory/CAreaLoader.h index 4f7e243a..c49c3420 100644 --- a/src/Core/Resource/Factory/CAreaLoader.h +++ b/src/Core/Resource/Factory/CAreaLoader.h @@ -1,12 +1,13 @@ #ifndef CAREALOADER_H #define CAREALOADER_H -#include -#include "../CGameArea.h" -#include "../EFormatVersion.h" #include "CBlockMgrIn.h" -#include -#include +#include "Core/Resource/Script/SConnection.h" +#include "Core/Resource/CGameArea.h" +#include "Core/Resource/EFormatVersion.h" +#include "Core/Resource/CResCache.h" + +#include class CAreaLoader { diff --git a/src/Core/Resource/Factory/CCollisionLoader.cpp b/src/Core/Resource/Factory/CCollisionLoader.cpp index cacf5708..4a2fb724 100644 --- a/src/Core/Resource/Factory/CCollisionLoader.cpp +++ b/src/Core/Resource/Factory/CCollisionLoader.cpp @@ -1,5 +1,5 @@ #include "CCollisionLoader.h" -#include +#include "Core/Log.h" #include CCollisionLoader::CCollisionLoader() diff --git a/src/Core/Resource/Factory/CCollisionLoader.h b/src/Core/Resource/Factory/CCollisionLoader.h index b40214dc..227b4bc1 100644 --- a/src/Core/Resource/Factory/CCollisionLoader.h +++ b/src/Core/Resource/Factory/CCollisionLoader.h @@ -1,9 +1,9 @@ #ifndef CCOLLISIONLOADER_H #define CCOLLISIONLOADER_H -#include "../CCollisionMesh.h" -#include "../CCollisionMeshGroup.h" -#include "../EFormatVersion.h" +#include "Core/Resource/CCollisionMesh.h" +#include "Core/Resource/CCollisionMeshGroup.h" +#include "Core/Resource/EFormatVersion.h" class CCollisionLoader { diff --git a/src/Core/Resource/Factory/CFontLoader.cpp b/src/Core/Resource/Factory/CFontLoader.cpp index 9ba11179..a2f70557 100644 --- a/src/Core/Resource/Factory/CFontLoader.cpp +++ b/src/Core/Resource/Factory/CFontLoader.cpp @@ -1,5 +1,5 @@ #include "CFontLoader.h" -#include +#include "Core/Log.h" #include CFontLoader::CFontLoader() diff --git a/src/Core/Resource/Factory/CFontLoader.h b/src/Core/Resource/Factory/CFontLoader.h index 2ebab42d..d279543d 100644 --- a/src/Core/Resource/Factory/CFontLoader.h +++ b/src/Core/Resource/Factory/CFontLoader.h @@ -1,9 +1,9 @@ #ifndef CFONTLOADER_H #define CFONTLOADER_H -#include "../CFont.h" -#include "../EFormatVersion.h" -#include +#include "Core/Resource/CFont.h" +#include "Core/Resource/EFormatVersion.h" +#include "Core/Resource/CResCache.h" class CFontLoader { diff --git a/src/Core/Resource/Factory/CMaterialLoader.cpp b/src/Core/Resource/Factory/CMaterialLoader.cpp index 45914ef9..2707e00d 100644 --- a/src/Core/Resource/Factory/CMaterialLoader.cpp +++ b/src/Core/Resource/Factory/CMaterialLoader.cpp @@ -1,7 +1,7 @@ #include "CMaterialLoader.h" -#include -#include -#include +#include "Core/Resource/CResCache.h" +#include "Core/OpenGL/GLCommon.h" +#include "Core/Log.h" #include #include diff --git a/src/Core/Resource/Factory/CMaterialLoader.h b/src/Core/Resource/Factory/CMaterialLoader.h index 64700279..bdc58271 100644 --- a/src/Core/Resource/Factory/CMaterialLoader.h +++ b/src/Core/Resource/Factory/CMaterialLoader.h @@ -1,9 +1,9 @@ #ifndef CMATERIALLOADER_H #define CMATERIALLOADER_H -#include "../CMaterialSet.h" -#include "../EFormatVersion.h" -#include +#include "Core/Resource/CMaterialSet.h" +#include "Core/Resource/EFormatVersion.h" +#include "Core/Resource/CResCache.h" #include #include diff --git a/src/Core/Resource/Factory/CModelLoader.cpp b/src/Core/Resource/Factory/CModelLoader.cpp index 35600e3f..70bb2802 100644 --- a/src/Core/Resource/Factory/CModelLoader.cpp +++ b/src/Core/Resource/Factory/CModelLoader.cpp @@ -1,6 +1,6 @@ #include "CModelLoader.h" #include "CMaterialLoader.h" -#include +#include "Core/Log.h" CModelLoader::CModelLoader() { diff --git a/src/Core/Resource/Factory/CModelLoader.h b/src/Core/Resource/Factory/CModelLoader.h index ee02240d..25621c63 100644 --- a/src/Core/Resource/Factory/CModelLoader.h +++ b/src/Core/Resource/Factory/CModelLoader.h @@ -1,13 +1,14 @@ #ifndef CMODELLOADER_H #define CMODELLOADER_H -#include "../model/CBasicModel.h" -#include "../model/CModel.h" -#include "../EFormatVersion.h" #include "CBlockMgrIn.h" -#include -#include +#include "Core/Resource/Model/CBasicModel.h" +#include "Core/Resource/Model/CModel.h" +#include "Core/Resource/CResCache.h" +#include "Core/Resource/EFormatVersion.h" #include + +#include #include class CModelLoader diff --git a/src/Core/Resource/Factory/CScanLoader.cpp b/src/Core/Resource/Factory/CScanLoader.cpp index 42c31b5d..febb085c 100644 --- a/src/Core/Resource/Factory/CScanLoader.cpp +++ b/src/Core/Resource/Factory/CScanLoader.cpp @@ -1,6 +1,6 @@ #include "CScanLoader.h" -#include -#include +#include "Core/Resource/CResCache.h" +#include "Core/Log.h" CScanLoader::CScanLoader() { diff --git a/src/Core/Resource/Factory/CScanLoader.h b/src/Core/Resource/Factory/CScanLoader.h index d62ec8ac..f43fe593 100644 --- a/src/Core/Resource/Factory/CScanLoader.h +++ b/src/Core/Resource/Factory/CScanLoader.h @@ -1,8 +1,8 @@ #ifndef CSCANLOADER_H #define CSCANLOADER_H -#include "../CScan.h" -#include "../EFormatVersion.h" +#include "Core/Resource/CScan.h" +#include "Core/Resource/EFormatVersion.h" class CScanLoader { diff --git a/src/Core/Resource/Factory/CScriptLoader.cpp b/src/Core/Resource/Factory/CScriptLoader.cpp index d27d4c60..f03893ca 100644 --- a/src/Core/Resource/Factory/CScriptLoader.cpp +++ b/src/Core/Resource/Factory/CScriptLoader.cpp @@ -1,7 +1,7 @@ #include "CScriptLoader.h" -#include "../script/CMasterTemplate.h" -#include -#include +#include "Core/Resource/Script/CMasterTemplate.h" +#include "Core/Resource/CResCache.h" +#include "Core/Log.h" #include #include diff --git a/src/Core/Resource/Factory/CScriptLoader.h b/src/Core/Resource/Factory/CScriptLoader.h index cdcda658..d164ccb2 100644 --- a/src/Core/Resource/Factory/CScriptLoader.h +++ b/src/Core/Resource/Factory/CScriptLoader.h @@ -1,11 +1,11 @@ #ifndef CSCRIPTLOADER_H #define CSCRIPTLOADER_H -#include "../script/CScriptObject.h" -#include "../script/CScriptLayer.h" -#include "../script/CMasterTemplate.h" -#include "../CGameArea.h" -#include +#include "Core/Resource/Script/CScriptObject.h" +#include "Core/Resource/Script/CScriptLayer.h" +#include "Core/Resource/Script/CMasterTemplate.h" +#include "Core/Resource/CGameArea.h" +#include "Core/Resource/CResCache.h" class CScriptLoader { diff --git a/src/Core/Resource/Factory/CStringLoader.cpp b/src/Core/Resource/Factory/CStringLoader.cpp index bc480ff1..3f9ceec6 100644 --- a/src/Core/Resource/Factory/CStringLoader.cpp +++ b/src/Core/Resource/Factory/CStringLoader.cpp @@ -1,5 +1,5 @@ #include "CStringLoader.h" -#include +#include "Core/Log.h" CStringLoader::CStringLoader() { diff --git a/src/Core/Resource/Factory/CStringLoader.h b/src/Core/Resource/Factory/CStringLoader.h index 9edc7546..e69c1caf 100644 --- a/src/Core/Resource/Factory/CStringLoader.h +++ b/src/Core/Resource/Factory/CStringLoader.h @@ -1,10 +1,10 @@ #ifndef CSTRINGLOADER_H #define CSTRINGLOADER_H -#include "../CStringTable.h" -#include "../EFormatVersion.h" -#include -#include +#include "Core/Resource/CStringTable.h" +#include "Core/Resource/CResCache.h" +#include "Core/Resource/EFormatVersion.h" +#include "Core/Resource/TResPtr.h" class CStringLoader { diff --git a/src/Core/Resource/Factory/CTemplateLoader.cpp b/src/Core/Resource/Factory/CTemplateLoader.cpp index 6ee962cb..cb2caf99 100644 --- a/src/Core/Resource/Factory/CTemplateLoader.cpp +++ b/src/Core/Resource/Factory/CTemplateLoader.cpp @@ -1,6 +1,6 @@ #include "CTemplateLoader.h" #include "CWorldLoader.h" -#include +#include "Core/Log.h" void CTemplateLoader::LoadBitFlags(tinyxml2::XMLElement *pElem, CBitfieldTemplate *pTemp, const TString& templateName) { diff --git a/src/Core/Resource/Factory/CTemplateLoader.h b/src/Core/Resource/Factory/CTemplateLoader.h index 4311e366..6677e09c 100644 --- a/src/Core/Resource/Factory/CTemplateLoader.h +++ b/src/Core/Resource/Factory/CTemplateLoader.h @@ -1,8 +1,8 @@ #ifndef CTEMPLATELOADER_H #define CTEMPLATELOADER_H -#include "../script/CMasterTemplate.h" -#include "../script/CScriptTemplate.h" +#include "Core/Resource/Script/CMasterTemplate.h" +#include "Core/Resource/Script/CScriptTemplate.h" #include class CTemplateLoader diff --git a/src/Core/Resource/Factory/CTextureDecoder.cpp b/src/Core/Resource/Factory/CTextureDecoder.cpp index 4fa40321..465661a7 100644 --- a/src/Core/Resource/Factory/CTextureDecoder.cpp +++ b/src/Core/Resource/Factory/CTextureDecoder.cpp @@ -1,6 +1,6 @@ -#include -#include #include "CTextureDecoder.h" +#include "Core/Log.h" +#include // A cleanup is warranted at some point. Trying to support both partial + full decode ended up really messy. diff --git a/src/Core/Resource/Factory/CTextureDecoder.h b/src/Core/Resource/Factory/CTextureDecoder.h index 0bbf2f9c..06cd9c51 100644 --- a/src/Core/Resource/Factory/CTextureDecoder.h +++ b/src/Core/Resource/Factory/CTextureDecoder.h @@ -1,11 +1,12 @@ #ifndef CTEXTUREDECODER_H #define CTEXTUREDECODER_H -#include +#include "Core/Resource/CTexture.h" +#include "Core/Resource/ETexelFormat.h" #include #include -#include "../CTexture.h" -#include "../ETexelFormat.h" + +#include class CTextureDecoder { diff --git a/src/Core/Resource/Factory/CWorldLoader.cpp b/src/Core/Resource/Factory/CWorldLoader.cpp index 39191976..811cadd9 100644 --- a/src/Core/Resource/Factory/CWorldLoader.cpp +++ b/src/Core/Resource/Factory/CWorldLoader.cpp @@ -1,6 +1,6 @@ #include "CWorldLoader.h" -#include -#include +#include "Core/Resource/CResCache.h" +#include "Core/Log.h" #include CWorldLoader::CWorldLoader() diff --git a/src/Core/Resource/Factory/CWorldLoader.h b/src/Core/Resource/Factory/CWorldLoader.h index 96090682..c0c2ece3 100644 --- a/src/Core/Resource/Factory/CWorldLoader.h +++ b/src/Core/Resource/Factory/CWorldLoader.h @@ -1,10 +1,11 @@ #ifndef CWORLDLOADER_H #define CWORLDLOADER_H -#include "../CWorld.h" -#include "../EFormatVersion.h" +#include "Core/Resource/CWorld.h" +#include "Core/Resource/CResCache.h" +#include "Core/Resource/EFormatVersion.h" + #include -#include class CWorldLoader { diff --git a/src/Core/Resource/Model/CBasicModel.h b/src/Core/Resource/Model/CBasicModel.h index 1ee60170..b2a2ecb7 100644 --- a/src/Core/Resource/Model/CBasicModel.h +++ b/src/Core/Resource/Model/CBasicModel.h @@ -1,10 +1,10 @@ #ifndef CBASICMODEL_H #define CBASICMODEL_H -#include "../CResource.h" #include "SSurface.h" -#include -#include +#include "Core/Resource/CResource.h" +#include "Core/OpenGL/CVertexBuffer.h" +#include class CBasicModel : public CResource { diff --git a/src/Core/Resource/Model/CModel.cpp b/src/Core/Resource/Model/CModel.cpp index a2f8c1b2..1e67f7d8 100644 --- a/src/Core/Resource/Model/CModel.cpp +++ b/src/Core/Resource/Model/CModel.cpp @@ -1,7 +1,7 @@ #include "CModel.h" -#include -#include -#include +#include "Core/Render/CDrawUtil.h" +#include "Core/Render/CRenderer.h" +#include "Core/OpenGL/GLCommon.h" CModel::CModel() : CBasicModel() { diff --git a/src/Core/Resource/Model/CModel.h b/src/Core/Resource/Model/CModel.h index db109b77..7b54d3b5 100644 --- a/src/Core/Resource/Model/CModel.h +++ b/src/Core/Resource/Model/CModel.h @@ -3,11 +3,10 @@ #include "CBasicModel.h" #include "SSurface.h" -#include "../CMaterialSet.h" - -#include -#include -#include +#include "Core/Resource/CMaterialSet.h" +#include "Core/OpenGL/CIndexBuffer.h" +#include "Core/OpenGL/GLCommon.h" +#include "Core/Render/ERenderOptions.h" class CModel : public CBasicModel { diff --git a/src/Core/Resource/Model/CStaticModel.cpp b/src/Core/Resource/Model/CStaticModel.cpp index c4dd2579..dea8ea91 100644 --- a/src/Core/Resource/Model/CStaticModel.cpp +++ b/src/Core/Resource/Model/CStaticModel.cpp @@ -1,7 +1,7 @@ #include "CStaticModel.h" -#include -#include -#include +#include "Core/Render/CDrawUtil.h" +#include "Core/Render/CRenderer.h" +#include "Core/OpenGL/GLCommon.h" CStaticModel::CStaticModel() : CBasicModel() { diff --git a/src/Core/Resource/Model/CStaticModel.h b/src/Core/Resource/Model/CStaticModel.h index 7f8bd1e5..cdbf8b12 100644 --- a/src/Core/Resource/Model/CStaticModel.h +++ b/src/Core/Resource/Model/CStaticModel.h @@ -2,13 +2,12 @@ #define CSTATICMODEL_H #include "CBasicModel.h" -#include -#include - -// A CStaticModel is meant for meshes that don't move. It's built specifically with terrain in mind. -// It only links to one material, and what it does best is combining submeshes from different models -// into shared VBOs and IBOs. This allows for a significantly reduced number of draw calls. +#include "Core/Render/ERenderOptions.h" +#include "Core/OpenGL/CIndexBuffer.h" +/* A CStaticModel is meant for meshes that don't move. It's built specifically with terrain in mind. + * It only links to one material, and what it does best is combining submeshes from different models + * into shared VBOs and IBOs. This allows for a significantly reduced number of draw calls. */ class CStaticModel : public CBasicModel { CMaterial *mpMaterial; diff --git a/src/Core/Resource/Model/CVertex.h b/src/Core/Resource/Model/CVertex.h index 8474f1d4..682a8bb1 100644 --- a/src/Core/Resource/Model/CVertex.h +++ b/src/Core/Resource/Model/CVertex.h @@ -1,8 +1,8 @@ #ifndef CVERTEX_H #define CVERTEX_H -#include -#include +#include +#include #include class CVertex diff --git a/src/Core/Resource/Model/SSurface.cpp b/src/Core/Resource/Model/SSurface.cpp index 3ec4bc06..bcbd6b78 100644 --- a/src/Core/Resource/Model/SSurface.cpp +++ b/src/Core/Resource/Model/SSurface.cpp @@ -1,7 +1,7 @@ #include "SSurface.h" -#include -#include -#include +#include "Core/Render/CDrawUtil.h" +#include "Core/CRayCollisionTester.h" +#include std::pair SSurface::IntersectsRay(const CRay& Ray, bool allowBackfaces, float LineThreshold) { diff --git a/src/Core/Resource/Model/SSurface.h b/src/Core/Resource/Model/SSurface.h index 46cb55db..d61b1e9e 100644 --- a/src/Core/Resource/Model/SSurface.h +++ b/src/Core/Resource/Model/SSurface.h @@ -1,15 +1,15 @@ #ifndef SSURFACE_H #define SSURFACE_H -#include "../CMaterialSet.h" #include "CVertex.h" +#include "Core/Resource/CMaterialSet.h" +#include "Core/OpenGL/GLCommon.h" +#include "Core/SRayIntersection.h" #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include #include struct SSurface diff --git a/src/Core/Resource/Script/CMasterTemplate.cpp b/src/Core/Resource/Script/CMasterTemplate.cpp index 13141eea..df615f06 100644 --- a/src/Core/Resource/Script/CMasterTemplate.cpp +++ b/src/Core/Resource/Script/CMasterTemplate.cpp @@ -1,6 +1,6 @@ #include "CMasterTemplate.h" -#include "../factory/CWorldLoader.h" -#include +#include "Core/Resource/Factory/CWorldLoader.h" +#include "Core/Log.h" CMasterTemplate::CMasterTemplate() { diff --git a/src/Core/Resource/Script/CMasterTemplate.h b/src/Core/Resource/Script/CMasterTemplate.h index 80df1119..94c68689 100644 --- a/src/Core/Resource/Script/CMasterTemplate.h +++ b/src/Core/Resource/Script/CMasterTemplate.h @@ -2,10 +2,9 @@ #define CMASTERTEMPLATE_H #include "CScriptTemplate.h" -#include "../EFormatVersion.h" +#include "Core/Resource/EFormatVersion.h" #include #include -#include class CMasterTemplate { diff --git a/src/Core/Resource/Script/CProperty.h b/src/Core/Resource/Script/CProperty.h index 49f15b6c..1b50737d 100644 --- a/src/Core/Resource/Script/CProperty.h +++ b/src/Core/Resource/Script/CProperty.h @@ -1,19 +1,17 @@ #ifndef CPROPERTY #define CPROPERTY -/* - * This header file declares some classes used to track script object properties +/* This header file declares some classes used to track script object properties * CPropertyBase, __CProperty (and typedefs), CPropertyStruct - * It's a bit hard to read, should be reorganized at some point - */ -#include "../CResource.h" -#include "../CAnimationParameters.h" + * It's a bit hard to read, should be reorganized at some point */ #include "CPropertyTemplate.h" #include "EPropertyType.h" +#include "Core/Resource/CResource.h" +#include "Core/Resource/TResPtr.h" +#include "Core/Resource/CAnimationParameters.h" +#include #include -#include #include -#include #include class CScriptTemplate; diff --git a/src/Core/Resource/Script/CScriptObject.cpp b/src/Core/Resource/Script/CScriptObject.cpp index afdd9592..ceef3ba0 100644 --- a/src/Core/Resource/Script/CScriptObject.cpp +++ b/src/Core/Resource/Script/CScriptObject.cpp @@ -1,6 +1,6 @@ #include "CScriptObject.h" -#include "../CAnimSet.h" #include "CMasterTemplate.h" +#include "Core/Resource/CAnimSet.h" CScriptObject::CScriptObject(CGameArea *pArea, CScriptLayer *pLayer, CScriptTemplate *pTemplate) { diff --git a/src/Core/Resource/Script/CScriptObject.h b/src/Core/Resource/Script/CScriptObject.h index 17b53adf..98dc195d 100644 --- a/src/Core/Resource/Script/CScriptObject.h +++ b/src/Core/Resource/Script/CScriptObject.h @@ -5,9 +5,9 @@ #include "CProperty.h" #include "CPropertyTemplate.h" #include "CScriptTemplate.h" -#include "../model/CModel.h" -#include "../CCollisionMeshGroup.h" -#include "../CGameArea.h" +#include "Core/Resource/Model/CModel.h" +#include "Core/Resource/CCollisionMeshGroup.h" +#include "Core/Resource/CGameArea.h" class CScriptLayer; diff --git a/src/Core/Resource/Script/CScriptTemplate.cpp b/src/Core/Resource/Script/CScriptTemplate.cpp index 296f5a73..31c7926f 100644 --- a/src/Core/Resource/Script/CScriptTemplate.cpp +++ b/src/Core/Resource/Script/CScriptTemplate.cpp @@ -1,11 +1,12 @@ #include "CScriptTemplate.h" #include "CScriptObject.h" #include "CMasterTemplate.h" +#include "Core/Resource/CResCache.h" +#include "Core/Resource/CAnimSet.h" +#include "Core/Log.h" + #include #include -#include -#include -#include CScriptTemplate::CScriptTemplate(CMasterTemplate *pMaster) { diff --git a/src/Core/Resource/Script/CScriptTemplate.h b/src/Core/Resource/Script/CScriptTemplate.h index a7851ef0..a57d0d04 100644 --- a/src/Core/Resource/Script/CScriptTemplate.h +++ b/src/Core/Resource/Script/CScriptTemplate.h @@ -5,13 +5,12 @@ #include "CProperty.h" #include "EPropertyType.h" #include "EVolumeShape.h" +#include "Core/Resource/Model/CModel.h" +#include "Core/Resource/CCollisionMeshGroup.h" #include #include #include #include -#include -#include -#include class CMasterTemplate; class CScriptObject; diff --git a/src/Core/Resource/TResPtr.h b/src/Core/Resource/TResPtr.h index 131f4968..add736e8 100644 --- a/src/Core/Resource/TResPtr.h +++ b/src/Core/Resource/TResPtr.h @@ -1,7 +1,7 @@ #ifndef TRESPTR_H #define TRESPTR_H -#include +#include "CResource.h" template class TResPtr diff --git a/src/Core/SRayIntersection.h b/src/Core/SRayIntersection.h index 7b92bcf9..d62b6472 100644 --- a/src/Core/SRayIntersection.h +++ b/src/Core/SRayIntersection.h @@ -1,7 +1,8 @@ #ifndef SRAYINTERSECTION #define SRAYINTERSECTION -#include "types.h" +#include + class CSceneNode; struct SRayIntersection diff --git a/src/Core/Scene/CCollisionNode.cpp b/src/Core/Scene/CCollisionNode.cpp index cf20044e..2e9dfc55 100644 --- a/src/Core/Scene/CCollisionNode.cpp +++ b/src/Core/Scene/CCollisionNode.cpp @@ -1,7 +1,7 @@ #include "CCollisionNode.h" -#include -#include -#include +#include "Core/Render/CDrawUtil.h" +#include "Core/Render/CGraphics.h" +#include "Core/Render/CRenderer.h" CCollisionNode::CCollisionNode(CSceneManager *pScene, CSceneNode *pParent, CCollisionMeshGroup *pCollision) : CSceneNode(pScene, pParent) diff --git a/src/Core/Scene/CCollisionNode.h b/src/Core/Scene/CCollisionNode.h index 0e1aa2d5..f1af51ab 100644 --- a/src/Core/Scene/CCollisionNode.h +++ b/src/Core/Scene/CCollisionNode.h @@ -2,7 +2,7 @@ #define CCOLLISIONNODE_H #include "CSceneNode.h" -#include +#include "Core/Resource/CCollisionMeshGroup.h" class CCollisionNode : public CSceneNode { diff --git a/src/Core/Scene/CLightNode.cpp b/src/Core/Scene/CLightNode.cpp index afbb73cf..b10aa656 100644 --- a/src/Core/Scene/CLightNode.cpp +++ b/src/Core/Scene/CLightNode.cpp @@ -1,8 +1,8 @@ #include "CLightNode.h" -#include -#include -#include -#include +#include "Core/Render/CDrawUtil.h" +#include "Core/Render/CGraphics.h" +#include "Core/Render/CRenderer.h" +#include CLightNode::CLightNode(CSceneManager *pScene, CSceneNode *pParent, CLight *Light) : CSceneNode(pScene, pParent) diff --git a/src/Core/Scene/CLightNode.h b/src/Core/Scene/CLightNode.h index 52ba1b47..1fbc8ff5 100644 --- a/src/Core/Scene/CLightNode.h +++ b/src/Core/Scene/CLightNode.h @@ -2,7 +2,7 @@ #define CLIGHTNODE_H #include "CSceneNode.h" -#include +#include "Core/Resource/CLight.h" class CLightNode : public CSceneNode { diff --git a/src/Core/Scene/CModelNode.cpp b/src/Core/Scene/CModelNode.cpp index f13017b5..5292d8c3 100644 --- a/src/Core/Scene/CModelNode.cpp +++ b/src/Core/Scene/CModelNode.cpp @@ -1,8 +1,8 @@ #include "CModelNode.h" -#include -#include -#include -#include +#include "Core/Render/CDrawUtil.h" +#include "Core/Render/CRenderer.h" +#include "Core/Render/CGraphics.h" +#include CModelNode::CModelNode(CSceneManager *pScene, CSceneNode *pParent, CModel *pModel) : CSceneNode(pScene, pParent) { diff --git a/src/Core/Scene/CModelNode.h b/src/Core/Scene/CModelNode.h index 07075461..2533aac9 100644 --- a/src/Core/Scene/CModelNode.h +++ b/src/Core/Scene/CModelNode.h @@ -2,7 +2,7 @@ #define CMODELNODE_H #include "CSceneNode.h" -#include +#include "Core/Resource/Model/CModel.h" class CModelNode : public CSceneNode { diff --git a/src/Core/Scene/CSceneManager.cpp b/src/Core/Scene/CSceneManager.cpp index e9ed8a82..1efe80e6 100644 --- a/src/Core/Scene/CSceneManager.cpp +++ b/src/Core/Scene/CSceneManager.cpp @@ -1,16 +1,16 @@ #include "CSceneManager.h" +#include "Core/Render/CGraphics.h" +#include "Core/Resource/CResCache.h" +#include "Core/Resource/Script/CScriptLayer.h" +#include "Core/CRayCollisionTester.h" + +#include +#include +#include #include #include -#include -#include -#include -#include -#include -#include -#include - /** * This class direly needs a rewrite * Future plan is to integrate a "scene layer" system, where nodes are grouped into layers diff --git a/src/Core/Scene/CSceneManager.h b/src/Core/Scene/CSceneManager.h index 15d173c8..730f8370 100644 --- a/src/Core/Scene/CSceneManager.h +++ b/src/Core/Scene/CSceneManager.h @@ -1,24 +1,23 @@ #ifndef CSCENEMANAGER_h #define CSCENEMANAGER_h -#include -#include -#include - -#include "CAreaAttributes.h" -#include "CRenderer.h" -#include "SViewInfo.h" -#include +#include "CSceneNode.h" +#include "CRootNode.h" +#include "CLightNode.h" +#include "CModelNode.h" +#include "CScriptNode.h" +#include "CStaticNode.h" +#include "CCollisionNode.h" +#include "Core/Render/CRenderer.h" +#include "Core/Render/SViewInfo.h" +#include "Core/Resource/CGameArea.h" +#include "Core/Resource/CWorld.h" +#include "Core/CAreaAttributes.h" +#include "Core/SRayIntersection.h" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include + +#include +#include class CSceneManager { diff --git a/src/Core/Scene/CSceneNode.cpp b/src/Core/Scene/CSceneNode.cpp index 0016db88..883fc052 100644 --- a/src/Core/Scene/CSceneNode.cpp +++ b/src/Core/Scene/CSceneNode.cpp @@ -1,13 +1,14 @@ #include "CSceneNode.h" -#include +#include "Core/Render/CRenderer.h" +#include "Core/Render/CGraphics.h" +#include "Core/Render/CDrawUtil.h" +#include "Core/Resource/CGameArea.h" +#include +#include + +#include #include #include -#include -#include -#include -#include -#include -#include u32 CSceneNode::smNumNodes = 0; CColor CSceneNode::skSelectionTint((u8) 39, 154, 167, 255); diff --git a/src/Core/Scene/CSceneNode.h b/src/Core/Scene/CSceneNode.h index 60f0f8ad..ffd6c4b3 100644 --- a/src/Core/Scene/CSceneNode.h +++ b/src/Core/Scene/CSceneNode.h @@ -1,19 +1,19 @@ #ifndef CSCENENODE_H #define CSCENENODE_H -#include #include "ENodeType.h" -#include -#include -#include -#include -#include -#include -#include +#include "Core/Render/ERenderOptions.h" +#include "Core/Render/IRenderable.h" +#include "Core/Resource/CLight.h" +#include "Core/Resource/CGameArea.h" +#include "Core/CRayCollisionTester.h" +#include +#include +#include +#include +#include +#include #include -#include -#include -#include class CRenderer; class CSceneManager; diff --git a/src/Core/Scene/CScriptNode.cpp b/src/Core/Scene/CScriptNode.cpp index ee23ccf5..739adebe 100644 --- a/src/Core/Scene/CScriptNode.cpp +++ b/src/Core/Scene/CScriptNode.cpp @@ -1,15 +1,14 @@ #include "CScriptNode.h" -#include "script/CScriptExtra.h" - +#include "CSceneManager.h" +#include "Core/Render/CDrawUtil.h" +#include "Core/Render/CGraphics.h" +#include "Core/Render/CRenderer.h" +#include "Core/Resource/CResCache.h" +#include "Core/Resource/Script/CMasterTemplate.h" +#include "Core/Resource/Script/CScriptLayer.h" +#include "Core/ScriptExtra/CScriptExtra.h" #include -#include -#include -#include -#include -#include -#include -#include -#include +#include CScriptNode::CScriptNode(CSceneManager *pScene, CSceneNode *pParent, CScriptObject *pObject) : CSceneNode(pScene, pParent) diff --git a/src/Core/Scene/CScriptNode.h b/src/Core/Scene/CScriptNode.h index 739e8654..19b34d9c 100644 --- a/src/Core/Scene/CScriptNode.h +++ b/src/Core/Scene/CScriptNode.h @@ -4,8 +4,8 @@ #include "CSceneNode.h" #include "CModelNode.h" #include "CCollisionNode.h" -#include -#include +#include "Core/Resource/Script/CScriptObject.h" +#include "Core/CLightParameters.h" class CScriptNode : public CSceneNode { diff --git a/src/Core/Scene/CStaticNode.cpp b/src/Core/Scene/CStaticNode.cpp index b37f200e..0c05a29e 100644 --- a/src/Core/Scene/CStaticNode.cpp +++ b/src/Core/Scene/CStaticNode.cpp @@ -1,9 +1,9 @@ #include "CStaticNode.h" -#include -#include +#include "Core/Render/CGraphics.h" +#include "Core/Render/CDrawUtil.h" +#include "Core/Render/CRenderer.h" #include -#include -#include +#include CStaticNode::CStaticNode(CSceneManager *pScene, CSceneNode *pParent, CStaticModel *pModel) : CSceneNode(pScene, pParent) diff --git a/src/Core/Scene/CStaticNode.h b/src/Core/Scene/CStaticNode.h index 40a86c43..3a02c9f0 100644 --- a/src/Core/Scene/CStaticNode.h +++ b/src/Core/Scene/CStaticNode.h @@ -2,7 +2,7 @@ #define CSTATICNODE_H #include "CSceneNode.h" -#include +#include "Core/Resource/Model/CStaticModel.h" class CStaticNode : public CSceneNode { diff --git a/src/Core/ScriptExtra/CDamageableTriggerExtra.cpp b/src/Core/ScriptExtra/CDamageableTriggerExtra.cpp index fe8e502d..2f6b9066 100644 --- a/src/Core/ScriptExtra/CDamageableTriggerExtra.cpp +++ b/src/Core/ScriptExtra/CDamageableTriggerExtra.cpp @@ -1,6 +1,6 @@ #include "CDamageableTriggerExtra.h" -#include -#include +#include "Core/Render/CDrawUtil.h" +#include "Core/Render/CRenderer.h" CDamageableTriggerExtra::CDamageableTriggerExtra(CScriptObject *pInstance, CSceneManager *pScene, CSceneNode *pParent) : CScriptExtra(pInstance, pScene, pParent) diff --git a/src/Core/ScriptExtra/CDoorExtra.cpp b/src/Core/ScriptExtra/CDoorExtra.cpp index acb7e5a7..6b78439a 100644 --- a/src/Core/ScriptExtra/CDoorExtra.cpp +++ b/src/Core/ScriptExtra/CDoorExtra.cpp @@ -1,5 +1,5 @@ #include "CDoorExtra.h" -#include +#include "Core/Render/CRenderer.h" CDoorExtra::CDoorExtra(CScriptObject *pInstance, CSceneManager *pScene, CSceneNode *pParent) : CScriptExtra(pInstance, pScene, pParent) diff --git a/src/Core/ScriptExtra/CPointOfInterestExtra.cpp b/src/Core/ScriptExtra/CPointOfInterestExtra.cpp index 4ee03b19..441e3ad9 100644 --- a/src/Core/ScriptExtra/CPointOfInterestExtra.cpp +++ b/src/Core/ScriptExtra/CPointOfInterestExtra.cpp @@ -1,6 +1,6 @@ #include "CPointOfInterestExtra.h" -const CColor CPointOfInterestExtra::skRegularColor((u32) 0xFF7000FF); +const CColor CPointOfInterestExtra::skRegularColor ((u32) 0xFF7000FF); const CColor CPointOfInterestExtra::skImportantColor((u32) 0xFF0000FF); CPointOfInterestExtra::CPointOfInterestExtra(CScriptObject *pInstance, CSceneManager *pScene, CSceneNode *pParent) diff --git a/src/Core/ScriptExtra/CPointOfInterestExtra.h b/src/Core/ScriptExtra/CPointOfInterestExtra.h index a4489bff..3d098d85 100644 --- a/src/Core/ScriptExtra/CPointOfInterestExtra.h +++ b/src/Core/ScriptExtra/CPointOfInterestExtra.h @@ -2,8 +2,8 @@ #define CPOINTOFINTERESTEXTRA_H #include "CScriptExtra.h" +#include "Core/Resource/CScan.h" #include -#include class CPointOfInterestExtra : public CScriptExtra { diff --git a/src/Core/ScriptExtra/CScriptExtra.h b/src/Core/ScriptExtra/CScriptExtra.h index da01c3d8..fc8ddd79 100644 --- a/src/Core/ScriptExtra/CScriptExtra.h +++ b/src/Core/ScriptExtra/CScriptExtra.h @@ -1,8 +1,8 @@ #ifndef CSCRIPTEXTRA_H #define CSCRIPTEXTRA_H -#include "../CSceneNode.h" -#include "../CScriptNode.h" +#include "Core/Scene/CSceneNode.h" +#include "Core/Scene/CScriptNode.h" /* CScriptExtra is a class that allows for additional coded behavior on any given * script object type. Subclass IScriptExtra, add the new class to CScriptExtra.cpp, diff --git a/src/Core/ScriptExtra/CSpacePirateExtra.h b/src/Core/ScriptExtra/CSpacePirateExtra.h index 6c11090f..040d6072 100644 --- a/src/Core/ScriptExtra/CSpacePirateExtra.h +++ b/src/Core/ScriptExtra/CSpacePirateExtra.h @@ -2,7 +2,7 @@ #define CSPACEPIRATEEXTRA_H #include "CScriptExtra.h" -#include +#include "Core/Resource/Script/CProperty.h" class CSpacePirateExtra : public CScriptExtra { diff --git a/src/Core/ScriptExtra/CWaypointExtra.cpp b/src/Core/ScriptExtra/CWaypointExtra.cpp index 0ceb8958..d7aef8f6 100644 --- a/src/Core/ScriptExtra/CWaypointExtra.cpp +++ b/src/Core/ScriptExtra/CWaypointExtra.cpp @@ -1,7 +1,7 @@ #include "CWaypointExtra.h" -#include -#include -#include +#include "Core/Render/CDrawUtil.h" +#include "Core/Render/CRenderer.h" +#include "Core/Scene/CSceneManager.h" CWaypointExtra::CWaypointExtra(CScriptObject *pInstance, CSceneManager *pScene, CSceneNode *pParent) : CScriptExtra(pInstance, pScene, pParent) diff --git a/src/Editor/CBasicViewport.cpp b/src/Editor/CBasicViewport.cpp index 36e2d01d..b7476713 100644 --- a/src/Editor/CBasicViewport.cpp +++ b/src/Editor/CBasicViewport.cpp @@ -1,7 +1,8 @@ #include "CBasicViewport.h" -#include -#include -#include +#include +#include +#include + #include CBasicViewport::CBasicViewport(QWidget *pParent) : diff --git a/src/Editor/CBasicViewport.h b/src/Editor/CBasicViewport.h index 63c3e06c..fd3d4f36 100644 --- a/src/Editor/CBasicViewport.h +++ b/src/Editor/CBasicViewport.h @@ -1,20 +1,20 @@ #ifndef CEDITORGLWIDGET_H #define CEDITORGLWIDGET_H -#include -#include - -#include -#include -#include +#include +#include +#include +#include +#include #include -#include -#include +#include #include #include #include +#include + class CBasicViewport : public QOpenGLWidget { Q_OBJECT diff --git a/src/Editor/CGizmo.cpp b/src/Editor/CGizmo.cpp index 02e1de5b..e30654fb 100644 --- a/src/Editor/CGizmo.cpp +++ b/src/Editor/CGizmo.cpp @@ -1,13 +1,13 @@ #include "CGizmo.h" -#include -#include -#include -#include +#include +#include +#include +#include #include +#include #include #include -#include CGizmo::CGizmo() { diff --git a/src/Editor/CGizmo.h b/src/Editor/CGizmo.h index 147f643d..a736047a 100644 --- a/src/Editor/CGizmo.h +++ b/src/Editor/CGizmo.h @@ -1,15 +1,15 @@ #ifndef CGIZMO_H #define CGIZMO_H -#include -#include -#include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include #define CGIZMO_TRANSLATE_X 0 #define CGIZMO_TRANSLATE_Y 1 diff --git a/src/Editor/CNodeSelection.h b/src/Editor/CNodeSelection.h index 19b73c55..6fe1cfa1 100644 --- a/src/Editor/CNodeSelection.h +++ b/src/Editor/CNodeSelection.h @@ -1,8 +1,8 @@ #ifndef CNODESELECTION_H #define CNODESELECTION_H +#include #include -#include class CSceneSelection { diff --git a/src/Editor/CSceneViewport.cpp b/src/Editor/CSceneViewport.cpp index 20bae9c8..84f70c07 100644 --- a/src/Editor/CSceneViewport.cpp +++ b/src/Editor/CSceneViewport.cpp @@ -1,6 +1,6 @@ #include "CSceneViewport.h" -#include "undo/UndoCommands.h" -#include +#include "Editor/Undo/UndoCommands.h" +#include CSceneViewport::CSceneViewport(QWidget *pParent) : CBasicViewport(pParent), diff --git a/src/Editor/CStartWindow.cpp b/src/Editor/CStartWindow.cpp index 6a989394..c4a94815 100644 --- a/src/Editor/CStartWindow.cpp +++ b/src/Editor/CStartWindow.cpp @@ -1,14 +1,14 @@ #include "CStartWindow.h" #include "ui_CStartWindow.h" +#include "UICommon.h" + +#include "Editor/ModelEditor/CModelEditorWindow.h" +#include "Editor/WorldEditor/CWorldEditor.h" +#include #include #include -#include "CModelEditorWindow.h" -#include "CWorldEditor.h" -#include "UICommon.h" -#include - CStartWindow::CStartWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::CStartWindow) diff --git a/src/Editor/CStartWindow.h b/src/Editor/CStartWindow.h index 9e37c352..283fac4f 100644 --- a/src/Editor/CStartWindow.h +++ b/src/Editor/CStartWindow.h @@ -1,11 +1,12 @@ #ifndef PWESTARTWINDOW_H #define PWESTARTWINDOW_H +#include "WorldEditor/CWorldEditor.h" +#include "ModelEditor/CModelEditorWindow.h" +#include +#include + #include -#include -#include -#include "CModelEditorWindow.h" -#include "CWorldEditor.h" namespace Ui { class CStartWindow; diff --git a/src/Editor/Editor.pro b/src/Editor/Editor.pro index 1c8bbdcc..75871fe2 100644 --- a/src/Editor/Editor.pro +++ b/src/Editor/Editor.pro @@ -21,8 +21,8 @@ CONFIG(debug, debug|release) { TARGET = PrimeWorldEditor-debug # Debug Libs - LIBS += -L$$PWD/../../build/Common/ -lCommon \ - -L$$PWD/../../build/Core/ -lCore \ + LIBS += -L$$PWD/../../build/Common/ -lCommond \ + -L$$PWD/../../build/Core/ -lCored \ -L$$PWD/../../externals/assimp/lib/ -lassimp-vc120-mtd \ -L$$PWD/../../externals/FileIO/lib/ -lFileIOd \ -L$$PWD/../../externals/tinyxml2/lib/ -ltinyxml2d @@ -98,7 +98,6 @@ HEADERS += \ CBasicViewport.h \ CDarkStyle.h \ CGizmo.h \ - CMaterialEditor.h \ CNodeSelection.h \ CSceneViewport.h \ CStartWindow.h \ @@ -142,7 +141,6 @@ SOURCES += \ CBasicViewport.cpp \ CDarkStyle.cpp \ CGizmo.cpp \ - CMaterialEditor.cpp \ CNodeSelection.cpp \ CSceneViewport.cpp \ CStartWindow.cpp \ @@ -152,7 +150,6 @@ SOURCES += \ UICommon.cpp FORMS += \ - CMaterialEditor.ui \ CStartWindow.ui \ TestDialog.ui \ ModelEditor/CModelEditorWindow.ui \ diff --git a/src/Editor/INodeEditor.cpp b/src/Editor/INodeEditor.cpp index 13ee1415..7433d70a 100644 --- a/src/Editor/INodeEditor.cpp +++ b/src/Editor/INodeEditor.cpp @@ -1,5 +1,5 @@ #include "INodeEditor.h" -#include "undo/UndoCommands.h" +#include "Editor/Undo/UndoCommands.h" INodeEditor::INodeEditor(QWidget *pParent) : QMainWindow(pParent), diff --git a/src/Editor/INodeEditor.h b/src/Editor/INodeEditor.h index 8b086fa5..26c21dc1 100644 --- a/src/Editor/INodeEditor.h +++ b/src/Editor/INodeEditor.h @@ -1,6 +1,10 @@ #ifndef INODEEDITOR_H #define INODEEDITOR_H +#include "CGizmo.h" +#include +#include + #include #include #include @@ -8,10 +12,6 @@ #include #include -#include "CGizmo.h" -#include -#include - class INodeEditor : public QMainWindow { Q_OBJECT diff --git a/src/Editor/Icons.qrc b/src/Editor/Icons.qrc index ec4384db..eeaf41cd 100644 --- a/src/Editor/Icons.qrc +++ b/src/Editor/Icons.qrc @@ -1,32 +1,32 @@ - - EditorAssets/Down.png - EditorAssets/Free Camera.png - EditorAssets/Material Highlight.png - EditorAssets/Minus v2.png - EditorAssets/Minus.png - EditorAssets/Orbit Camera v2.png - EditorAssets/Orbit Camera.png - EditorAssets/Plus.png - EditorAssets/Rotate.png - EditorAssets/Samus Silhouette Gradient.png - EditorAssets/Scale.png - EditorAssets/Sphere Preview.png - EditorAssets/Square Preview.png - EditorAssets/Translate.png - EditorAssets/Up.png - EditorAssets/Hide.png - EditorAssets/Highlight.png - EditorAssets/Model Preview.png - EditorAssets/Show.png - EditorAssets/GridLight.png - EditorAssets/Create.png - EditorAssets/Display.png - EditorAssets/Instances.png - EditorAssets/Link.png - EditorAssets/Modify.png - EditorAssets/Unlink.png - EditorAssets/World.png - EditorAssets/SelectMode.png + + icons/Down.png + icons/Free Camera.png + icons/Material Highlight.png + icons/Minus v2.png + icons/Minus.png + icons/Orbit Camera v2.png + icons/Orbit Camera.png + icons/Plus.png + icons/Rotate.png + icons/Samus Silhouette Gradient.png + icons/Scale.png + icons/Sphere Preview.png + icons/Square Preview.png + icons/Translate.png + icons/Up.png + icons/Hide.png + icons/Highlight.png + icons/Model Preview.png + icons/Show.png + icons/GridLight.png + icons/Create.png + icons/Display.png + icons/Instances.png + icons/Link.png + icons/Modify.png + icons/Unlink.png + icons/World.png + icons/SelectMode.png diff --git a/src/Editor/ModelEditor/CModelEditorViewport.cpp b/src/Editor/ModelEditor/CModelEditorViewport.cpp index abacae8c..7e20e463 100644 --- a/src/Editor/ModelEditor/CModelEditorViewport.cpp +++ b/src/Editor/ModelEditor/CModelEditorViewport.cpp @@ -1,5 +1,5 @@ #include "CModelEditorViewport.h" -#include +#include CModelEditorViewport::CModelEditorViewport(QWidget *pParent) : CBasicViewport(pParent), diff --git a/src/Editor/ModelEditor/CModelEditorViewport.h b/src/Editor/ModelEditor/CModelEditorViewport.h index 6d27c2dc..bebdaad7 100644 --- a/src/Editor/ModelEditor/CModelEditorViewport.h +++ b/src/Editor/ModelEditor/CModelEditorViewport.h @@ -1,8 +1,8 @@ #ifndef CMODELEDITORVIEWPORT_H #define CMODELEDITORVIEWPORT_H -#include "CBasicViewport.h" -#include +#include "Editor/CBasicViewport.h" +#include class CModelEditorViewport : public CBasicViewport { diff --git a/src/Editor/ModelEditor/CModelEditorWindow.cpp b/src/Editor/ModelEditor/CModelEditorWindow.cpp index c162ff57..e8cd6846 100644 --- a/src/Editor/ModelEditor/CModelEditorWindow.cpp +++ b/src/Editor/ModelEditor/CModelEditorWindow.cpp @@ -1,23 +1,23 @@ #include "CModelEditorWindow.h" #include "ui_CModelEditorWindow.h" +#include "Editor/UICommon.h" +#include "Editor/Widgets/WColorPicker.h" +#include "Editor/Widgets/WResourceSelector.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include #include #include -#include "UICommon.h" -#include "WResourceSelector.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "WColorPicker.h" - -#include #include #include #include diff --git a/src/Editor/ModelEditor/CModelEditorWindow.h b/src/Editor/ModelEditor/CModelEditorWindow.h index 1dac4e36..f1126847 100644 --- a/src/Editor/ModelEditor/CModelEditorWindow.h +++ b/src/Editor/ModelEditor/CModelEditorWindow.h @@ -1,16 +1,16 @@ #ifndef CMODELEDITORWINDOW_H #define CMODELEDITORWINDOW_H -#include - -#include -#include -#include -#include -#include -#include -#include #include "CModelEditorViewport.h" +#include +#include +#include +#include +#include +#include + +#include +#include namespace Ui { class CModelEditorWindow; diff --git a/src/Editor/ModelEditor/CModelEditorWindow.ui b/src/Editor/ModelEditor/CModelEditorWindow.ui index 3bd2aabd..0c7509c0 100644 --- a/src/Editor/ModelEditor/CModelEditorWindow.ui +++ b/src/Editor/ModelEditor/CModelEditorWindow.ui @@ -2515,12 +2515,12 @@ WDraggableSpinBox QDoubleSpinBox -
WDraggableSpinBox.h
+
Editor/Widgets/WDraggableSpinBox.h
 WColorPicker QWidget -
WColorPicker.h
+
Editor/Widgets/WColorPicker.h
1 colorChanged(QColor) @@ -2529,13 +2529,13 @@ WResourceSelector QWidget -
WResourceSelector.h
+
Editor/Widgets/WResourceSelector.h
1 CModelEditorViewport QWidget -
CModelEditorViewport.h
+
Editor/ModelEditor/CModelEditorViewport.h
1 diff --git a/src/Editor/TestDialog.cpp b/src/Editor/TestDialog.cpp index 4ccb89c1..e74bf760 100644 --- a/src/Editor/TestDialog.cpp +++ b/src/Editor/TestDialog.cpp @@ -1,10 +1,11 @@ #include "TestDialog.h" #include "ui_TestDialog.h" -#include +#include "Editor/Widgets/WResourceSelector.h" +#include "Editor/Widgets/WTextureGLWidget.h" +#include +#include + #include -#include "WResourceSelector.h" -#include "WTextureGLWidget.h" -#include TestDialog::TestDialog(QWidget *parent) : QDialog(parent), diff --git a/src/Editor/TestDialog.ui b/src/Editor/TestDialog.ui index bcc3f11d..f51de9b9 100644 --- a/src/Editor/TestDialog.ui +++ b/src/Editor/TestDialog.ui @@ -110,13 +110,13 @@ WRollout QWidget -
WRollout.h
+
Editor/Widgets/WRollout.h
1 WTextureGLWidget QWidget -
WTextureGLWidget.h
+
Editor/Widgets/WTextureGLWidget.h
1 diff --git a/src/Editor/UICommon.h b/src/Editor/UICommon.h index 32428686..6638e741 100644 --- a/src/Editor/UICommon.h +++ b/src/Editor/UICommon.h @@ -1,9 +1,9 @@ #ifndef UICOMMON #define UICOMMON +#include #include #include -#include #define TO_QSTRING(str) UICommon::ToQString(str) #define TO_TSTRING(str) UICommon::ToTString(str) diff --git a/src/Editor/Undo/CClearSelectionCommand.cpp b/src/Editor/Undo/CClearSelectionCommand.cpp index a4e208c7..35d7cd94 100644 --- a/src/Editor/Undo/CClearSelectionCommand.cpp +++ b/src/Editor/Undo/CClearSelectionCommand.cpp @@ -1,5 +1,5 @@ #include "CClearSelectionCommand.h" -#include "../CWorldEditor.h" +#include "Editor/INodeEditor.h" CClearSelectionCommand::CClearSelectionCommand(INodeEditor *pEditor, QList& selection) : QUndoCommand("Clear Selection"), diff --git a/src/Editor/Undo/CClearSelectionCommand.h b/src/Editor/Undo/CClearSelectionCommand.h index f27ccab4..d9520bb3 100644 --- a/src/Editor/Undo/CClearSelectionCommand.h +++ b/src/Editor/Undo/CClearSelectionCommand.h @@ -1,9 +1,10 @@ #ifndef CCLEARSELECTIONCOMMAND_H #define CCLEARSELECTIONCOMMAND_H +#include "Editor/INodeEditor.h" +#include + #include -#include "../INodeEditor.h" -#include class CClearSelectionCommand : public QUndoCommand { diff --git a/src/Editor/Undo/CDeselectNodeCommand.cpp b/src/Editor/Undo/CDeselectNodeCommand.cpp index 0aad6d86..a6c2c226 100644 --- a/src/Editor/Undo/CDeselectNodeCommand.cpp +++ b/src/Editor/Undo/CDeselectNodeCommand.cpp @@ -1,5 +1,5 @@ #include "CDeselectNodeCommand.h" -#include "../CWorldEditor.h" +#include "Editor/INodeEditor.h" CDeselectNodeCommand::CDeselectNodeCommand(INodeEditor *pEditor, CSceneNode *pNode, QList& selection) : QUndoCommand("Deselect"), diff --git a/src/Editor/Undo/CDeselectNodeCommand.h b/src/Editor/Undo/CDeselectNodeCommand.h index 463d25b8..e0b286c3 100644 --- a/src/Editor/Undo/CDeselectNodeCommand.h +++ b/src/Editor/Undo/CDeselectNodeCommand.h @@ -1,9 +1,10 @@ #ifndef CDESELECTNODECOMMAND_H #define CDESELECTNODECOMMAND_H +#include "Editor/INodeEditor.h" +#include + #include -#include "../INodeEditor.h" -#include class CDeselectNodeCommand : public QUndoCommand { diff --git a/src/Editor/Undo/CRotateNodeCommand.cpp b/src/Editor/Undo/CRotateNodeCommand.cpp index 839f0bab..2cb14440 100644 --- a/src/Editor/Undo/CRotateNodeCommand.cpp +++ b/src/Editor/Undo/CRotateNodeCommand.cpp @@ -1,6 +1,6 @@ #include "CRotateNodeCommand.h" #include "EUndoCommand.h" -#include "../CWorldEditor.h" +#include "Editor/INodeEditor.h" CRotateNodeCommand::CRotateNodeCommand() : QUndoCommand("Rotate"), diff --git a/src/Editor/Undo/CRotateNodeCommand.h b/src/Editor/Undo/CRotateNodeCommand.h index 7815e58b..688d5c18 100644 --- a/src/Editor/Undo/CRotateNodeCommand.h +++ b/src/Editor/Undo/CRotateNodeCommand.h @@ -1,10 +1,11 @@ #ifndef CROTATENODECOMMAND_H #define CROTATENODECOMMAND_H +#include "Editor/INodeEditor.h" +#include + #include #include -#include -#include "../INodeEditor.h" class CRotateNodeCommand : public QUndoCommand { diff --git a/src/Editor/Undo/CScaleNodeCommand.cpp b/src/Editor/Undo/CScaleNodeCommand.cpp index 56589a46..712de856 100644 --- a/src/Editor/Undo/CScaleNodeCommand.cpp +++ b/src/Editor/Undo/CScaleNodeCommand.cpp @@ -1,6 +1,6 @@ #include "CScaleNodeCommand.h" #include "EUndoCommand.h" -#include "../CWorldEditor.h" +#include "Editor/INodeEditor.h" CScaleNodeCommand::CScaleNodeCommand() : QUndoCommand("Scale"), diff --git a/src/Editor/Undo/CScaleNodeCommand.h b/src/Editor/Undo/CScaleNodeCommand.h index 1dbcb528..141db820 100644 --- a/src/Editor/Undo/CScaleNodeCommand.h +++ b/src/Editor/Undo/CScaleNodeCommand.h @@ -1,10 +1,11 @@ #ifndef CSCALENODECOMMAND_H #define CSCALENODECOMMAND_H +#include "Editor/INodeEditor.h" +#include + #include #include -#include -#include "../INodeEditor.h" class CScaleNodeCommand : public QUndoCommand { diff --git a/src/Editor/Undo/CSelectNodeCommand.cpp b/src/Editor/Undo/CSelectNodeCommand.cpp index d20856f7..33b1551c 100644 --- a/src/Editor/Undo/CSelectNodeCommand.cpp +++ b/src/Editor/Undo/CSelectNodeCommand.cpp @@ -1,5 +1,5 @@ #include "CSelectNodeCommand.h" -#include "../CWorldEditor.h" +#include "Editor/INodeEditor.h" CSelectNodeCommand::CSelectNodeCommand(INodeEditor *pEditor, CSceneNode *pNode, QList& selection) : QUndoCommand("Select"), diff --git a/src/Editor/Undo/CSelectNodeCommand.h b/src/Editor/Undo/CSelectNodeCommand.h index 7b4c7271..f5cb87c3 100644 --- a/src/Editor/Undo/CSelectNodeCommand.h +++ b/src/Editor/Undo/CSelectNodeCommand.h @@ -1,9 +1,10 @@ #ifndef CSELECTNODECOMMAND_H #define CSELECTNODECOMMAND_H +#include "Editor/INodeEditor.h" +#include + #include -#include "../INodeEditor.h" -#include class CSelectNodeCommand : public QUndoCommand { diff --git a/src/Editor/Undo/CTranslateNodeCommand.cpp b/src/Editor/Undo/CTranslateNodeCommand.cpp index ba0e44fc..fb6d72ca 100644 --- a/src/Editor/Undo/CTranslateNodeCommand.cpp +++ b/src/Editor/Undo/CTranslateNodeCommand.cpp @@ -1,6 +1,6 @@ #include "CTranslateNodeCommand.h" #include "EUndoCommand.h" -#include "../CWorldEditor.h" +#include "Editor/INodeEditor.h" CTranslateNodeCommand::CTranslateNodeCommand() : QUndoCommand("Translate"), diff --git a/src/Editor/Undo/CTranslateNodeCommand.h b/src/Editor/Undo/CTranslateNodeCommand.h index bd6f3bb1..6fb86af8 100644 --- a/src/Editor/Undo/CTranslateNodeCommand.h +++ b/src/Editor/Undo/CTranslateNodeCommand.h @@ -1,10 +1,11 @@ #ifndef CTRANSLATENODECOMMAND_H #define CTRANSLATENODECOMMAND_H +#include +#include "Editor/INodeEditor.h" + #include #include -#include -#include "../INodeEditor.h" class CTranslateNodeCommand : public QUndoCommand { diff --git a/src/Editor/Widgets/IPreviewPanel.h b/src/Editor/Widgets/IPreviewPanel.h index 76ae4b69..09a6f84b 100644 --- a/src/Editor/Widgets/IPreviewPanel.h +++ b/src/Editor/Widgets/IPreviewPanel.h @@ -1,9 +1,10 @@ #ifndef IPREVIEWPANEL_H #define IPREVIEWPANEL_H +#include +#include + #include -#include -#include class IPreviewPanel : public QFrame { diff --git a/src/Editor/Widgets/WAnimParamsEditor.cpp b/src/Editor/Widgets/WAnimParamsEditor.cpp index 803f7550..ada08477 100644 --- a/src/Editor/Widgets/WAnimParamsEditor.cpp +++ b/src/Editor/Widgets/WAnimParamsEditor.cpp @@ -1,8 +1,7 @@ #include "WAnimParamsEditor.h" - -#include "UICommon.h" -#include -#include +#include "Editor/UICommon.h" +#include +#include WAnimParamsEditor::WAnimParamsEditor(QWidget *pParent) : QWidget(pParent), diff --git a/src/Editor/Widgets/WAnimParamsEditor.h b/src/Editor/Widgets/WAnimParamsEditor.h index 5fb01b74..d4e08205 100644 --- a/src/Editor/Widgets/WAnimParamsEditor.h +++ b/src/Editor/Widgets/WAnimParamsEditor.h @@ -1,6 +1,10 @@ #ifndef WANIMPARAMSEDITOR_H #define WANIMPARAMSEDITOR_H +#include "WIntegralSpinBox.h" +#include "WResourceSelector.h" +#include + #include #include #include @@ -9,10 +13,6 @@ #include #include -#include "WIntegralSpinBox.h" -#include "WResourceSelector.h" -#include - class WAnimParamsEditor : public QWidget { Q_OBJECT diff --git a/src/Editor/Widgets/WColorPicker.cpp b/src/Editor/Widgets/WColorPicker.cpp index fcf42219..a313af5d 100644 --- a/src/Editor/Widgets/WColorPicker.cpp +++ b/src/Editor/Widgets/WColorPicker.cpp @@ -1,7 +1,7 @@ #include "WColorPicker.h" +#include #include #include -#include #include #include diff --git a/src/Editor/Widgets/WPropertyEditor.cpp b/src/Editor/Widgets/WPropertyEditor.cpp index 852d0c0d..5614161d 100644 --- a/src/Editor/Widgets/WPropertyEditor.cpp +++ b/src/Editor/Widgets/WPropertyEditor.cpp @@ -1,13 +1,13 @@ #include "WPropertyEditor.h" -#include "UICommon.h" #include "WDraggableSpinBox.h" #include "WIntegralSpinBox.h" #include "WResourceSelector.h" #include "WColorPicker.h" #include "WVectorEditor.h" #include "WAnimParamsEditor.h" -#include -#include +#include "Editor/UICommon.h" +#include +#include #include #include diff --git a/src/Editor/Widgets/WPropertyEditor.h b/src/Editor/Widgets/WPropertyEditor.h index 233cafd7..765e0596 100644 --- a/src/Editor/Widgets/WPropertyEditor.h +++ b/src/Editor/Widgets/WPropertyEditor.h @@ -1,10 +1,10 @@ #ifndef WPROPERTYEDITOR_H #define WPROPERTYEDITOR_H +#include #include #include #include -#include class WPropertyEditor : public QWidget { diff --git a/src/Editor/Widgets/WResourceSelector.cpp b/src/Editor/Widgets/WResourceSelector.cpp index 3645d9ae..9936fdb1 100644 --- a/src/Editor/Widgets/WResourceSelector.cpp +++ b/src/Editor/Widgets/WResourceSelector.cpp @@ -1,8 +1,7 @@ #include "WResourceSelector.h" - -#include "UICommon.h" #include "WTexturePreviewPanel.h" -#include +#include "Editor/UICommon.h" +#include #include #include diff --git a/src/Editor/Widgets/WResourceSelector.h b/src/Editor/Widgets/WResourceSelector.h index 89783392..4f1f9533 100644 --- a/src/Editor/Widgets/WResourceSelector.h +++ b/src/Editor/Widgets/WResourceSelector.h @@ -3,8 +3,8 @@ #include "IPreviewPanel.h" #include -#include -#include +#include +#include #include #include diff --git a/src/Editor/Widgets/WScanPreviewPanel.cpp b/src/Editor/Widgets/WScanPreviewPanel.cpp index cc55b81b..d2603da1 100644 --- a/src/Editor/Widgets/WScanPreviewPanel.cpp +++ b/src/Editor/Widgets/WScanPreviewPanel.cpp @@ -1,7 +1,7 @@ #include "WScanPreviewPanel.h" #include "ui_WScanPreviewPanel.h" #include "WStringPreviewPanel.h" -#include +#include WScanPreviewPanel::WScanPreviewPanel(QWidget *parent) : IPreviewPanel(parent), diff --git a/src/Editor/Widgets/WScanPreviewPanel.ui b/src/Editor/Widgets/WScanPreviewPanel.ui index 410d7f7c..df30c17e 100644 --- a/src/Editor/Widgets/WScanPreviewPanel.ui +++ b/src/Editor/Widgets/WScanPreviewPanel.ui @@ -150,7 +150,7 @@ WStringPreviewPanel QWidget -
WStringPreviewPanel.h
+
Editor/Widgets/WStringPreviewPanel.h
1 diff --git a/src/Editor/Widgets/WStringPreviewPanel.cpp b/src/Editor/Widgets/WStringPreviewPanel.cpp index 6ea6e409..0f4dab0a 100644 --- a/src/Editor/Widgets/WStringPreviewPanel.cpp +++ b/src/Editor/Widgets/WStringPreviewPanel.cpp @@ -1,8 +1,9 @@ #include "WStringPreviewPanel.h" -#include "UICommon.h" +#include "Editor/UICommon.h" +#include + #include #include -#include WStringPreviewPanel::WStringPreviewPanel(QWidget *pParent) : IPreviewPanel(pParent) { diff --git a/src/Editor/Widgets/WTextureGLWidget.cpp b/src/Editor/Widgets/WTextureGLWidget.cpp index d2d9be9a..13e11d9e 100644 --- a/src/Editor/Widgets/WTextureGLWidget.cpp +++ b/src/Editor/Widgets/WTextureGLWidget.cpp @@ -1,9 +1,9 @@ #include "WTextureGLWidget.h" -#include -#include -#include +#include +#include +#include +#include #include -#include #include #include diff --git a/src/Editor/Widgets/WTextureGLWidget.h b/src/Editor/Widgets/WTextureGLWidget.h index 11de7adc..b11c9cf9 100644 --- a/src/Editor/Widgets/WTextureGLWidget.h +++ b/src/Editor/Widgets/WTextureGLWidget.h @@ -1,14 +1,14 @@ #ifndef WTEXTUREGLWIDGET_H #define WTEXTUREGLWIDGET_H -#include -#include +#include +#include +#include +#include -#include -#include -#include -#include +#include #include +#include class WTextureGLWidget : public QOpenGLWidget { diff --git a/src/Editor/Widgets/WTexturePreviewPanel.cpp b/src/Editor/Widgets/WTexturePreviewPanel.cpp index c780d8ad..7447a245 100644 --- a/src/Editor/Widgets/WTexturePreviewPanel.cpp +++ b/src/Editor/Widgets/WTexturePreviewPanel.cpp @@ -1,8 +1,7 @@ #include "WTexturePreviewPanel.h" #include "ui_WTexturePreviewPanel.h" - -#include "UICommon.h" #include "WTextureGLWidget.h" +#include "Editor/UICommon.h" WTexturePreviewPanel::WTexturePreviewPanel(QWidget *parent, CTexture *pTexture) : IPreviewPanel(parent), diff --git a/src/Editor/Widgets/WTexturePreviewPanel.h b/src/Editor/Widgets/WTexturePreviewPanel.h index bcab764d..519d5db2 100644 --- a/src/Editor/Widgets/WTexturePreviewPanel.h +++ b/src/Editor/Widgets/WTexturePreviewPanel.h @@ -2,7 +2,7 @@ #define WTEXTUREPREVIEWPANEL_H #include "IPreviewPanel.h" -#include +#include namespace Ui { class WTexturePreviewPanel; diff --git a/src/Editor/Widgets/WTexturePreviewPanel.ui b/src/Editor/Widgets/WTexturePreviewPanel.ui index 590eb171..8e7e25d6 100644 --- a/src/Editor/Widgets/WTexturePreviewPanel.ui +++ b/src/Editor/Widgets/WTexturePreviewPanel.ui @@ -68,7 +68,7 @@ WTextureGLWidget QWidget -
WTextureGLWidget.h
+
Editor/Widgets/WTextureGLWidget.h
1 diff --git a/src/Editor/Widgets/WVectorEditor.h b/src/Editor/Widgets/WVectorEditor.h index 0df81232..59804d44 100644 --- a/src/Editor/Widgets/WVectorEditor.h +++ b/src/Editor/Widgets/WVectorEditor.h @@ -1,13 +1,14 @@ #ifndef WVECTOREDITOR_H #define WVECTOREDITOR_H -#include -#include #include "WDraggableSpinBox.h" -#include -#include -#include +#include + #include +#include +#include +#include +#include class WVectorEditor : public QWidget { diff --git a/src/Editor/WorldEditor/CLayerEditor.cpp b/src/Editor/WorldEditor/CLayerEditor.cpp index 221bf248..1a2a4c45 100644 --- a/src/Editor/WorldEditor/CLayerEditor.cpp +++ b/src/Editor/WorldEditor/CLayerEditor.cpp @@ -1,7 +1,8 @@ #include "CLayerEditor.h" #include "ui_CLayerEditor.h" -#include "../UICommon.h" -#include +#include "Editor/UICommon.h" + +#include CLayerEditor::CLayerEditor(QWidget *parent) : QDialog(parent), diff --git a/src/Editor/WorldEditor/CLayerEditor.h b/src/Editor/WorldEditor/CLayerEditor.h index e84e3f7c..7cce3b0d 100644 --- a/src/Editor/WorldEditor/CLayerEditor.h +++ b/src/Editor/WorldEditor/CLayerEditor.h @@ -1,8 +1,8 @@ #ifndef CLAYEREDITOR_H #define CLAYEREDITOR_H -#include #include "CLayerModel.h" +#include namespace Ui { class CLayerEditor; diff --git a/src/Editor/WorldEditor/CLayerModel.cpp b/src/Editor/WorldEditor/CLayerModel.cpp index a5f43d54..b1c196c5 100644 --- a/src/Editor/WorldEditor/CLayerModel.cpp +++ b/src/Editor/WorldEditor/CLayerModel.cpp @@ -1,6 +1,6 @@ #include "CLayerModel.h" -#include "../UICommon.h" -#include +#include "Editor/UICommon.h" +#include CLayerModel::CLayerModel(QObject *pParent) : QAbstractListModel(pParent) { diff --git a/src/Editor/WorldEditor/CLayerModel.h b/src/Editor/WorldEditor/CLayerModel.h index f1937186..c8b4e778 100644 --- a/src/Editor/WorldEditor/CLayerModel.h +++ b/src/Editor/WorldEditor/CLayerModel.h @@ -1,8 +1,8 @@ #ifndef CLAYERMODEL_H #define CLAYERMODEL_H +#include #include -#include class CLayerModel : public QAbstractListModel { diff --git a/src/Editor/WorldEditor/CLayersInstanceModel.h b/src/Editor/WorldEditor/CLayersInstanceModel.h index b8353219..55b50947 100644 --- a/src/Editor/WorldEditor/CLayersInstanceModel.h +++ b/src/Editor/WorldEditor/CLayersInstanceModel.h @@ -1,9 +1,9 @@ #ifndef CLAYERSINSTANCEMODEL_H #define CLAYERSINSTANCEMODEL_H +#include "CWorldEditor.h" +#include #include -#include -#include "../CWorldEditor.h" // Only supports script layers atm - maybe light layers later...? class CLayersInstanceModel : public QAbstractItemModel diff --git a/src/Editor/WorldEditor/CLinkModel.cpp b/src/Editor/WorldEditor/CLinkModel.cpp index 9f43a9e8..89a440fd 100644 --- a/src/Editor/WorldEditor/CLinkModel.cpp +++ b/src/Editor/WorldEditor/CLinkModel.cpp @@ -1,7 +1,7 @@ #include "CLinkModel.h" -#include "../UICommon.h" -#include -#include +#include "Editor/UICommon.h" +#include +#include CLinkModel::CLinkModel(QObject *pParent) : QAbstractTableModel(pParent) { diff --git a/src/Editor/WorldEditor/CLinkModel.h b/src/Editor/WorldEditor/CLinkModel.h index 3bbb1560..16bf26a2 100644 --- a/src/Editor/WorldEditor/CLinkModel.h +++ b/src/Editor/WorldEditor/CLinkModel.h @@ -1,8 +1,8 @@ #ifndef CCONNECTIONMODEL_H #define CCONNECTIONMODEL_H +#include #include -#include class CLinkModel : public QAbstractTableModel { diff --git a/src/Editor/WorldEditor/CTypesInstanceModel.cpp b/src/Editor/WorldEditor/CTypesInstanceModel.cpp index bb0bde86..dd041c3d 100644 --- a/src/Editor/WorldEditor/CTypesInstanceModel.cpp +++ b/src/Editor/WorldEditor/CTypesInstanceModel.cpp @@ -1,7 +1,7 @@ #include "CTypesInstanceModel.h" -#include "../UICommon.h" -#include -#include +#include "Editor/UICommon.h" +#include +#include #include #include diff --git a/src/Editor/WorldEditor/CTypesInstanceModel.h b/src/Editor/WorldEditor/CTypesInstanceModel.h index fd150283..00097347 100644 --- a/src/Editor/WorldEditor/CTypesInstanceModel.h +++ b/src/Editor/WorldEditor/CTypesInstanceModel.h @@ -1,12 +1,13 @@ #ifndef CTYPESINSTANCEMODEL_H #define CTYPESINSTANCEMODEL_H +#include "CWorldEditor.h" +#include +#include +#include + #include #include -#include -#include -#include -#include "../CWorldEditor.h" class CTypesInstanceModel : public QAbstractItemModel { diff --git a/src/Editor/WorldEditor/CWorldEditor.cpp b/src/Editor/WorldEditor/CWorldEditor.cpp index 4fce6746..28ccf823 100644 --- a/src/Editor/WorldEditor/CWorldEditor.cpp +++ b/src/Editor/WorldEditor/CWorldEditor.cpp @@ -1,21 +1,22 @@ #include "CWorldEditor.h" #include "ui_CWorldEditor.h" -#include "CBasicViewport.h" -#include -#include +#include "CLayerEditor.h" +#include "WModifyTab.h" +#include "WInstancesTab.h" + +#include "Editor/CBasicViewport.h" +#include "Editor/Widgets/WDraggableSpinBox.h" +#include "Editor/Widgets/WVectorEditor.h" +#include "Editor/Undo/UndoCommands.h" +#include "Editor/UICommon.h" + +#include +#include + #include #include #include #include -#include -#include "WDraggableSpinBox.h" -#include "WVectorEditor.h" -#include "undo/UndoCommands.h" -#include "UICommon.h" - -#include "WorldEditor/CLayerEditor.h" -#include "WorldEditor/WModifyTab.h" -#include "WorldEditor/WInstancesTab.h" CWorldEditor::CWorldEditor(QWidget *parent) : INodeEditor(parent), diff --git a/src/Editor/WorldEditor/CWorldEditor.h b/src/Editor/WorldEditor/CWorldEditor.h index 940070b1..80d500ad 100644 --- a/src/Editor/WorldEditor/CWorldEditor.h +++ b/src/Editor/WorldEditor/CWorldEditor.h @@ -1,7 +1,19 @@ #ifndef CWORLDEDITOR_H #define CWORLDEDITOR_H -#include "INodeEditor.h" +#include "Editor/INodeEditor.h" +#include "Editor/CGizmo.h" + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -9,18 +21,6 @@ #include #include -#include "CGizmo.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - namespace Ui { class CWorldEditor; } diff --git a/src/Editor/WorldEditor/CWorldEditor.ui b/src/Editor/WorldEditor/CWorldEditor.ui index 53312cc9..8c651e28 100644 --- a/src/Editor/WorldEditor/CWorldEditor.ui +++ b/src/Editor/WorldEditor/CWorldEditor.ui @@ -733,30 +733,30 @@ WDraggableSpinBox QDoubleSpinBox -
WDraggableSpinBox.h
+
Editor/Widgets/WDraggableSpinBox.h
 WModifyTab QWidget -
WorldEditor/WModifyTab.h
+
Editor/WorldEditor/WModifyTab.h
1 WInstancesTab QWidget -
WorldEditor/WInstancesTab.h
+
Editor/WorldEditor/WInstancesTab.h
1 WVectorEditor QWidget -
WVectorEditor.h
+
Editor/Widgets/WVectorEditor.h
1 CSceneViewport QWidget -
CSceneViewport.h
+
Editor/CSceneViewport.h
1 diff --git a/src/Editor/WorldEditor/WInstancesTab.cpp b/src/Editor/WorldEditor/WInstancesTab.cpp index 45661790..d9563df6 100644 --- a/src/Editor/WorldEditor/WInstancesTab.cpp +++ b/src/Editor/WorldEditor/WInstancesTab.cpp @@ -1,9 +1,9 @@ #include "WInstancesTab.h" #include "ui_WInstancesTab.h" -#include "../CWorldEditor.h" -#include -#include +#include "CWorldEditor.h" +#include +#include WInstancesTab::WInstancesTab(QWidget *parent) : QWidget(parent), diff --git a/src/Editor/WorldEditor/WInstancesTab.h b/src/Editor/WorldEditor/WInstancesTab.h index 19e80c71..d57acdea 100644 --- a/src/Editor/WorldEditor/WInstancesTab.h +++ b/src/Editor/WorldEditor/WInstancesTab.h @@ -1,10 +1,11 @@ #ifndef WINSTANCESTAB_H #define WINSTANCESTAB_H +#include "CTypesInstanceModel.h" + #include #include #include -#include "CTypesInstanceModel.h" class CWorldEditor; class CSceneManager; diff --git a/src/Editor/WorldEditor/WModifyTab.cpp b/src/Editor/WorldEditor/WModifyTab.cpp index 758a5ab2..54d53f72 100644 --- a/src/Editor/WorldEditor/WModifyTab.cpp +++ b/src/Editor/WorldEditor/WModifyTab.cpp @@ -1,9 +1,10 @@ #include "WModifyTab.h" #include "ui_WModifyTab.h" -#include +#include "CWorldEditor.h" +#include + #include #include -#include "../CWorldEditor.h" WModifyTab::WModifyTab(QWidget *pParent) : QWidget(pParent), diff --git a/src/Editor/WorldEditor/WModifyTab.h b/src/Editor/WorldEditor/WModifyTab.h index 0b12de59..848fd993 100644 --- a/src/Editor/WorldEditor/WModifyTab.h +++ b/src/Editor/WorldEditor/WModifyTab.h @@ -1,16 +1,16 @@ #ifndef WMODIFYTAB_H #define WMODIFYTAB_H +#include "CLinkModel.h" +#include "Editor/Widgets/WPropertyEditor.h" +#include + #include #include #include #include #include -#include "CLinkModel.h" -#include "../WPropertyEditor.h" -#include - class CWorldEditor; namespace Ui { diff --git a/src/Editor/main.cpp b/src/Editor/main.cpp index ed346897..3ea787ff 100644 --- a/src/Editor/main.cpp +++ b/src/Editor/main.cpp @@ -1,8 +1,9 @@ +#include "CStartWindow.h" +#include "CDarkStyle.h" +#include + #include -#include #include -#include -#include int main(int argc, char *argv[]) { diff --git a/src/PrimeWorldEditor.pro b/src/PrimeWorldEditor.pro index 6d4c3e76..816d9e2b 100644 --- a/src/PrimeWorldEditor.pro +++ b/src/PrimeWorldEditor.pro @@ -4,401 +4,11 @@ # #------------------------------------------------- -QT += core gui opengl - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - -CONFIG += console - -TARGET = PrimeWorldEditor -TEMPLATE = app +TEMPLATE = subdirs QMAKE_CXXFLAGS += /WX +CONFIG += ordered -SOURCES += \ - Common/AnimUtil.cpp \ - Common/CAABox.cpp \ - Common/CColor.cpp \ - Common/CFourCC.cpp \ - Common/CMatrix4f.cpp \ - Common/CompressionUtil.cpp \ - Common/CQuaternion.cpp \ - Common/CTimer.cpp \ - Common/CTransform4f.cpp \ - Common/CVector2f.cpp \ - Common/CVector3f.cpp \ - Common/CVector4f.cpp \ - Common/TString.cpp \ - Core/main.cpp \ - Core/CSceneManager.cpp \ - Core/CRenderer.cpp \ - Core/CResCache.cpp \ - Core/CCamera.cpp \ - OpenGL/CIndexBuffer.cpp \ - OpenGL/CShaderGenerator.cpp \ - OpenGL/CVertexBuffer.cpp \ - OpenGL/GLCommon.cpp \ - Resource/CCollisionMesh.cpp \ - Resource/CGameArea.cpp \ - Resource/CMaterial.cpp \ - Resource/CMaterialSet.cpp \ - Resource/CPakFile.cpp \ - Resource/CTexture.cpp \ - Resource/CWorld.cpp \ - Resource/factory/CAreaLoader.cpp \ - Resource/factory/CBlockMgr.cpp \ - Resource/factory/CCollisionLoader.cpp \ - Resource/factory/CMaterialLoader.cpp \ - Resource/factory/CModelLoader.cpp \ - Resource/factory/CTextureDecoder.cpp \ - Resource/model/CBasicModel.cpp \ - Resource/model/CModel.cpp \ - Resource/model/CStaticModel.cpp \ - Resource/script/CScriptObject.cpp \ - Scene/CCollisionNode.cpp \ - Scene/CLightNode.cpp \ - Scene/CModelNode.cpp \ - Scene/CSceneNode.cpp \ - Scene/CStaticNode.cpp \ - UI/CStartWindow.cpp \ - Resource/script/CScriptTemplate.cpp \ - Resource/script/CScriptLayer.cpp \ - Resource/CAnimSet.cpp \ - Resource/factory/CAnimSetLoader.cpp \ - Resource/factory/CScriptLoader.cpp \ - Scene/CScriptNode.cpp \ - Resource/CLight.cpp \ - OpenGL/CShader.cpp \ - OpenGL/CUniformBuffer.cpp \ - Resource/factory/CWorldLoader.cpp \ - Resource/CStringTable.cpp \ - Resource/factory/CStringLoader.cpp \ - Core/CGraphics.cpp \ - Resource/CFont.cpp \ - Resource/factory/CFontLoader.cpp \ - OpenGL/CDynamicVertexBuffer.cpp \ - UI/WColorPicker.cpp \ - UI/WDraggableSpinBox.cpp \ - Resource/cooker/CModelCooker.cpp \ - Resource/cooker/CMaterialCooker.cpp \ - Common/CUniqueID.cpp \ - Resource/cooker/CSectionMgrOut.cpp \ - Common/CHashFNV1A.cpp \ - UI/CModelEditorWindow.cpp \ - Resource/CResource.cpp \ - Core/CRenderBucket.cpp \ - Core/CDrawUtil.cpp \ - UI/WTextureGLWidget.cpp \ - UI/TestDialog.cpp \ - UI/WRollout.cpp \ - UI/CMaterialEditor.cpp \ - UI/WResourceSelector.cpp \ - UI/IPreviewPanel.cpp \ - UI/WTexturePreviewPanel.cpp \ - UI/UICommon.cpp \ - OpenGL/CVertexArrayManager.cpp \ - UI/WCollapsibleGroupBox.cpp \ - UI/CSimpleDelegate.cpp \ - UI/CDarkStyle.cpp \ - Resource/cooker/CTextureEncoder.cpp \ - Resource/CMaterialPass.cpp \ - OpenGL/CFramebuffer.cpp \ - OpenGL/CRenderbuffer.cpp \ - OpenGL/CGL.cpp \ - UI/CWorldEditor.cpp \ - UI/WorldEditor/WCreateTab.cpp \ - UI/WorldEditor/WModifyTab.cpp \ - UI/WorldEditor/WInstancesTab.cpp \ - Common/CRay.cpp \ - Resource/model/SSurface.cpp \ - Common/CRayCollisionTester.cpp \ - Common/Math.cpp \ - Core/Log.cpp \ - Common/CVector2i.cpp \ - UI/CNodeSelection.cpp \ - UI/WPropertyEditor.cpp \ - UI/WVectorEditor.cpp \ - Resource/script/CMasterTemplate.cpp \ - Resource/factory/CTemplateLoader.cpp \ - Core/CAreaAttributes.cpp \ - UI/WorldEditor/CLinkModel.cpp \ - UI/WorldEditor/CLayersInstanceModel.cpp \ - UI/WorldEditor/CTypesInstanceModel.cpp \ - UI/WorldEditor/CLayerEditor.cpp \ - UI/WorldEditor/CLayerModel.cpp \ - Resource/CScan.cpp \ - Resource/factory/CScanLoader.cpp \ - UI/WStringPreviewPanel.cpp \ - UI/WScanPreviewPanel.cpp \ - UI/WIntegralSpinBox.cpp \ - UI/CAboutDialog.cpp \ - UI/CGizmo.cpp \ - Common/CPlane.cpp \ - UI/undo/CTranslateNodeCommand.cpp \ - UI/undo/CClearSelectionCommand.cpp \ - UI/undo/CSelectNodeCommand.cpp \ - UI/undo/CDeselectNodeCommand.cpp \ - UI/CBasicViewport.cpp \ - UI/INodeEditor.cpp \ - UI/CSceneViewport.cpp \ - UI/undo/CRotateNodeCommand.cpp \ - UI/undo/CScaleNodeCommand.cpp \ - UI/CModelEditorViewport.cpp \ - Resource/cooker/CTemplateWriter.cpp \ - Resource/cooker/CWorldCooker.cpp \ - Resource/script/CPropertyTemplate.cpp \ - Resource/script/CProperty.cpp \ - Resource/CAnimationParameters.cpp \ - UI/WAnimParamsEditor.cpp \ - Resource/CCollisionMeshGroup.cpp \ - Core/CFrustumPlanes.cpp \ - Core/CLightParameters.cpp \ - Scene/script/CPointOfInterestExtra.cpp \ - Scene/script/CScriptExtra.cpp \ - Scene/script/CSpacePirateExtra.cpp \ - Scene/script/CWaypointExtra.cpp \ - Scene/script/CDoorExtra.cpp \ - Scene/script/CDamageableTriggerExtra.cpp - -HEADERS += \ - Common/AnimUtil.h \ - Common/CAABox.h \ - Common/CColor.h \ - Common/CFourCC.h \ - Common/CMatrix4f.h \ - Common/CompressionUtil.h \ - Common/CQuaternion.h \ - Common/CTimer.h \ - Common/CTransform4f.h \ - Common/CVector2f.h \ - Common/CVector3f.h \ - Common/CVector4f.h \ - Common/TString.h \ - Common/types.h \ - Core/CCamera.h \ - Core/CRenderer.h \ - Core/CResCache.h \ - Core/CSceneManager.h \ - OpenGL/CIndexBuffer.h \ - OpenGL/CShaderGenerator.h \ - OpenGL/CVertexBuffer.h \ - OpenGL/GLCommon.h \ - UI/PWEMaterialEditor.h \ - UI/CStartWindow.h \ - Resource/CCollisionMesh.h \ - Resource/CGameArea.h \ - Resource/CPakFile.h \ - Resource/CMaterial.h \ - Resource/CMaterialSet.h \ - Resource/CResource.h \ - Resource/CTexture.h \ - Resource/CWorld.h \ - Resource/EFormatVersion.h \ - Resource/factory/CAreaLoader.h \ - Resource/factory/CBlockMgrIn.h \ - Resource/factory/CCollisionLoader.h \ - Resource/factory/CMaterialLoader.h \ - Resource/factory/CModelLoader.h \ - Resource/factory/CTextureDecoder.h \ - Resource/model/CBasicModel.h \ - Resource/model/CModel.h \ - Resource/model/CStaticModel.h \ - Resource/model/CVertex.h \ - Resource/script/CProperty.h \ - Resource/script/CScriptLayer.h \ - Resource/script/CScriptObject.h \ - Resource/script/CScriptTemplate.h \ - Resource/script/EObjectType.h \ - Resource/script/SConnection.h \ - Resource/SNamedResource.h \ - Resource/SResInfo.h \ - Scene/CCollisionNode.h \ - Scene/CLightNode.h \ - Scene/CModelNode.h \ - Scene/CSceneNode.h \ - Scene/CStaticNode.h \ - Resource/CAnimSet.h \ - Resource/factory/CAnimSetLoader.h \ - Resource/factory/CScriptLoader.h \ - Resource/script/EPropertyType.h \ - Scene/CScriptNode.h \ - Resource/CLight.h \ - OpenGL/CShader.h \ - OpenGL/CUniformBuffer.h \ - Resource/factory/CWorldLoader.h \ - Resource/SDependency.h \ - Resource/CStringTable.h \ - Resource/factory/CStringLoader.h \ - Core/CGraphics.h \ - Resource/CFont.h \ - Resource/factory/CFontLoader.h \ - OpenGL/CDynamicVertexBuffer.h \ - UI/WColorPicker.h \ - UI/WDraggableSpinBox.h \ - Resource/cooker/CModelCooker.h \ - Resource/cooker/CMaterialCooker.h \ - Common/CUniqueID.h \ - Resource/model/SSurface.h \ - Resource/model/EVertexDescription.h \ - Common/EnumUtil.h \ - Resource/cooker/CSectionMgrOut.h \ - Common/CHashFNV1A.h \ - Core/ERenderOptions.h \ - UI/CModelEditorWindow.h \ - Core/CRenderBucket.h \ - Common/EMouseInputs.h \ - Common/EKeyInputs.h \ - Core/CDrawUtil.h \ - UI/WTextureGLWidget.h \ - UI/TestDialog.h \ - Resource/ETexelFormat.h \ - UI/WRollout.h \ - UI/CMaterialEditor.h \ - UI/WResourceSelector.h \ - Resource/EResType.h \ - UI/IPreviewPanel.h \ - UI/WTexturePreviewPanel.h \ - UI/UICommon.h \ - OpenGL/CVertexArrayManager.h \ - UI/WCollapsibleGroupBox.h \ - UI/CSimpleDelegate.h \ - UI/CDarkStyle.h \ - Resource/cooker/CTextureEncoder.h \ - Resource/CMaterialPass.h \ - Resource/ETevEnums.h \ - OpenGL/CFramebuffer.h \ - OpenGL/CRenderbuffer.h \ - OpenGL/CGL.h \ - UI/CWorldEditor.h \ - UI/WorldEditor/WCreateTab.h \ - UI/WorldEditor/WModifyTab.h \ - Common/CRay.h \ - Common/SRayIntersection.h \ - Common/CRayCollisionTester.h \ - Scene/ENodeType.h \ - Common/Math.h \ - Core/Log.h \ - Scene/CRootNode.h \ - Common/CVector2i.h \ - Core/ERenderCommand.h \ - UI/CNodeSelection.h \ - UI/WPropertyEditor.h \ - UI/WVectorEditor.h \ - Resource/script/CMasterTemplate.h \ - Resource/factory/CTemplateLoader.h \ - Core/CAreaAttributes.h \ - UI/WorldEditor/CLinkModel.h \ - UI/WorldEditor/WInstancesTab.h \ - UI/WorldEditor/CLayersInstanceModel.h \ - UI/WorldEditor/CTypesInstanceModel.h \ - UI/WorldEditor/CLayerEditor.h \ - UI/WorldEditor/CLayerModel.h \ - Resource/CScan.h \ - Resource/factory/CScanLoader.h \ - UI/WStringPreviewPanel.h \ - UI/WScanPreviewPanel.h \ - UI/WIntegralSpinBox.h \ - UI/CAboutDialog.h \ - UI/CGizmo.h \ - Core/IRenderable.h \ - Core/SRenderablePtr.h \ - Common/ETransformSpace.h \ - Common/CPlane.h \ - UI/undo/CTranslateNodeCommand.h \ - UI/undo/EUndoCommand.h \ - UI/undo/CClearSelectionCommand.h \ - UI/undo/CSelectNodeCommand.h \ - UI/undo/CDeselectNodeCommand.h \ - UI/undo/UndoCommands.h \ - UI/CBasicViewport.h \ - UI/INodeEditor.h \ - UI/CSceneViewport.h \ - UI/undo/CRotateNodeCommand.h \ - UI/undo/CScaleNodeCommand.h \ - UI/CModelEditorViewport.h \ - Resource/cooker/CTemplateWriter.h \ - Resource/cooker/CWorldCooker.h \ - Resource/script/CPropertyTemplate.h \ - Resource/script/EVolumeShape.h \ - Resource/CAnimationParameters.h \ - UI/WAnimParamsEditor.h \ - Resource/CCollisionMeshGroup.h \ - Core/CFrustumPlanes.h \ - Core/CLightParameters.h \ - Core/SViewInfo.h \ - Scene/script/CScriptExtra.h \ - Scene/script/CPointOfInterestExtra.h \ - Scene/script/CSpacePirateExtra.h \ - Scene/script/CWaypointExtra.h \ - Scene/script/CDoorExtra.h \ - Scene/script/CDamageableTriggerExtra.h \ - Core/TResPtr.h - -FORMS += \ - UI/CStartWindow.ui \ - UI/CModelEditorWindow.ui \ - UI/TestDialog.ui \ - UI/CMaterialEditor.ui \ - UI/WTexturePreviewPanel.ui \ - UI/CWorldEditor.ui \ - UI/WorldEditor/WCreateTab.ui \ - UI/WorldEditor/WModifyTab.ui \ - UI/WorldEditor/WInstancesTab.ui \ - UI/WorldEditor/CLayerEditor.ui \ - UI/WScanPreviewPanel.ui \ - UI/CAboutDialog.ui - -INCLUDEPATH += E:\C++\Libraries\glm\glm .\ - -LIBS += -lOpenGL32 - -LIBS += -LE:/C++/Libraries/zlib/lib -lzdll -INCLUDEPATH += E:/C++/Libraries/zlib/include - -LIBS += -LE:/C++/Libraries/lzo-2.08/lib -llzo-2.08 -INCLUDEPATH += E:/C++/Libraries/lzo-2.08/include - -unix|win32: LIBS += -LE:/C++/Libraries/glew-1.9.0/lib/ -lglew32s -INCLUDEPATH += E:/C++/Libraries/glew-1.9.0/include -DEPENDPATH += E:/C++/Libraries/glew-1.9.0/include -PRE_TARGETDEPS += E:/C++/Libraries/glew-1.9.0/lib/glew32s.lib -DEFINES += GLEW_STATIC - -INCLUDEPATH += E:/C++/Libraries/tinyxml2/include -win32:CONFIG(release, debug|release): LIBS += -LE:/C++/Libraries/tinyxml2/lib/ -ltinyxml2 -else:win32:CONFIG(debug, debug|release): LIBS += -LE:/C++/Libraries/tinyxml2/lib/ -ltinyxml2d -win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += E:/C++/Libraries/tinyxml2/lib/libtinyxml2.a -else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += E:/C++/Libraries/tinyxml2/lib/libtinyxml2d.a -else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += E:/C++/Libraries/tinyxml2/lib/tinyxml2.lib -else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += E:/C++/Libraries/tinyxml2/lib/tinyxml2d.lib - -win32:CONFIG(release, debug|release): LIBS += -LE:/C++/Libraries/FileIO/lib/ -lFileIO -else:win32:CONFIG(debug, debug|release): LIBS += -LE:/C++/Libraries/FileIO/lib/ -lFileIOd - -INCLUDEPATH += E:/C++/Libraries/FileIO/include -DEPENDPATH += E:/C++/Libraries/FileIO/include -CONFIG(release, debug|release): PRE_TARGETDEPS += E:/C++/Libraries/FileIO/lib/FileIO.lib -CONFIG(debug, debug|release): PRE_TARGETDEPS += E:/C++/Libraries/FileIO/lib/FileIOd.lib - -DISTFILES += \ - ../../../../../PWEassets/Icons/Free Camera.png \ - ../../../../../PWEassets/Icons/Material Highlight.png \ - ../../../../../PWEassets/Icons/Minus v2.png \ - ../../../../../PWEassets/Icons/Orbit Camera v2.png \ - ../../../../../PWEassets/Icons/Orbit Camera.png \ - ../../../../../PWEassets/Icons/Samus Silhouette Gradient.png \ - ../../../../../PWEassets/Icons/Square Preview.png - -RESOURCES += \ - Icons.qrc - - - -win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../Libraries/assimp/lib/ -lassimp-vc120-mt -else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../Libraries/assimp/lib/ -lassimp-vc120-mtd - -INCLUDEPATH += $$PWD/../../Libraries/assimp/include -DEPENDPATH += $$PWD/../../Libraries/assimp/include - -CONFIG(release, debug|release): LIBS += -LE:/C++/Libraries/boost_1_56_0/lib32-msvc-12.0 -llibboost_filesystem-vc120-mt-1_56 -CONFIG(debug, debug|release): LIBS += -LE:/C++/Libraries/boost_1_56_0/lib32-msvc-12.0 -llibboost_filesystem-vc120-mt-gd-1_56 -INCLUDEPATH += E:/C++/Libraries/boost_1_56_0 +SUBDIRS += \ + Common \ + Core \ + Editor