GRAPHICS: Add MaterialManager::setAlphaModifier()

xoreos · Jan 28, 2014 · d06fea8 · d06fea8
1 parent aabb2c9
commit d06fea8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/src/graphics/materialman.cpp b/src/graphics/materialman.cpp
@@ -234,6 +234,14 @@ void MaterialManager::setColorModifier(const Ogre::MaterialPtr &material, float
 	texState->setAlphaOperation(Ogre::LBX_MODULATE, Ogre::LBS_CURRENT, Ogre::LBS_MANUAL, a, a, 1.0);
 }
 
+void MaterialManager::setAlphaModifier(const Ogre::MaterialPtr &material, float a) {
+	Ogre::TextureUnitState *texState = getColorModifier(material);
+	if (!texState)
+		texState = addColorModifier(material);
+
+	texState->setAlphaOperation(Ogre::LBX_MODULATE, Ogre::LBS_CURRENT, Ogre::LBS_MANUAL, a, a, 1.0);
+}
+
 Ogre::TextureUnitState *MaterialManager::getColorModifier(const Ogre::MaterialPtr &material) {
 	uint count = material->getTechnique(0)->getPass(0)->getNumTextureUnitStates();
 	for (uint i = 0; i < count; i++) {
@@ -249,6 +257,9 @@ Ogre::TextureUnitState *MaterialManager::addColorModifier(const Ogre::MaterialPt
 	Ogre::TextureUnitState *texState = material->getTechnique(0)->getPass(0)->createTextureUnitState();
 	texState->setName("colormodifier");
 
+	texState->setColourOperationEx(Ogre::LBX_SOURCE1, Ogre::LBS_CURRENT, Ogre::LBS_CURRENT);
+	texState->setAlphaOperation(Ogre::LBX_SOURCE1, Ogre::LBS_CURRENT, Ogre::LBS_CURRENT);
+
 	return texState;
 }
 

diff --git a/src/graphics/materialman.h b/src/graphics/materialman.h
@@ -96,6 +96,8 @@ class MaterialManager : public Common::Singleton<MaterialManager> {
 
 	/** Change the material's color modifier. */
 	void setColorModifier(const Ogre::MaterialPtr &material, float r, float g, float b, float a = 1.0);
+	/** Change the material's alpha modifier. */
+	void setAlphaModifier(const Ogre::MaterialPtr &material, float a);
 
 private:
 	void create(const MaterialDeclaration &decl, Ogre::MaterialPtr material);