added:

virtual void OnSetMaterial(const SMaterial& material) { }

to IShaderConstantSetCallBack, so the callback is able to set constants based on the properties of the used material.

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

include/IShaderConstantSetCallBack.h

@@ -24,6 +24,28 @@ public:
 	//! Destructor.
 	virtual ~IShaderConstantSetCallBack() {}
 
+
+	//! Called to let the callBack know the used material (optional method)
+	/**
+	 \code
+	class MyCallBack : public IShaderConstantSetCallBack
+	{
+		const video::SMaterial *UsedMaterial;
+
+		OnSetMaterial(const video::SMaterial& material)
+		{
+			UsedMaterial=&material;
+		}
+
+		OnSetConstants(IMaterialRendererServices* services, s32 userData)
+		{
+			services->setVertexShaderConstant("myColor", reinterpret_cast<f32*>(&UsedMaterial->color), 4);
+		}
+	}
+	\endcode
+	*/
+	virtual void OnSetMaterial(const SMaterial& material) { }
+
 	//! Called by the engine when the vertex and/or pixel shader constants for an material renderer should be set.
 	/**
 	 Implement the IShaderConstantSetCallBack in an own class and implement your own

source/Irrlicht/CD3D8ShaderMaterialRenderer.cpp

@@ -132,6 +132,10 @@ void CD3D8ShaderMaterialRenderer::OnSetMaterial(const video::SMaterial& material
 			BaseMaterial->OnSetMaterial(material, material, true, services);
 	}
 
+	//let callback know used material
+	if (CallBack)
+		CallBack->OnSetMaterial(material);
+
 	services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
 }
 

source/Irrlicht/CD3D9ShaderMaterialRenderer.cpp

@@ -128,6 +128,10 @@ void CD3D9ShaderMaterialRenderer::OnSetMaterial(const video::SMaterial& material
 			BaseMaterial->OnSetMaterial(material, material, true, services);
 	}
 
+	//let callback know used material
+	if (CallBack)
+		CallBack->OnSetMaterial(material);
+
 	services->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);
 }
 

source/Irrlicht/COpenGLSLMaterialRenderer.cpp

@@ -141,6 +141,10 @@ void COpenGLSLMaterialRenderer::OnSetMaterial(const video::SMaterial& material,
 			BaseMaterial->OnSetMaterial(material, material, true, this);
 	}
 
+	//let callback know used material
+	if (CallBack)
+		CallBack->OnSetMaterial(material);
+
 	for (u32 i=0; i<MATERIAL_MAX_TEXTURES; ++i)
 		Driver->setTexture(i, material.getTexture(i));
 	Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);

source/Irrlicht/COpenGLShaderMaterialRenderer.cpp

@@ -121,6 +121,10 @@ void COpenGLShaderMaterialRenderer::OnSetMaterial(const video::SMaterial& materi
 			BaseMaterial->OnSetMaterial(material, material, true, services);
 	}
 
+	//let callback know used material
+	if (CallBack)
+		CallBack->OnSetMaterial(material);
+
 	for (u32 i=0; i<MATERIAL_MAX_TEXTURES; ++i)
 		Driver->setTexture(i, material.getTexture(i));
 	Driver->setBasicRenderStates(material, lastMaterial, resetAllRenderstates);