BGE Rasterizer Cleanup: Cleaning up some includes.

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,

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"
 

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;

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"

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"

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"

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"

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:

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 <algorithm>
-#include <set>
-
 /* sorting */
 
 struct RAS_BucketManager::sortedmeshslot

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( 

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"

source/gameengine/Rasterizer/RAS_MaterialBucket.cpp

@@ -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"

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 "MT_Matrix4x4.h"
-#include "RAS_IRasterizer.h"
-#include "RAS_Deformer.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

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 "RAS_Polygon.h"
-#include "MT_MinMax.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)

source/gameengine/Rasterizer/RAS_MeshObject.h

@@ -38,17 +38,15 @@
 #endif
 
 #include <vector>
-#include <set>
 #include <list>
 
-#include "RAS_Polygon.h"
 #include "RAS_MaterialBucket.h"
 #include "MT_Transform.h"
-
+#include "STR_String.h"
-#include "CTR_HashedPtr.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() {
+	bool				HasColliderPolygon();
-		int numpolys= NumPolygons();
-		for (int p=0; p<numpolys; p++)
-			if (m_Polygons[p]->IsCollider())
-				return true;
-		
-		return false;
-	}
 
 	/* for construction to find shared vertices */
 	struct SharedVertex {

source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp

@@ -32,6 +32,8 @@
 
 #include <iostream>
 
+#include "GL/glew.h"
+
 #include "RAS_GLExtensionManager.h"
 
 namespace bgl

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 */
 

source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_IStorage.h

@@ -28,14 +28,7 @@
 #ifndef __KX_STORAGE
 #define __KX_STORAGE
 
-#include "RAS_MaterialBucket.h"
+class RAS_MeshSlot;
-
-enum RAS_STORAGE_TYPE	{
-	RAS_AUTO_STORAGE,
-	RAS_IMMEDIATE,
-	RAS_VA,
-	RAS_VBO
-};
 
 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;
 

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"
 }
 

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{

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"
 }
 

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)
 {

source/gameengine/Rasterizer/RAS_Polygon.h

@@ -32,10 +32,10 @@
 #ifndef __RAS_POLYGON_H__
 #define __RAS_POLYGON_H__
 
-#include "RAS_TexVert.h"
+class RAS_DisplayArray;
-#include "RAS_MaterialBucket.h"
+class RAS_MaterialBucket;
+class RAS_TexVert;
 
-#include <vector>
 using namespace std;
 
 #ifdef WITH_CXX_GUARDEDALLOC

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"

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"