Changeset 11766 for code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.cc

Timestamp:

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

Author:

landauf

Message:

merged SOBv2_HS17

Location:

code/branches/Presentation_HS17_merge

Files:

• . (modified) (1 prop)
• src/modules/superorxobros/SOBGumba.cc (modified) (5 diffs)

code/branches/Presentation_HS17_merge/src/modules/superorxobros/SOBGumba.cc

@@ -60 +60 @@
         changeAllowed_ = true;
         changedOn_ = 0.0;
+        creator_ = nullptr;
+        maxLifetime_ = 10;
+        lifetime_ = 0;
         
     }
@@ -91 +94 @@
     }
 
+    void SOBGumba::setDirection(const bool direction)
+    {
+        if(direction)
+        {
+            goesRight_=true;
+        }
+        else
+        {
+            goesRight_=false;
+        }
+    }
 
+    void SOBGumba::die(){
+        Vector3 velocity = this->getVelocity();
+        velocity.y = speed_;
+        this->setVelocity(velocity);
+    }
 
     void SOBGumba::tick(float dt)
@@ -100 +119 @@
             changedOn_+= dt;
             // After a collision, we don't listen for collisions for 200ms - that's because one wall can cause several collisions!
-            if (changedOn_> 0.200) {
+            if (changedOn_> 0.400) {
                 changeAllowed_ = true;
                 changedOn_ = 0.0;
@@ -106 +125 @@
             }
         }
-        
+    
 
         int dir = 1;
@@ -113 +132 @@
 
         Vector3 velocity = getVelocity();
+        if(velocity.z > -1 && velocity.z < 1)
+        {
+            velocity.x = dir*speed_;
+        }      
+
         velocity.z -= gravityAcceleration_*dt;
-        velocity.x = dir*speed_;
         setVelocity(velocity);
 
         lastPos_ = getPosition();
+
+        if (creator_ != nullptr)
+        {
+            lifetime_ += dt;
+            if(lifetime_>maxLifetime_)
+            {
+                
+            }
+        }
+
+        if(abs(this->getPosition().z) > 1000) delete this;
+
     }
-
-
 }