Changeset 11392 for code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFigure.cc

Timestamp:

Apr 6, 2017, 3:32:35 PM (7 years ago)

Author:

jkindle

Message:

Lululululululululu

File:

• code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBFigure.cc (modified) (7 diffs)

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

@@ -39 +39 @@
 #include "graphics/Camera.h"
 
-
 namespace orxonox
 {
@@ -58 +57 @@
         lastSpeed_z = 0.0;
 
-        gravityAcceleration_ = 250.0;//8.0
+        gravityAcceleration_ = 250.0;
+        pitch_ = 0.0;
 
         dead_ = false;
@@ -99 +99 @@
         if (firePressed_ && std::abs(velocity.z) < 0.07 && std::abs(lastSpeed_z) < 0.07) {
             velocity.z = 150;
-        } 
+        }
+
+      // rotate(1,getOrientation()* WorldEntity::FRONT)
 
         //Left-right movement with acceleration
@@ -105 +107 @@
             if (std::abs(velocity.x) < maxvelocity_x) {
                 velocity.x += speedAddedPerTick;
+                // if (pitch_ > 0.0) {
+                //     pitch -= turn_fac*dt);
+                // }
             }
         } else if (moveLeftPressed_) {
@@ -112 +117 @@
         } else {
             velocity.x /= 1.1;
-        } 
-        
+        }
+
 
         velocity.z -= gravityAcceleration_*dt;
@@ -134 +139 @@
 
 
+
     }
 
@@ -149 +155 @@
 
 }
-
-
-
-
-
-   /* void SOBFigure::CollisionWithEnemy(SOBEnemy* enemy)
-    {
-        if (rocketActive_ == nullptr && propellerActive_ == nullptr && shieldActive_ == nullptr)
-        {
-            dead_ = true;
-        }
-    }*/