Changeset 9401 for code/branches/shaders

Timestamp:

Oct 16, 2012, 3:30:20 PM (12 years ago)

Author:

davidsa

Message:

Orxonox::Mesh: Added functions setMaterial() and getMaterial() to easily attach a material/shader to a Mesh via the provided functions in Ogre::Entity and Ogre::SubEntity

Location:

code/branches/shaders/src/libraries/tools

Files:

• Mesh.cc (modified) (2 diffs)
• Mesh.h (modified) (1 diff)

code/branches/shaders/src/libraries/tools/Mesh.cc

@@ -33 +33 @@
 #include <string>
 #include <OgreEntity.h>
+#include <OgreSubEntity.h>
 #include <OgreSceneManager.h>
 
@@ -93 +94 @@
     }
 
+    void Mesh::setMaterial(const std::string& name)
+    {
+        if (this->entity_)
+            this->entity_->setMaterialName(name);
+    }
+
+    const std::string& Mesh::getMaterial() const
+    {
+        if (this->entity_)
+        {
+            if(this->entity_->getSubEntity(0))
+                return this->entity_->getSubEntity(0)->getMaterialName(); //return the Material of the first SubEntity, should be enough for now
+            else
+                return BLANKSTRING;
+        }
+        else
+            return BLANKSTRING;
+    }
+
     void Mesh::setVisible(bool bVisible)
     {

code/branches/shaders/src/libraries/tools/Mesh.h

@@ -48 +48 @@
             const std::string& getName() const;
 
+            void setMaterial(const std::string& name);
+            const std::string& getMaterial() const;
+
             void setVisible(bool bVisible);
             bool isVisible() const;