Changeset 11766 for code/branches/Presentation_HS17_merge/src/orxonox/graphics

Timestamp:

Feb 18, 2018, 4:02:50 PM (7 years ago)

Author:

landauf

Message:

merged SOBv2_HS17

Location:

code/branches/Presentation_HS17_merge

Files:

• . (modified) (1 prop)
• src/orxonox/graphics/Model.cc (modified) (3 diffs)
• src/orxonox/graphics/Model.h (modified) (1 diff)

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

@@ +1 @@
+
 /*
  *   ORXONOX - the hottest 3D action shooter ever to exist
@@ -40 +41 @@
 #include "graphics/MeshLodInformation.h"
 #include "Level.h"
+
 
 namespace orxonox
@@ -155 +157 @@
         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);
+    }
+
 
     void Model::changedShadows()

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

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