Changeset 11400 for code/branches/SuperOrxoBros_FS17/src/modules/superorxobros

Timestamp:

Apr 13, 2017, 3:30:24 PM (8 years ago)

Author:

jkindle

Message:

Added jetpack, rotation of player, Questionmark-blocks and Hitlistener for the QBlocks. Made description for David in XML file for usage of hittable blocks

Location:

code/branches/SuperOrxoBros_FS17/src/modules/superorxobros

Files:

• CMakeLists.txt (modified) (1 diff)
• SOBFigure.cc (modified) (7 diffs)
• SOBFigure.h (modified) (3 diffs)
• SOBItem.cc (modified) (1 diff)
• SOBItem.h (modified) (1 diff)
• SOBPrereqs.h (modified) (1 diff)
• SOBQBlock.cc (added)
• SOBQBlock.h (added)

code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/CMakeLists.txt

@@ -5 +5 @@
   SOBFigure.cc
   SOBItem.cc
-  
+  SOBQBlock.cc
 
 )

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

@@ -38 +38 @@
 #include "graphics/Model.h"
 #include "graphics/Camera.h"
+#include "graphics/ParticleSpawner.h"
+
 
 namespace orxonox
@@ -56 +58 @@
         timeSinceLastFire_ = 0.0;
         lastSpeed_z = 0.0;
-
-        gravityAcceleration_ = 250.0;
+        isColliding_ = true;
+        particlespawner_ = NULL;
+
+        gravityAcceleration_ = 350.0;
         pitch_ = 0.0;
 
         dead_ = false;
         setAngularFactor(0.0);
-    }
+         this->enableCollisionCallback();
+    }
+
+
+
+    bool SOBFigure::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) {
+
+        isColliding_ = true;
+
+
+return true;
+    }
+
+
 
     void SOBFigure::XMLPort(Element& xmlelement, XMLPort::Mode mode)
@@ -70 +87 @@
     }
 
+
+
     void SOBFigure::tick(float dt)
     {
         SUPER(SOBFigure, tick, dt);
+
+        if (particlespawner_ == NULL) {
+            for (WorldEntity* object : this->getAttachedObjects())
+            {
+                 if (object->isA(Class(ParticleSpawner)))
+                    particlespawner_ = object;
+                    
+            }
+ 
+        }
+       
+
+
+
+
+        if (firePressed_ == false) {
+             gravityAcceleration_ = 350.0;
+
+        }
 
         if (hasLocalController())
@@ -96 +134 @@
 
 
+        //Handle the rocket fire from the jetpack
+        if (velocity.z > 40)
+            particlespawner_->setVisible(true); 
+        else
+            particlespawner_->setVisible(false); 
+
         //If player hits space and does not move in z-dir
-        if (firePressed_ && std::abs(velocity.z) < 0.07 && std::abs(lastSpeed_z) < 0.07) {
-            velocity.z = 150;
+        if (firePressed_ && isColliding_ && std::abs(velocity.z) < 0.1 && std::abs(lastSpeed_z) < 0.1) {
+            gravityAcceleration_ = 100.0;
+            velocity.z = 110; //150
         }
 
       // rotate(1,getOrientation()* WorldEntity::FRONT)
 
+
         //Left-right movement with acceleration
+        float rot = getOrientation().getRoll().valueDegrees();
         if (moveRightPressed_) {
+            if (rot < 0.0)
+                    setOrientation(Vector3::UNIT_Z, getOrientation().getRoll() + dt*Radian(6));
+
             if (std::abs(velocity.x) < maxvelocity_x) {
                 velocity.x += speedAddedPerTick;
+
+                
+
+                
+
                 // if (pitch_ > 0.0) {
                 //     pitch -= turn_fac*dt);
@@ -112 +167 @@
             }
         } else if (moveLeftPressed_) {
+            if (rot >= 0.0)
+                    setOrientation(Vector3::UNIT_Z, getOrientation().getRoll() + dt*Radian(6));
+
             if (std::abs(velocity.x) < maxvelocity_x) {
                 velocity.x -= speedAddedPerTick;
@@ -152 +210 @@
     moveRightPressed_ = false;
     moveDownPressed_ = false;
-    firePressed_ = false;
+    isColliding_ = false;
 
 }
@@ -195 +253 @@
 void SOBFigure::boost(bool boost)
 {
-    firePressed_ = true;
-}
-}
+    firePressed_ = boost;
+}
+}

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

@@ -33 +33 @@
 #include "worldentities/ControllableEntity.h"
 
+
 namespace orxonox
 {
@@ -47 +48 @@
           
             virtual void boost(bool boost) override;
-            
+            virtual  bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
+
         
             //virtual void CollisionWithEnemy(SOBEnemy* enemy);
@@ -69 +71 @@
             SOBCenterpoint* sobcenterpoint;
             float pitch_;
+            bool isColliding_;
+            WorldEntity* particlespawner_;
 
            

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

@@ -67 +67 @@
     bool SOBItem::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) {
 
-orxout() << "Watshc bum baem" << endl;
+//orxout() << "Watshc bum baem" << endl;
 return true;
     }

code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBItem.h

@@ -50 +50 @@
             virtual void touchFigure();
             virtual  bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
-           
+
           
             bool attachedToFigure_;

code/branches/SuperOrxoBros_FS17/src/modules/superorxobros/SOBPrereqs.h

@@ -78 +78 @@
     class SOBFigure;
     class SOBItem;
+    class SOBQBlock;
     /*
     class PongScore;*/