rename texureBlend functions to textureBlend

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

examples/Demo/CDemo.cpp

@@ -540,7 +540,7 @@ void CDemo::loadSceneData()
 	campFire->setMaterialFlag(video::EMF_ZWRITE_ENABLE, false);
 	campFire->setMaterialTexture(0, driver->getTexture("../../media/fireball.bmp"));
 	campFire->setMaterialType(video::EMT_ONETEXTURE_BLEND);
-	campFire->getMaterial(0).MaterialTypeParam=video::pack_texureBlendFunc(video::EBF_ONE, video::EBF_ONE_MINUS_SRC_ALPHA, video::EMFN_MODULATE_1X, video::EAS_VERTEX_COLOR);
+	campFire->getMaterial(0).MaterialTypeParam=video::pack_textureBlendFunc(video::EBF_ONE, video::EBF_ONE_MINUS_SRC_ALPHA, video::EMFN_MODULATE_1X, video::EAS_VERTEX_COLOR);
 
 	// load music
 

include/IQ3Shader.h

@@ -269,7 +269,7 @@ namespace quake3
 					// gl_zero gl_src_color == gl_dst_color gl_zero
 					case video::EBF_SRC_COLOR:
 						blendfunc.type = video::EMT_ONETEXTURE_BLEND;
-						blendfunc.param0 = video::pack_texureBlendFunc ( video::EBF_DST_COLOR, video::EBF_ZERO, blendfunc.modulate );
+						blendfunc.param0 = video::pack_textureBlendFunc ( video::EBF_DST_COLOR, video::EBF_ZERO, blendfunc.modulate );
 						blendfunc.isTransparent = 1;
 						resolved = 1;
 						break;
@@ -314,7 +314,7 @@ namespace quake3
 			case 12:
 				// filter = gl_dst_color gl_zero or gl_zero gl_src_color
 				blendfunc.type = video::EMT_ONETEXTURE_BLEND;
-				blendfunc.param0 = video::pack_texureBlendFunc ( video::EBF_DST_COLOR, video::EBF_ZERO, blendfunc.modulate );
+				blendfunc.param0 = video::pack_textureBlendFunc ( video::EBF_DST_COLOR, video::EBF_ZERO, blendfunc.modulate );
 				blendfunc.isTransparent = 1;
 				resolved = 1;
 				break;
@@ -346,7 +346,7 @@ namespace quake3
 		if ( 0 == resolved )
 		{
 			blendfunc.type = video::EMT_ONETEXTURE_BLEND;
-			blendfunc.param0 = video::pack_texureBlendFunc (
+			blendfunc.param0 = video::pack_textureBlendFunc (
 					(video::E_BLEND_FACTOR) srcFact,
 					(video::E_BLEND_FACTOR) dstFact,
 					blendfunc.modulate);

include/SMaterial.h

@@ -113,7 +113,7 @@ namespace video
 
 	//! EMT_ONETEXTURE_BLEND: pack srcFact, dstFact, Modulate and alpha source to MaterialTypeParam
 	/** alpha source can be an OR'ed combination of E_ALPHA_SOURCE values. */
-	inline f32 pack_texureBlendFunc ( const E_BLEND_FACTOR srcFact, const E_BLEND_FACTOR dstFact, const E_MODULATE_FUNC modulate=EMFN_MODULATE_1X, const u32 alphaSource=EAS_TEXTURE )
+	inline f32 pack_textureBlendFunc ( const E_BLEND_FACTOR srcFact, const E_BLEND_FACTOR dstFact, const E_MODULATE_FUNC modulate=EMFN_MODULATE_1X, const u32 alphaSource=EAS_TEXTURE )
 	{
 		const u32 tmp = (alphaSource << 12) | (modulate << 8) | (srcFact << 4) | dstFact;
 		return FR(tmp);
@@ -121,7 +121,7 @@ namespace video
 
 	//! EMT_ONETEXTURE_BLEND: unpack srcFact & dstFact and Modulo to MaterialTypeParam
 	/** The fields don't use the full byte range, so we could pack even more... */
-	inline void unpack_texureBlendFunc ( E_BLEND_FACTOR &srcFact, E_BLEND_FACTOR &dstFact,
+	inline void unpack_textureBlendFunc ( E_BLEND_FACTOR &srcFact, E_BLEND_FACTOR &dstFact,
 			E_MODULATE_FUNC &modulo, u32& alphaSource, const f32 param )
 	{
 		const u32 state = IR(param);

source/Irrlicht/CD3D9Driver.cpp

@@ -1443,7 +1443,7 @@ void CD3D9Driver::draw2D3DVertexPrimitiveList(const void* vertices,
 			E_BLEND_FACTOR dstFact;
 			E_MODULATE_FUNC modulo;
 			u32 alphaSource;
-			unpack_texureBlendFunc ( srcFact, dstFact, modulo, alphaSource, Material.MaterialTypeParam);
+			unpack_textureBlendFunc ( srcFact, dstFact, modulo, alphaSource, Material.MaterialTypeParam);
 			setRenderStates2DMode(alphaSource&video::EAS_VERTEX_COLOR, (Material.getTexture(0) != 0), (alphaSource&video::EAS_TEXTURE) != 0);
 		}
 		else
@@ -3306,8 +3306,9 @@ bool CD3D9Driver::setClipPlane(u32 index, const core::plane3df& plane, bool enab
 	if (index >= MaxUserClipPlanes)
 		return false;
 
-	pID3DDevice->SetClipPlane(index, (const float*)&plane);
-	enableClipPlane(index, enable);
+	HRESULT ok = pID3DDevice->SetClipPlane(index, (const float*)&plane);
+	if (D3D_OK == ok)
+		enableClipPlane(index, enable);
 	return true;
 }
 
@@ -3318,12 +3319,15 @@ void CD3D9Driver::enableClipPlane(u32 index, bool enable)
 	if (index >= MaxUserClipPlanes)
 		return;
 	DWORD renderstate;
-	pID3DDevice->GetRenderState(D3DRS_CLIPPLANEENABLE, &renderstate);
-	if (enable)
-		renderstate |= (1 << index);
-	else
-		renderstate &= ~(1 << index);
-	pID3DDevice->SetRenderState(D3DRS_CLIPPLANEENABLE, renderstate);
+	HRESULT ok = pID3DDevice->GetRenderState(D3DRS_CLIPPLANEENABLE, &renderstate);
+	if (S_OK == ok)
+	{
+		if (enable)
+			renderstate |= (1 << index);
+		else
+			renderstate &= ~(1 << index);
+		ok = pID3DDevice->SetRenderState(D3DRS_CLIPPLANEENABLE, renderstate);
+	}
 }
 
 

source/Irrlicht/CD3D9MaterialRenderer.h

@@ -129,7 +129,7 @@ public:
 			E_BLEND_FACTOR srcFact,dstFact;
 			E_MODULATE_FUNC modulate;
 			u32 alphaSource;
-			unpack_texureBlendFunc ( srcFact, dstFact, modulate, alphaSource, material.MaterialTypeParam );
+			unpack_textureBlendFunc ( srcFact, dstFact, modulate, alphaSource, material.MaterialTypeParam );
 
 			if (srcFact == EBF_SRC_COLOR && dstFact == EBF_ZERO)
 			{

source/Irrlicht/CGeometryCreator.cpp

@@ -870,7 +870,7 @@ IMesh* CGeometryCreator::createVolumeLightMesh(
 	Buffer->recalculateBoundingBox();
 
 	Buffer->Material.MaterialType = video::EMT_ONETEXTURE_BLEND;
-	Buffer->Material.MaterialTypeParam = pack_texureBlendFunc( video::EBF_SRC_COLOR, video::EBF_SRC_ALPHA, video::EMFN_MODULATE_1X );
+	Buffer->Material.MaterialTypeParam = pack_textureBlendFunc( video::EBF_SRC_COLOR, video::EBF_SRC_ALPHA, video::EMFN_MODULATE_1X );
 
 	Buffer->Material.Lighting = false;
 	Buffer->Material.ZWriteEnable = false;

source/Irrlicht/COpenGLDriver.cpp

@@ -1731,7 +1731,7 @@ void COpenGLDriver::draw2DVertexPrimitiveList(const void* vertices, u32 vertexCo
 		E_BLEND_FACTOR dstFact;
 		E_MODULATE_FUNC modulo;
 		u32 alphaSource;
-		unpack_texureBlendFunc ( srcFact, dstFact, modulo, alphaSource, Material.MaterialTypeParam);
+		unpack_textureBlendFunc ( srcFact, dstFact, modulo, alphaSource, Material.MaterialTypeParam);
 		setRenderStates2DMode(alphaSource&video::EAS_VERTEX_COLOR, (Material.getTexture(0) != 0), (alphaSource&video::EAS_TEXTURE) != 0);
 	}
 	else

source/Irrlicht/COpenGLMaterialRenderer.h

@@ -77,7 +77,7 @@ public:
 			E_BLEND_FACTOR srcFact,dstFact;
 			E_MODULATE_FUNC modulate;
 			u32 alphaSource;
-			unpack_texureBlendFunc(srcFact, dstFact, modulate, alphaSource, material.MaterialTypeParam);
+			unpack_textureBlendFunc(srcFact, dstFact, modulate, alphaSource, material.MaterialTypeParam);
 
 #ifdef GL_ARB_texture_env_combine
 			glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE_ARB);

source/Irrlicht/CTRTextureBlend.cpp

@@ -137,7 +137,7 @@ void CTRTextureBlend::setParam ( u32 index, f32 value)
 	E_BLEND_FACTOR srcFact,dstFact;
 	E_MODULATE_FUNC modulate;
 	u32 alphaSrc;
-	unpack_texureBlendFunc ( srcFact, dstFact, modulate, alphaSrc, value );
+	unpack_textureBlendFunc ( srcFact, dstFact, modulate, alphaSrc, value );
 
 	fragmentShader = 0;