Changeset 11534 for code/branches/SOBv2_HS17/src

Timestamp:

Nov 6, 2017, 2:51:31 PM (7 years ago)

Author:

varxth

Message:

added setSubMaterial(…) to Model.cc and Mesh.cc

Location:

code/branches/SOBv2_HS17/src

Files:

• libraries/tools/Mesh.cc (modified) (2 diffs)
• libraries/tools/Mesh.h (modified) (1 diff)
• modules/superorxobros/SOBFigure.cc (modified) (1 diff)
• orxonox/graphics/Model.cc (modified) (2 diffs)
• orxonox/graphics/Model.h (modified) (1 diff)

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

@@ -79 +79 @@
     }
 
+    
+
     void Mesh::setCastShadows(bool bCastShadows)
     {
@@ -98 +100 @@
         if (this->entity_)
             this->entity_->setMaterialName(name);
+    }
+
+    // PRE: a valid  Ogre::Entity* entity with a valid subentity at index
+    // POST: changed material of subentity at index to name
+    void Mesh::setSubMaterial(const std::string& name, const int index){
+         if (this->entity_ && this->entity_->getSubEntity(index))
+        {
+                this->entity_->getSubEntity(index)->setMaterialName(name);
+        }
+        else 
+            orxout() << "ERROR at Index " << index << endl;
     }
 

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

@@ -50 +50 @@
             void setMaterial(const std::string& name);
             const std::string& getMaterial() const;
-
+            void setSubMaterial(const std::string& name, const int index);
             void setVisible(bool bVisible);
             bool isVisible() const;

code/branches/SOBv2_HS17/src/modules/superorxobros/SOBFigure.cc

@@ -121 +121 @@
                 {
                     std::string name = "orxo_material_gross";
-                    FiguresModel->setMaterial(name);
+                    FiguresModel->setSubMaterial(name, 0);
                 }
             }   

code/branches/SOBv2_HS17/src/orxonox/graphics/Model.cc

@@ +1 @@
+
 /*
  *   ORXONOX - the hottest 3D action shooter ever to exist
@@ -155 +156 @@
     {
         this->mesh_.setMaterial(this->materialName_);
+    }
+
+    // PRE: a valid  Ogre::Entity* entity with a valid subentity at index
+    // POST: changed material of subentity at index to name
+    void Model::setSubMaterial(const std::string& name, const int index){
+        this->mesh_.setSubMaterial(name, index);
     }
 

code/branches/SOBv2_HS17/src/orxonox/graphics/Model.h

@@ -86 +86 @@
                 { return this->materialName_; }
 
+            void setSubMaterial(const std::string& name, const int index);
+
+
         protected:
             /**