BGE Rasterizer Cleanup: Cleaning up some includes.
authorMitchell Stokes <mogurijin@gmail.com>
Mon, 4 Nov 2013 19:22:10 +0000 (19:22 +0000)
committerMitchell Stokes <mogurijin@gmail.com>
Mon, 4 Nov 2013 19:22:10 +0000 (19:22 +0000)
25 files changed:
source/gameengine/Ketsji/KX_Camera.cpp
source/gameengine/Ketsji/KX_Light.cpp
source/gameengine/Ketsji/KX_Light.h
source/gameengine/Ketsji/KX_NavMeshObject.cpp
source/gameengine/Ketsji/KX_PolyProxy.cpp
source/gameengine/Ketsji/KX_Scene.cpp
source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
source/gameengine/Rasterizer/RAS_2DFilterManager.h
source/gameengine/Rasterizer/RAS_BucketManager.cpp
source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
source/gameengine/Rasterizer/RAS_MaterialBucket.h
source/gameengine/Rasterizer/RAS_MeshObject.cpp
source/gameengine/Rasterizer/RAS_MeshObject.h
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_IStorage.h
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
source/gameengine/Rasterizer/RAS_Polygon.cpp
source/gameengine/Rasterizer/RAS_Polygon.h
source/gameengine/VideoTexture/ImageRender.cpp
source/gameengine/VideoTexture/ImageViewport.cpp

index 73ebf89bea316eebd3371e177a088ae7f59dcaef..4ab768e4240bb77c77852d6a8b96537259889a7e 100644 (file)
@@ -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,
index 1d314c577caa35aab541d465d8beabc6de583803..4567c17cc3e7177ff064db558464c30c119ffc30 100644 (file)
@@ -40,6 +40,7 @@
 #include "KX_Light.h"
 #include "KX_Camera.h"
 #include "RAS_IRasterizer.h"
+#include "RAS_ICanvas.h"
 
 #include "KX_PyMath.h"
 
index 9a81388d43b5476cb49ab1a577b35f6e3651e63f..4f11c535cf049f0230f38c0a6d65fe2a6e9298ee 100644 (file)
@@ -38,7 +38,6 @@
 struct GPULamp;
 struct Scene;
 struct Base;
-struct RAS_LightObject;
 class KX_Camera;
 class RAS_IRasterizer;
 class MT_Transform;
index c8e2370ab7f25706c23689f1cb3454517447f4e7..42f62886ff78dfa95078b03316f2776cae6919de 100644 (file)
@@ -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"
index ea26cb56e52a1d00f2482b0bd26ba4c412a7fe8f..ccc10eb06e357378583b08222f669a495add5ae8 100644 (file)
@@ -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"
index dba26d4e3a73c26c7de7518bc1d0d51075789da2..a34764d7d175434452d8b4dadce942c983332e40 100644 (file)
@@ -62,6 +62,7 @@
 #include "SCA_IScene.h"
 
 #include "RAS_IRasterizer.h"
+#include "RAS_ICanvas.h"
 #include "RAS_BucketManager.h"
 
 #include "FloatValue.h"
index 1a8fda0749a8cc626f61689d81c50b48ab0d4b1f..8a3ad82d17933bdd12f9fde1eb4f34be81e9e0e5 100644 (file)
@@ -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"
index a637baa3d095215fb2bbbfd32f89f8384995ab18..bb727fe3b2940d5ec6ffa6b439edb282601f93d9 100644 (file)
 #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:
index 02c50df3dd3ba08641c3bec0d8cf62a96c6548e6..eaa9b3df494f902486a27dd029547953f257b290 100644 (file)
 #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 <algorithm>
-#include <set>
-
 /* sorting */
 
 struct RAS_BucketManager::sortedmeshslot
index 9d55fde20c383da6993d2602936e62982f74a159..47e52318b3371436923adfe4b37b02de1f89e404 100644 (file)
@@ -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( 
index 67e74dfaa3b362c34bc1e5a674caa7c048524582..2db71c3a2fe9409323f222e83044f13dacd0f6ea 100644 (file)
@@ -35,7 +35,6 @@
 #include "STR_HashedString.h"
 
 #include "MT_Vector3.h"
-#include "STR_HashedString.h"
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #include "MEM_guardedalloc.h"
index 726b9106340fd97de56bf66d44eeb480d0817cb2..0c715524218fe90f0e7cb83809e4679eba691442 100644 (file)
@@ -40,7 +40,7 @@
 #include <windows.h>
 #endif // WIN32
 
-#include "RAS_Polygon.h"
+#include "RAS_IPolygonMaterial.h"
 #include "RAS_TexVert.h"
 #include "RAS_IRasterizer.h"
 #include "RAS_MeshObject.h"
index c112d44f7743048151ddebe6768adb1d211f8387..007fdf240c440e1fd099675b603f7a80ff2af83c 100644 (file)
 
 #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 <vector>
 #include <set>
 #include <list>
+
+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
index 8a9672f00924e476a2f48752a18012f2a85da675..ff909b5955f66a2b3b45cf2e30f496db4b72f461 100644 (file)
  *  \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 <algorithm>
 
-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; p<numpolys; p++)
+          if (m_Polygons[p]->IsCollider())
+                  return true;
+
+   return false;
+}
+
 void RAS_MeshObject::SchedulePolygons(int drawingmode)
 {
        if (m_bModified)
index e5ae78d006e09cf8d77dc536abaa82dcea8272dd..4f352379d392730aef8317f5aa084d102461921a 100644 (file)
 #endif
 
 #include <vector>
-#include <set>
 #include <list>
 
-#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<class RAS_Polygon*>      m_Polygons;
+       vector<RAS_Polygon*>    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; p<numpolys; p++)
-                       if (m_Polygons[p]->IsCollider())
-                               return true;
-               
-               return false;
-       }
+       bool                            HasColliderPolygon();
 
        /* for construction to find shared vertices */
        struct SharedVertex {
index 665053984e6ccc2a0ff7afc56f38b07924942af1..32cc4ba9fea2a64798c952d271431199a6c12770 100644 (file)
@@ -32,6 +32,8 @@
 
 #include <iostream>
 
+#include "GL/glew.h"
+
 #include "RAS_GLExtensionManager.h"
 
 namespace bgl
index 1b4d32193353b3c48c07c7cf77a9d658b627aef4..9f2039b4c6f2d5c1c3af1816d8433d49dca336ab 100644 (file)
@@ -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 */
 
index f5c16bc8cd8d615da339a278b8a893f58a3c986b..5a803115553ffd655b27ea60ae1a44c605717ebb 100644 (file)
 #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;
 
index 2bd988145c3c67fce20d8ced1b52d0289f60cc2d..41847bb0f8fafb41cd3af4a731e024821d8a456f 100644 (file)
 
 #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"
 
 
 #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"
 }
 
index 1fc97201480a3edd515840b87907652872ebbe02..e1159ab3d2d822922b3a07ea5ecfd6905c71841c 100644 (file)
 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{
index 77bd540a03909701f2d5231eaad3b55c7d31513b..40afcf04aac00ba97a186703d6c5432967695e72 100644 (file)
  */
 
 #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"
 }
 
index 72e09c9667d1563fd8d78b2df9086ff5ab9ba354..1f23df90753a43548c146c51a406133dddfbc04f 100644 (file)
@@ -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)
 {
index 088bdbd684431919e5a6cd3e5abb19310068cbc6..665056c0ccc36e7c1dd95883751437342d0681ed 100644 (file)
 #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 <vector>
 using namespace std;
 
 #ifdef WITH_CXX_GUARDEDALLOC
index 68adb07b1f8f0806555d8f64976fb7546766acff..6908bc6db9c676e53f9fa1fa773e31c636dcc248 100644 (file)
@@ -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"
index 28fff8b9a6cb6fadf4e7e4b5cad6df42e0f7dc12..789b6006f99a7028a86cc33d48fd428d5b02e0ce 100644 (file)
@@ -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"