Changeset 11538 for code/branches/SOBv2_HS17/src

Timestamp:

Nov 6, 2017, 3:43:57 PM (7 years ago)

Author:

varxth

Message:

function to change clothes

Location:

code/branches/SOBv2_HS17/src/modules/superorxobros

Files:

• SOBFigure.cc (modified) (3 diffs)
• SOBFigure.h (modified) (1 diff)

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

@@ -113 +113 @@
 
             // now, change the clothes of the Figure to red
-            std::set<WorldEntity*> attachedObjects = this->getAttachedObjects();
-            std::set<WorldEntity*>::iterator it;
-            for (it = attachedObjects.begin(); it != attachedObjects.end(); ++it)
-            {
-                Model* FiguresModel = orxonox_cast<Model*>(*it);
-                if (FiguresModel != nullptr)
-                {
-                    std::string name = "orxo_material_gross";
-
-                    FiguresModel->setSubMaterial(name, 4); // 4 is the body
-
-                }
-            }   
-        }
+            std::string name = "orxo_material_gross";
+            this->changeClothes(name);
+            
+        }
+        
         //Check if otherObject is a Gumba (that walking enemies)
 
@@ -146 +137 @@
                     
                    
-            // now, change the clothes of the Figure to old ones
-            std::set<WorldEntity*> attachedObjects = this->getAttachedObjects();
-            std::set<WorldEntity*>::iterator it;
-            for (it = attachedObjects.begin(); it != attachedObjects.end(); ++it)
-            {
-                Model* FiguresModel = orxonox_cast<Model*>(*it);
-                if (FiguresModel != nullptr)
-                {
-                    std::string name = "orxo_material ";
-                    FiguresModel->setMaterial(name);
-                }
-            }  
+           // now, change the clothes of the Figure to old ones
+            std::string name = "orxo_material";
+            this->changeClothes(name);
                     gumba->destroyLater();
                     gumba->hasCollided_ = true;
@@ -405 +387 @@
 
 
-}
+
+// PRE: name is an existing name of a material. Example orxo_material for orxo_material.material in data_extern/materials
+// POST: clothes of body of player are changed to name
+void SOBFigure::changeClothes(std::string& name){
+            std::set<WorldEntity*> attachedObjects = this->getAttachedObjects();
+            std::set<WorldEntity*>::iterator it;
+            for (it = attachedObjects.begin(); it != attachedObjects.end(); ++it)
+            {
+                Model* FiguresModel = orxonox_cast<Model*>(*it);
+                if (FiguresModel != nullptr)
+                {
+
+                    FiguresModel->setSubMaterial(name, 4); // 4 is the body
+
+                }
+            }   
+}
+
+}

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

@@ -46 +46 @@
             virtual void boost(bool boost) override;
             virtual  bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
+            void changeClothes(std::string& name);
 
             bool dead_;