Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/gameengine/Rasterizer/RAS_MaterialBucket.h')
-rw-r--r--source/gameengine/Rasterizer/RAS_MaterialBucket.h26
1 files changed, 12 insertions, 14 deletions
diff --git a/source/gameengine/Rasterizer/RAS_MaterialBucket.h b/source/gameengine/Rasterizer/RAS_MaterialBucket.h
index 4c72f128817..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 <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
@@ -219,10 +219,8 @@ public:
bool IsZSort() const;
/* Rendering */
- bool ActivateMaterial(const MT_Transform& cameratrans, RAS_IRasterizer* rasty,
- RAS_IRenderTools *rendertools);
- void RenderMeshSlot(const MT_Transform& cameratrans, RAS_IRasterizer* rasty,
- RAS_IRenderTools* rendertools, RAS_MeshSlot &ms);
+ bool ActivateMaterial(const MT_Transform& cameratrans, RAS_IRasterizer* rasty);
+ void RenderMeshSlot(const MT_Transform& cameratrans, RAS_IRasterizer* rasty, RAS_MeshSlot &ms);
/* Mesh Slot Access */
list<RAS_MeshSlot>::iterator msBegin();