1 files changed, 35 insertions, 17 deletions

diff --git a/source/gameengine/Rasterizer/RAS_IRasterizer.h b/source/gameengine/Rasterizer/RAS_IRasterizer.h
index 411b28fa3b7..9e03212283e 100644
--- a/source/gameengine/Rasterizer/RAS_IRasterizer.h
+++ b/source/gameengine/Rasterizer/RAS_IRasterizer.h
@@ -169,10 +169,6 @@ public:
 	 */
 	virtual bool	BeginFrame(int drawingmode, double time)=0;
 	/**
-	 * ClearColorBuffer clears the color buffer.
-	 */
-	virtual void	ClearColorBuffer()=0;
-	/**
 	 * ClearDepthBuffer clears the depth buffer.
 	 */
 	virtual void	ClearDepthBuffer()=0;
@@ -185,8 +181,7 @@ public:
 	 */
 	virtual void	EndFrame()=0;
 	/**
-	 * SetRenderArea sets the render area from the 2d canvas.
-	 * Returns true if only of subset of the canvas is used.
+	 * SetRenderArea sets the render area from the 2d canvas
 	 */
 	virtual void	SetRenderArea()=0;
 
@@ -200,7 +195,6 @@ public:
 	 * @return true if stereo mode is enabled.
 	 */
 	virtual bool	Stereo()=0;
-	virtual bool	InterlacedStereo()=0;
 	/**
 	 * Sets which eye buffer subsequent primitives will be rendered to.
 	 */
@@ -223,18 +217,39 @@ public:
 	
 	// Drawing Functions
 	/**
-	 * IndexPrimitives: Renders primitives from mesh slot.
-	 */
-	virtual void IndexPrimitives(class RAS_MeshSlot& ms)=0;
-	virtual void IndexPrimitivesMulti(class RAS_MeshSlot& ms)=0;
+	 * IndexPrimitives: Renders primitives.
+	 * @param vertexarrays is an array of vertex arrays
+	 * @param indexarrays is an array of index arrays
+	 * @param mode determines the type of primitive stored in the vertex/index arrays
+	 * @param useObjectColor will render the object using @param rgbacolor instead of 
+	 *  vertex colors.
+	 */
+	virtual void IndexPrimitives( const vecVertexArray& vertexarrays,
+							const vecIndexArrays & indexarrays,
+							DrawMode mode,
+							bool useObjectColor,
+							const MT_Vector4& rgbacolor,
+							class KX_ListSlot** slot)=0;
+
+	virtual void IndexPrimitivesMulti( 
+						const vecVertexArray& vertexarrays,
+						const vecIndexArrays & indexarrays,
+						DrawMode mode,
+						bool useObjectColor,
+						const MT_Vector4& rgbacolor,
+						class KX_ListSlot** slot)=0;
 
 	/**
 	 * IndexPrimitives_3DText will render text into the polygons.
 	 * The text to be rendered is from @param rendertools client object's text property.
 	 */
-	virtual void	IndexPrimitives_3DText(class RAS_MeshSlot& ms,
+	virtual void	IndexPrimitives_3DText( const vecVertexArray& vertexarrays,
+							const vecIndexArrays & indexarrays,
+							DrawMode mode,
 							class RAS_IPolyMaterial* polymat,
-							class RAS_IRenderTools* rendertools)=0;
+							class RAS_IRenderTools* rendertools,
+							bool useObjectColor,
+							const MT_Vector4& rgbacolor)=0;
 
 	virtual void	SetProjectionMatrix(MT_CmMatrix4x4 & mat)=0;
 	/* This one should become our final version, methinks. */
@@ -256,6 +271,9 @@ public:
 	virtual const	MT_Point3& GetCameraPosition()=0;
 	/**
 	 */
+	virtual void	LoadViewMatrix()=0;
+	/**
+	 */
 	virtual void	SetFog(float start,
 						   float dist,
 						   float r,
@@ -291,6 +309,9 @@ public:
 	 */
 	virtual int	GetDrawingMode()=0;
 	/**
+	 */
+	virtual void	EnableTextures(bool enable)=0;
+	/**
 	 * Sets face culling
 	 */	
 	virtual void	SetCullFace(bool enable)=0;
@@ -364,9 +385,7 @@ public:
 	virtual void	SetAttribNum(int num) = 0;
 	virtual void	SetTexCoord(TexCoGen coords, int unit) = 0;
 	virtual void	SetAttrib(TexCoGen coords, int unit) = 0;
-
-	virtual const MT_Matrix4x4&	GetViewMatrix() const = 0;
-	virtual const MT_Matrix4x4&	GetViewInvMatrix() const = 0;
+	virtual void	GetViewMatrix(MT_Matrix4x4 &mat) const = 0;
 
 	virtual bool	QueryLists(){return false;}
 	virtual bool	QueryArrays(){return false;}
@@ -379,7 +398,6 @@ public:
 	virtual void	SetMotionBlurState(int newstate)=0;
 
 	virtual void	SetBlendingMode(int blendmode)=0;
-	virtual void	SetFrontFace(bool ccw)=0;
 };
 
 #endif //__RAS_IRASTERIZER