Change the 2d material interface. Renamed methods and cleaned up reset scheme.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@3031 dfc29bdd-3216-0410-991c-e03cc46cb475

include/IVideoDriver.h

@@ -1336,12 +1336,12 @@ namespace video
 		\return Material reference which should be altered to reflect
 		the new settings.
 		*/
-		virtual SMaterial& getInitMaterial2D() =0;
+		virtual SMaterial& getMaterial2D() =0;
 
 		//! Enable the 2d override material
 		/** \param enable Flag which tells whether the material shall be
 		enabled or disabled. */
-		virtual void enableInitMaterial2D(bool enable=true) =0;
+		virtual void enableMaterial2D(bool enable=true) =0;
 
 		//! Returns the graphics card vendor name.
 		virtual core::stringc getVendorInfo() =0;

source/Irrlicht/CNullDriver.cpp

@@ -74,7 +74,7 @@ IImageWriter* createImageWriterPPM();
 CNullDriver::CNullDriver(io::IFileSystem* io, const core::dimension2d<u32>& screenSize)
 : FileSystem(io), MeshManipulator(0), ViewPort(0,0,0,0), ScreenSize(screenSize),
 	PrimitivesDrawn(0), MinVertexCountForVBO(500), TextureCreationFlags(0),
-	InitMaterial2DEnabled(false), AllowZWriteOnTransparent(false)
+	OverrideMaterial2DEnabled(false), AllowZWriteOnTransparent(false)
 {
 	#ifdef _DEBUG
 	setDebugName("CNullDriver");
@@ -161,6 +161,7 @@ CNullDriver::CNullDriver(io::IFileSystem* io, const core::dimension2d<u32>& scre
 		InitMaterial2D.TextureLayer[i].TextureWrapU=video::ETC_REPEAT;
 		InitMaterial2D.TextureLayer[i].TextureWrapV=video::ETC_REPEAT;
 	}
+	OverrideMaterial2D=InitMaterial2D;
 }
 
 
@@ -2165,16 +2166,16 @@ SOverrideMaterial& CNullDriver::getOverrideMaterial()
 
 
 //! Get the 2d override material for altering its values
-SMaterial& CNullDriver::getInitMaterial2D()
+SMaterial& CNullDriver::getMaterial2D()
 {
-	return InitMaterial2D;
+	return OverrideMaterial2D;
 }
 
 
 //! Enable the 2d override material
-void CNullDriver::enableInitMaterial2D(bool enable)
+void CNullDriver::enableMaterial2D(bool enable)
 {
-	InitMaterial2DEnabled=enable;
+	OverrideMaterial2DEnabled=enable;
 }
 
 

source/Irrlicht/CNullDriver.h

@@ -581,10 +581,10 @@ namespace video
 		virtual SOverrideMaterial& getOverrideMaterial();
 
 		//! Get the 2d override material for altering its values
-		virtual SMaterial& getInitMaterial2D();
+		virtual SMaterial& getMaterial2D();
 
 		//! Enable the 2d override material
-		virtual void enableInitMaterial2D(bool enable=true);
+		virtual void enableMaterial2D(bool enable=true);
 
 		//! Only used by the engine internally.
 		virtual void setAllowZWriteOnTransparent(bool flag)
@@ -708,8 +708,9 @@ namespace video
 		SExposedVideoData ExposedData;
 
 		SOverrideMaterial OverrideMaterial;
+		SMaterial OverrideMaterial2D;
 		SMaterial InitMaterial2D;
-		bool InitMaterial2DEnabled;
+		bool OverrideMaterial2DEnabled;
 
 		E_FOG_TYPE FogType;
 		bool PixelFog;

source/Irrlicht/COpenGLDriver.cpp

@@ -2779,11 +2779,11 @@ void COpenGLDriver::setBasicRenderStates(const SMaterial& material, const SMater
 
 
 //! Enable the 2d override material
-void COpenGLDriver::enableInitMaterial2D(bool enable)
+void COpenGLDriver::enableMaterial2D(bool enable)
 {
 	if (!enable)
 		CurrentRenderMode = ERM_NONE;
-	CNullDriver::enableInitMaterial2D(enable);
+	CNullDriver::enableMaterial2D(enable);
 }
 
 
@@ -2820,25 +2820,20 @@ void COpenGLDriver::setRenderStates2DMode(bool alpha, bool texture, bool alphaCh
 
 			Transformation3DChanged = false;
 		}
-		if (!InitMaterial2DEnabled)
+		if (!OverrideMaterial2DEnabled)
 		{
-			SMaterial mat;
-			mat.Lighting=false;
-			mat.ZBuffer=ECFN_NEVER;
-			mat.ZWriteEnable=false;
-			setBasicRenderStates(mat, LastMaterial, true);
-			LastMaterial = mat;
+			setBasicRenderStates(InitMaterial2D, LastMaterial, true);
+			LastMaterial = InitMaterial2D;
 			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 		}
 	}
-	if (InitMaterial2DEnabled)
+	if (OverrideMaterial2DEnabled)
 	{
-		SMaterial mat(InitMaterial2D);
-		mat.Lighting=false;
-		mat.ZBuffer=ECFN_NEVER;
-		mat.ZWriteEnable=false;
-		setBasicRenderStates(mat, LastMaterial, false);
-		LastMaterial = mat;
+		OverrideMaterial2D.Lighting=false;
+		OverrideMaterial2D.ZBuffer=ECFN_NEVER;
+		OverrideMaterial2D.ZWriteEnable=false;
+		setBasicRenderStates(OverrideMaterial2D, LastMaterial, false);
+		LastMaterial = OverrideMaterial2D;
 	}
 
 	if (alphaChannel || alpha)
@@ -2855,7 +2850,7 @@ void COpenGLDriver::setRenderStates2DMode(bool alpha, bool texture, bool alphaCh
 
 	if (texture)
 	{
-		if (!InitMaterial2DEnabled)
+		if (!OverrideMaterial2DEnabled)
 		{
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);

source/Irrlicht/COpenGLDriver.h

@@ -337,7 +337,7 @@ namespace video
 		virtual void enableClipPlane(u32 index, bool enable);
 
 		//! Enable the 2d override material
-		virtual void enableInitMaterial2D(bool enable=true);
+		virtual void enableMaterial2D(bool enable=true);
 
 		//! Returns the graphics card vendor name.
 		virtual core::stringc getVendorInfo() {return VendorName;}