[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61094] trunk/blender/source/gameengine: BGE Rasterizer Cleanup: Cleaning up some includes.
Mitchell Stokes
mogurijin at gmail.com
Mon Nov 4 20:22:10 CET 2013
Revision: 61094
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61094
Author: moguri
Date: 2013-11-04 19:22:10 +0000 (Mon, 04 Nov 2013)
Log Message:
-----------
BGE Rasterizer Cleanup: Cleaning up some includes.
Modified Paths:
--------------
trunk/blender/source/gameengine/Ketsji/KX_Camera.cpp
trunk/blender/source/gameengine/Ketsji/KX_Light.cpp
trunk/blender/source/gameengine/Ketsji/KX_Light.h
trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp
trunk/blender/source/gameengine/Ketsji/KX_PolyProxy.cpp
trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.h
trunk/blender/source/gameengine/Rasterizer/RAS_BucketManager.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.h
trunk/blender/source/gameengine/Rasterizer/RAS_MeshObject.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_MeshObject.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_IStorage.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_Polygon.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_Polygon.h
trunk/blender/source/gameengine/VideoTexture/ImageRender.cpp
trunk/blender/source/gameengine/VideoTexture/ImageViewport.cpp
Modified: trunk/blender/source/gameengine/Ketsji/KX_Camera.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_Camera.cpp 2013-11-04 19:21:50 UTC (rev 61093)
+++ trunk/blender/source/gameengine/Ketsji/KX_Camera.cpp 2013-11-04 19:22:10 UTC (rev 61094)
@@ -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,
Modified: trunk/blender/source/gameengine/Ketsji/KX_Light.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_Light.cpp 2013-11-04 19:21:50 UTC (rev 61093)
+++ trunk/blender/source/gameengine/Ketsji/KX_Light.cpp 2013-11-04 19:22:10 UTC (rev 61094)
@@ -40,6 +40,7 @@
#include "KX_Light.h"
#include "KX_Camera.h"
#include "RAS_IRasterizer.h"
+#include "RAS_ICanvas.h"
#include "KX_PyMath.h"
Modified: trunk/blender/source/gameengine/Ketsji/KX_Light.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_Light.h 2013-11-04 19:21:50 UTC (rev 61093)
+++ trunk/blender/source/gameengine/Ketsji/KX_Light.h 2013-11-04 19:22:10 UTC (rev 61094)
@@ -38,7 +38,6 @@
struct GPULamp;
struct Scene;
struct Base;
-struct RAS_LightObject;
class KX_Camera;
class RAS_IRasterizer;
class MT_Transform;
Modified: trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp 2013-11-04 19:21:50 UTC (rev 61093)
+++ trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp 2013-11-04 19:22:10 UTC (rev 61094)
@@ -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"
Modified: trunk/blender/source/gameengine/Ketsji/KX_PolyProxy.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PolyProxy.cpp 2013-11-04 19:21:50 UTC (rev 61093)
+++ trunk/blender/source/gameengine/Ketsji/KX_PolyProxy.cpp 2013-11-04 19:22:10 UTC (rev 61094)
@@ -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"
Modified: trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp 2013-11-04 19:21:50 UTC (rev 61093)
+++ trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp 2013-11-04 19:22:10 UTC (rev 61094)
@@ -62,6 +62,7 @@
#include "SCA_IScene.h"
#include "RAS_IRasterizer.h"
+#include "RAS_ICanvas.h"
#include "RAS_BucketManager.h"
#include "FloatValue.h"
Modified: trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
===================================================================
--- trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp 2013-11-04 19:21:50 UTC (rev 61093)
+++ trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp 2013-11-04 19:22:10 UTC (rev 61094)
@@ -29,6 +29,8 @@
#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"
Modified: trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.h
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.h 2013-11-04 19:21:50 UTC (rev 61093)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.h 2013-11-04 19:22:10 UTC (rev 61094)
@@ -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:
Modified: trunk/blender/source/gameengine/Rasterizer/RAS_BucketManager.cpp
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_BucketManager.cpp 2013-11-04 19:21:50 UTC (rev 61093)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_BucketManager.cpp 2013-11-04 19:22:10 UTC (rev 61094)
@@ -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
Modified: trunk/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp 2013-11-04 19:21:50 UTC (rev 61093)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp 2013-11-04 19:22:10 UTC (rev 61094)
@@ -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(
Modified: trunk/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h 2013-11-04 19:21:50 UTC (rev 61093)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h 2013-11-04 19:22:10 UTC (rev 61094)
@@ -35,7 +35,6 @@
#include "STR_HashedString.h"
#include "MT_Vector3.h"
-#include "STR_HashedString.h"
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
Modified: trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp 2013-11-04 19:21:50 UTC (rev 61093)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp 2013-11-04 19:22:10 UTC (rev 61094)
@@ -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"
Modified: trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.h
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.h 2013-11-04 19:21:50 UTC (rev 61093)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.h 2013-11-04 19:22:10 UTC (rev 61094)
@@ -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 <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 @@
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
Modified: trunk/blender/source/gameengine/Rasterizer/RAS_MeshObject.cpp
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_MeshObject.cpp 2013-11-04 19:21:50 UTC (rev 61093)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_MeshObject.cpp 2013-11-04 19:22:10 UTC (rev 61094)
@@ -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 <algorithm>
-extern "C" {
-# include "BKE_deform.h"
-}
/* polygon sorting */
@@ -540,6 +536,16 @@
}
+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)
Modified: trunk/blender/source/gameengine/Rasterizer/RAS_MeshObject.h
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_MeshObject.h 2013-11-04 19:21:50 UTC (rev 61093)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_MeshObject.h 2013-11-04 19:22:10 UTC (rev 61094)
@@ -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 @@
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 @@
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 {
Modified: trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list