Changeset 9402

Timestamp:

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

Author:

davidsa

Message:

Orxonox::Model: added XMLPort 'material' to easily attach a material/shader to a Model

Location:

code/branches/shaders/src/orxonox/graphics

Files:

• Model.cc (modified) (2 diffs)
• Model.h (modified) (2 diffs)

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

@@ -71 +71 @@
 
         XMLPortParam(Model, "mesh", setMeshSource, getMeshSource, xmlelement, mode);
+        XMLPortParam(Model, "material", setMaterial, getMaterial, xmlelement, mode);
         XMLPortParam(Model, "shadow", setCastShadows, getCastShadows, xmlelement, mode).defaultValues(true);
     }
@@ -109 +110 @@
             }
         }
+    }
+
+    void Model::changedMaterial()
+    {
+        this->mesh_.setMaterial(this->materialName_);
     }
 

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

@@ -63 +63 @@
                 { return this->bCastShadows_; }
 
+            inline void setMaterial(const std::string& materialname)
+                { this->materialName_ = materialname; this->changedMaterial(); }
+            inline const std::string& getMaterial() const
+                { return this->materialName_; }
+
         protected:
             void registerVariables();
             void changedMesh();
+            void changedMaterial();
             void changedShadows();
 
@@ -80 +86 @@
             Mesh mesh_;
             bool bCastShadows_;
+            std::string materialName_;
 
             //LoD