Changeset 11517

Timestamp:

Oct 30, 2017, 4:05:01 PM (6 years ago)

Author:

varxth

Message:

Started to implement change of clothes of figure after a power up.

Location:

code/branches/SOBv2_HS17

Files:

• BlenderFilesSOB (added)
• BlenderFilesSOB/orxo.png (added)
• BlenderFilesSOB/orxo7.blend (added)
• BlenderFilesSOB/orxo7.blend1 (added)
• BlenderFilesSOB/orxo7.blend2 (added)
• BlenderFilesSOB/orxo8.blend (added)
• BlenderFilesSOB/orxo_texturegross.xcf (added)
• data/levels/SOB.oxw (modified) (2 diffs)
• src/modules/superorxobros/SOBFigure.cc (modified) (4 diffs)
• src/orxonox/graphics/Model.cc (modified) (2 diffs)

code/branches/SOBv2_HS17/data/levels/SOB.oxw

@@ -48 +48 @@
 
 
-
         <Template name=sobFigureTemplate>
                 <SOBFigure camerapositiontemplate=sobfigurecameras collisionType="dynamic" position="0,0,30">
@@ -62 +61 @@
 
                 </SOBFigure>
-        </Template>
+        </Template> 
+
+
+
+
+
 
         <Level

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

@@ -65 +65 @@
         firePressed_ = false;
         collDisZ_ = 0;
+
         //Times and turning
         timeSinceLastFire_ = 0.0;
@@ -110 +111 @@
             mush->hasCollided_ = true; // needed because of destroyLater takes some time and player should receive points only once
 
-            Vector3 scale = {1.2, 1.2, 1.2};
-            this->setScale3D(scale);
-            /*if (this->hasPhysics() && this->collisionShape_ != nullptr)
+
+            // 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)
             {
-             this->collisionShape_->setScale3D(scale);
-            }*/
-
+                Model* FiguresModel = orxonox_cast<Model*>(*it);
+                if (FiguresModel != nullptr)
+                {
+                    std::string name = "orxo_material_gross";
+                    FiguresModel->setMaterial(name);
+                }
+            }   
         }
         //Check if otherObject is a Gumba (that walking enemies)
@@ -136 +143 @@
                     gotPowerUp_ = false;
                     
-                    Vector3 scale = {1, 1, 1};
-                    this->setScale3D(scale);
-                    /*if (this->hasPhysics() && this->collisionShape_ != nullptr)
-                    {
-                     this->collisionShape_->setScale3D(scale);
-                    }*/
-
+                   // TODO: reset to old clothes of figure
+                       // 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";
+                    FiguresModel->setMaterial(name);
+                }
+            }  
                     gumba->destroyLater();
                     gumba->hasCollided_ = true;
@@ -269 +282 @@
 
         //If player hits space and collides against an object under him then jump
-        if (inputAllowed && firePressed_ && isColliding_ && (collDisZ_ >= 7.75 && collDisZ_ <+ 8.25)) {
+        if (inputAllowed && firePressed_ && isColliding_ && (collDisZ_ >= 0 && collDisZ_ <+ 10)) {
+        //if (inputAllowed && firePressed_ && isColliding_ ) {
+
             gravityAcceleration_ = 100.0;
             velocity.z = 110; 

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

@@ -40 +40 @@
 #include "graphics/MeshLodInformation.h"
 #include "Level.h"
+
 
 namespace orxonox
@@ -155 +156 @@
         this->mesh_.setMaterial(this->materialName_);
     }
+
 
     void Model::changedShadows()