From fb94a539789e06148b28a73f59f0aefd0ad71e00 Mon Sep 17 00:00:00 2001 From: Mitchell Stokes Date: Mon, 4 Nov 2013 19:22:10 +0000 Subject: BGE Rasterizer Cleanup: Cleaning up some includes. --- source/gameengine/Ketsji/KX_Camera.cpp | 3 +++ source/gameengine/Ketsji/KX_Light.cpp | 1 + source/gameengine/Ketsji/KX_Light.h | 1 - source/gameengine/Ketsji/KX_NavMeshObject.cpp | 1 + source/gameengine/Ketsji/KX_PolyProxy.cpp | 1 + source/gameengine/Ketsji/KX_Scene.cpp | 1 + .../Physics/Bullet/CcdPhysicsController.cpp | 2 ++ source/gameengine/Rasterizer/RAS_2DFilterManager.h | 3 ++- source/gameengine/Rasterizer/RAS_BucketManager.cpp | 5 ++--- .../gameengine/Rasterizer/RAS_IPolygonMaterial.cpp | 2 -- .../gameengine/Rasterizer/RAS_IPolygonMaterial.h | 1 - .../gameengine/Rasterizer/RAS_MaterialBucket.cpp | 2 +- source/gameengine/Rasterizer/RAS_MaterialBucket.h | 20 +++++++++--------- source/gameengine/Rasterizer/RAS_MeshObject.cpp | 24 ++++++++++++++-------- source/gameengine/Rasterizer/RAS_MeshObject.h | 17 ++++----------- .../RAS_GLExtensionManager.cpp | 2 ++ .../RAS_OpenGLRasterizer/RAS_GLExtensionManager.h | 2 -- .../Rasterizer/RAS_OpenGLRasterizer/RAS_IStorage.h | 11 ++-------- .../RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp | 10 ++------- .../RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h | 13 ++++++++++-- .../RAS_OpenGLRasterizer/RAS_StorageIM.cpp | 5 ++--- source/gameengine/Rasterizer/RAS_Polygon.cpp | 1 + source/gameengine/Rasterizer/RAS_Polygon.h | 6 +++--- source/gameengine/VideoTexture/ImageRender.cpp | 1 + source/gameengine/VideoTexture/ImageViewport.cpp | 1 + 25 files changed, 68 insertions(+), 68 deletions(-) (limited to 'source') diff --git a/source/gameengine/Ketsji/KX_Camera.cpp b/source/gameengine/Ketsji/KX_Camera.cpp index 73ebf89bea3..4ab768e4240 100644 --- a/source/gameengine/Ketsji/KX_Camera.cpp +++ b/source/gameengine/Ketsji/KX_Camera.cpp @@ -37,6 +37,9 @@ #include "KX_PythonInit.h" #include "KX_Python.h" #include "KX_PyMath.h" + +#include "RAS_ICanvas.h" + KX_Camera::KX_Camera(void* sgReplicationInfo, SG_Callbacks callbacks, const RAS_CameraData& camdata, diff --git a/source/gameengine/Ketsji/KX_Light.cpp b/source/gameengine/Ketsji/KX_Light.cpp index 1d314c577ca..4567c17cc3e 100644 --- a/source/gameengine/Ketsji/KX_Light.cpp +++ b/source/gameengine/Ketsji/KX_Light.cpp @@ -40,6 +40,7 @@ #include "KX_Light.h" #include "KX_Camera.h" #include "RAS_IRasterizer.h" +#include "RAS_ICanvas.h" #include "KX_PyMath.h" diff --git a/source/gameengine/Ketsji/KX_Light.h b/source/gameengine/Ketsji/KX_Light.h index 9a81388d43b..4f11c535cf0 100644 --- a/source/gameengine/Ketsji/KX_Light.h +++ b/source/gameengine/Ketsji/KX_Light.h @@ -38,7 +38,6 @@ struct GPULamp; struct Scene; struct Base; -struct RAS_LightObject; class KX_Camera; class RAS_IRasterizer; class MT_Transform; diff --git a/source/gameengine/Ketsji/KX_NavMeshObject.cpp b/source/gameengine/Ketsji/KX_NavMeshObject.cpp index c8e2370ab7f..42f62886ff7 100644 --- a/source/gameengine/Ketsji/KX_NavMeshObject.cpp +++ b/source/gameengine/Ketsji/KX_NavMeshObject.cpp @@ -30,6 +30,7 @@ #include "BLI_math_vector.h" #include "KX_NavMeshObject.h" #include "RAS_MeshObject.h" +#include "RAS_Polygon.h" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" diff --git a/source/gameengine/Ketsji/KX_PolyProxy.cpp b/source/gameengine/Ketsji/KX_PolyProxy.cpp index ea26cb56e52..ccc10eb06e3 100644 --- a/source/gameengine/Ketsji/KX_PolyProxy.cpp +++ b/source/gameengine/Ketsji/KX_PolyProxy.cpp @@ -35,6 +35,7 @@ #include "KX_PolyProxy.h" #include "KX_MeshProxy.h" #include "RAS_MeshObject.h" +#include "RAS_Polygon.h" #include "KX_BlenderMaterial.h" #include "KX_PyMath.h" diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index dba26d4e3a7..a34764d7d17 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -62,6 +62,7 @@ #include "SCA_IScene.h" #include "RAS_IRasterizer.h" +#include "RAS_ICanvas.h" #include "RAS_BucketManager.h" #include "FloatValue.h" diff --git a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp index 1a8fda0749a..8a3ad82d179 100644 --- a/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp +++ b/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp @@ -29,6 +29,8 @@ subject to the following restrictions: #include "PHY_IMotionState.h" #include "CcdPhysicsEnvironment.h" #include "RAS_MeshObject.h" +#include "RAS_Polygon.h" +#include "RAS_Deformer.h" #include "KX_GameObject.h" #include "BulletSoftBody/btSoftBody.h" diff --git a/source/gameengine/Rasterizer/RAS_2DFilterManager.h b/source/gameengine/Rasterizer/RAS_2DFilterManager.h index a637baa3d09..bb727fe3b29 100644 --- a/source/gameengine/Rasterizer/RAS_2DFilterManager.h +++ b/source/gameengine/Rasterizer/RAS_2DFilterManager.h @@ -32,13 +32,14 @@ #ifndef __RAS_2DFILTERMANAGER_H__ #define __RAS_2DFILTERMANAGER_H__ -#include "RAS_ICanvas.h" #define MAX_RENDER_PASS 100 #ifdef WITH_CXX_GUARDEDALLOC #include "MEM_guardedalloc.h" #endif +class RAS_ICanvas; + class RAS_2DFilterManager { private: diff --git a/source/gameengine/Rasterizer/RAS_BucketManager.cpp b/source/gameengine/Rasterizer/RAS_BucketManager.cpp index 02c50df3dd3..eaa9b3df494 100644 --- a/source/gameengine/Rasterizer/RAS_BucketManager.cpp +++ b/source/gameengine/Rasterizer/RAS_BucketManager.cpp @@ -35,15 +35,14 @@ #endif #include "RAS_MaterialBucket.h" -#include "STR_HashedString.h" #include "RAS_MeshObject.h" +#include "RAS_Polygon.h" +#include "RAS_IPolygonMaterial.h" #include "RAS_IRasterizer.h" #include "RAS_BucketManager.h" #include -#include - /* sorting */ struct RAS_BucketManager::sortedmeshslot diff --git a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp index 9d55fde20c3..47e52318b33 100644 --- a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp +++ b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp @@ -33,8 +33,6 @@ #include "RAS_IPolygonMaterial.h" #include "RAS_IRasterizer.h" -#include "DNA_image_types.h" -#include "DNA_meshdata_types.h" #include "DNA_material_types.h" void RAS_IPolyMaterial::Initialize( diff --git a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h index 67e74dfaa3b..2db71c3a2fe 100644 --- a/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h +++ b/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h @@ -35,7 +35,6 @@ #include "STR_HashedString.h" #include "MT_Vector3.h" -#include "STR_HashedString.h" #ifdef WITH_CXX_GUARDEDALLOC #include "MEM_guardedalloc.h" diff --git a/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp b/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp index 726b9106340..0c715524218 100644 --- a/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp +++ b/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp @@ -40,7 +40,7 @@ #include #endif // WIN32 -#include "RAS_Polygon.h" +#include "RAS_IPolygonMaterial.h" #include "RAS_TexVert.h" #include "RAS_IRasterizer.h" #include "RAS_MeshObject.h" diff --git a/source/gameengine/Rasterizer/RAS_MaterialBucket.h b/source/gameengine/Rasterizer/RAS_MaterialBucket.h index c112d44f774..007fdf240c4 100644 --- a/source/gameengine/Rasterizer/RAS_MaterialBucket.h +++ b/source/gameengine/Rasterizer/RAS_MaterialBucket.h @@ -34,17 +34,23 @@ #include "RAS_TexVert.h" #include "CTR_Map.h" -#include "STR_HashedString.h" #include "SG_QList.h" #include "MT_Transform.h" -#include "RAS_IPolygonMaterial.h" -#include "RAS_IRasterizer.h" -#include "RAS_Deformer.h" +#include "MT_Matrix4x4.h" #include #include #include + +class RAS_MaterialBucket; +struct DerivedMesh; +class CTR_HashedPtr; +class RAS_Deformer; +class RAS_IPolyMaterial; +class RAS_IRasterizer; +class RAS_MeshObject; + using namespace std; /* Display List Slot */ @@ -69,12 +75,6 @@ public: virtual void SetModified(bool mod)=0; }; -class RAS_DisplayArray; -class RAS_MeshSlot; -class RAS_MeshMaterial; -class RAS_MaterialBucket; -struct DerivedMesh; - /* An array with data used for OpenGL drawing */ class RAS_DisplayArray diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.cpp b/source/gameengine/Rasterizer/RAS_MeshObject.cpp index 8a9672f0092..ff909b5955f 100644 --- a/source/gameengine/Rasterizer/RAS_MeshObject.cpp +++ b/source/gameengine/Rasterizer/RAS_MeshObject.cpp @@ -29,23 +29,19 @@ * \ingroup bgerast */ -#include "MEM_guardedalloc.h" - -#include "DNA_object_types.h" #include "DNA_key_types.h" #include "DNA_mesh_types.h" -#include "DNA_meshdata_types.h" + +#include "CTR_HashedPtr.h" #include "RAS_MeshObject.h" -#include "RAS_IRasterizer.h" -#include "MT_MinMax.h" +#include "RAS_Polygon.h" +#include "RAS_IPolygonMaterial.h" +#include "RAS_Deformer.h" #include "MT_Point3.h" #include -extern "C" { -# include "BKE_deform.h" -} /* polygon sorting */ @@ -540,6 +536,16 @@ void RAS_MeshObject::SortPolygons(RAS_MeshSlot& ms, const MT_Transform &transfor } +bool RAS_MeshObject::HasColliderPolygon() +{ + int numpolys= NumPolygons(); + for (int p=0; pIsCollider()) + return true; + + return false; +} + void RAS_MeshObject::SchedulePolygons(int drawingmode) { if (m_bModified) diff --git a/source/gameengine/Rasterizer/RAS_MeshObject.h b/source/gameengine/Rasterizer/RAS_MeshObject.h index e5ae78d006e..4f352379d39 100644 --- a/source/gameengine/Rasterizer/RAS_MeshObject.h +++ b/source/gameengine/Rasterizer/RAS_MeshObject.h @@ -38,17 +38,15 @@ #endif #include -#include #include -#include "RAS_Polygon.h" #include "RAS_MaterialBucket.h" #include "MT_Transform.h" - -#include "CTR_HashedPtr.h" +#include "STR_String.h" struct Mesh; class RAS_Deformer; +class RAS_Polygon; /* RAS_MeshObject is a mesh used for rendering. It stores polygons, * but the actual vertices and index arrays are stored in material @@ -65,7 +63,7 @@ private: STR_String m_name; static STR_String s_emptyname; - vector m_Polygons; + vector m_Polygons; /* polygon sorting */ struct polygonSlot; @@ -150,14 +148,7 @@ public: void SortPolygons(RAS_MeshSlot& ms, const MT_Transform &transform); - bool HasColliderPolygon() { - int numpolys= NumPolygons(); - for (int p=0; pIsCollider()) - return true; - - return false; - } + bool HasColliderPolygon(); /* for construction to find shared vertices */ struct SharedVertex { diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp index 665053984e6..32cc4ba9fea 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp @@ -32,6 +32,8 @@ #include +#include "GL/glew.h" + #include "RAS_GLExtensionManager.h" namespace bgl diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h index 1b4d3219335..9f2039b4c6f 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h @@ -32,8 +32,6 @@ #ifndef __RAS_GLEXTENSIONMANAGER_H__ #define __RAS_GLEXTENSIONMANAGER_H__ -#include "GL/glew.h" - /** Note: this used to have a lot more code, but now extension handling * is done by GLEW, so it does mostly debug stuff */ diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_IStorage.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_IStorage.h index f5c16bc8cd8..5a803115553 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_IStorage.h +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_IStorage.h @@ -28,14 +28,7 @@ #ifndef __KX_STORAGE #define __KX_STORAGE -#include "RAS_MaterialBucket.h" - -enum RAS_STORAGE_TYPE { - RAS_AUTO_STORAGE, - RAS_IMMEDIATE, - RAS_VA, - RAS_VBO -}; +class RAS_MeshSlot; class RAS_IStorage { @@ -47,7 +40,7 @@ public: virtual void Exit()=0; virtual void IndexPrimitives(RAS_MeshSlot& ms)=0; - virtual void IndexPrimitivesMulti(class RAS_MeshSlot& ms)=0; + virtual void IndexPrimitivesMulti(RAS_MeshSlot& ms)=0; virtual void SetDrawingMode(int drawingmode)=0; diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp index 2bd988145c3..41847bb0f8f 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp @@ -37,9 +37,11 @@ #include "GL/glew.h" +#include "RAS_ICanvas.h" #include "RAS_Rect.h" #include "RAS_TexVert.h" #include "RAS_MeshObject.h" +#include "RAS_Polygon.h" #include "RAS_LightObject.h" #include "MT_CmMatrix4x4.h" @@ -49,16 +51,8 @@ #include "GPU_draw.h" #include "GPU_material.h" -#include "GPU_extensions.h" - -#include "DNA_image_types.h" -#include "DNA_meshdata_types.h" -#include "DNA_material_types.h" -#include "DNA_scene_types.h" extern "C"{ - #include "BLI_utildefines.h" - #include "BKE_DerivedMesh.h" #include "BLF_api.h" } diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h index 1fc97201480..e1159ab3d2d 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h @@ -41,13 +41,22 @@ using namespace std; #include "RAS_IRasterizer.h" -#include "RAS_IStorage.h" #include "RAS_MaterialBucket.h" -#include "RAS_ICanvas.h" +#include "RAS_IPolygonMaterial.h" + +class RAS_IStorage; +class RAS_ICanvas; #define RAS_MAX_TEXCO 8 // match in BL_Material #define RAS_MAX_ATTRIB 16 // match in BL_BlenderShader +enum RAS_STORAGE_TYPE { + RAS_AUTO_STORAGE, + RAS_IMMEDIATE, + RAS_VA, + RAS_VBO +}; + struct OglDebugShape { enum SHAPE_TYPE{ diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp index 77bd540a039..40afcf04aac 100644 --- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp +++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp @@ -26,16 +26,15 @@ */ #include "RAS_StorageIM.h" +#include "RAS_MaterialBucket.h" +#include "RAS_IPolygonMaterial.h" #include "GL/glew.h" #include "GPU_draw.h" #include "GPU_extensions.h" #include "GPU_material.h" -#include "DNA_meshdata_types.h" - extern "C"{ - #include "BLI_utildefines.h" #include "BKE_DerivedMesh.h" } diff --git a/source/gameengine/Rasterizer/RAS_Polygon.cpp b/source/gameengine/Rasterizer/RAS_Polygon.cpp index 72e09c9667d..1f23df90753 100644 --- a/source/gameengine/Rasterizer/RAS_Polygon.cpp +++ b/source/gameengine/Rasterizer/RAS_Polygon.cpp @@ -34,6 +34,7 @@ #endif #include "RAS_Polygon.h" +#include "RAS_MaterialBucket.h" RAS_Polygon::RAS_Polygon(RAS_MaterialBucket* bucket, RAS_DisplayArray *darray, int numvert) { diff --git a/source/gameengine/Rasterizer/RAS_Polygon.h b/source/gameengine/Rasterizer/RAS_Polygon.h index 088bdbd6844..665056c0ccc 100644 --- a/source/gameengine/Rasterizer/RAS_Polygon.h +++ b/source/gameengine/Rasterizer/RAS_Polygon.h @@ -32,10 +32,10 @@ #ifndef __RAS_POLYGON_H__ #define __RAS_POLYGON_H__ -#include "RAS_TexVert.h" -#include "RAS_MaterialBucket.h" +class RAS_DisplayArray; +class RAS_MaterialBucket; +class RAS_TexVert; -#include using namespace std; #ifdef WITH_CXX_GUARDEDALLOC diff --git a/source/gameengine/VideoTexture/ImageRender.cpp b/source/gameengine/VideoTexture/ImageRender.cpp index 68adb07b1f8..6908bc6db9c 100644 --- a/source/gameengine/VideoTexture/ImageRender.cpp +++ b/source/gameengine/VideoTexture/ImageRender.cpp @@ -42,6 +42,7 @@ #include "DNA_scene_types.h" #include "RAS_CameraData.h" #include "RAS_MeshObject.h" +#include "RAS_Polygon.h" #include "BLI_math.h" #include "ImageRender.h" diff --git a/source/gameengine/VideoTexture/ImageViewport.cpp b/source/gameengine/VideoTexture/ImageViewport.cpp index 28fff8b9a6c..789b6006f99 100644 --- a/source/gameengine/VideoTexture/ImageViewport.cpp +++ b/source/gameengine/VideoTexture/ImageViewport.cpp @@ -36,6 +36,7 @@ #include "GL/glew.h" #include "KX_PythonInit.h" +#include "RAS_ICanvas.h" #include "Texture.h" #include "ImageBase.h" #include "VideoBase.h" -- cgit v1.2.3