Changeset 11599 for code

Timestamp:

Nov 27, 2017, 3:28:41 PM (7 years ago)

Author:

varxth

Message:

fireball with particle spawner

Location:

code/branches/SOBv2_HS17

Files:

• data/levels/SOB.oxw (modified) (2 diffs)
• src/modules/superorxobros/SOBFigure.cc (modified) (4 diffs)
• src/modules/superorxobros/SOBFireball.cc (modified) (4 diffs)
• src/modules/superorxobros/SOBFireball.h (modified) (1 diff)

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

@@ -57 +57 @@
 
                         <collisionShapes>
-                                <BoxCollisionShape position="-2,0,2" halfExtents="3,1,10" />
+                                <BoxCollisionShape position="0,0,2" halfExtents="3,1,10" />
                         </collisionShapes>
 
@@ -69 +69 @@
                         <attached>
                                 <Model mesh="planets/sol.mesh" position="0,0,0" scale=3 pitch=90/> 
+                                
+                                <ParticleSpawner source="Orxonox/fire4" startdelay=0  position="-4,0,0" visible="false"/>
                                 
                         </attached>

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

@@ -23 +23 @@
  *      Julien Kindle
  *   Co-authors:
+ *      Noah Zarro
+ *      Theo von Arx
  *      
  *
@@ -160 +162 @@
 
         else if (fireball != nullptr && !(fireball->hasCollided_)){
+            if(PowerUpCounter_ == 0){
+                    this->die();
+                } 
             PowerUpCounter_--;
             this->changeClothes();
@@ -232 +237 @@
             particlespawner_ = object;
         }
-    }
+
+    }
+    
 
 
@@ -300 +307 @@
         else
             particlespawner_->setVisible(false); 
-
+        
 
         //If player hits space and collides against an object under him then jump
         if (inputAllowed && firePressed_ && isColliding_ && (collDisZ_ >= 0 && collDisZ_ <+ 10)) {
-            gravityAcceleration_ = 100.0;
-            velocity.z = 110; 
+            gravityAcceleration_ = 350;
+            velocity.z = 175; 
         }
 

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

@@ -42 +42 @@
 #include "util/Output.h"
 #include <BulletCollision/NarrowPhaseCollision/btManifoldPoint.h>
+#include "graphics/ParticleSpawner.h"
+
 
 
@@ -58 +60 @@
         this->enableCollisionCallback();
         gravityAcceleration_ = 350.0;
+
         speed_ = 0;
         hasCollided_=false;
@@ -68 +71 @@
         collDisZ_ = 0;
         hitCounter_ = 0;
-        
+        particlespawner_ = NULL ;
+
+
+
+   
+
     }
 
@@ -147 +155 @@
         SUPER(SOBFireball, tick, dt);
 
+        //the particle spawner that generates the fire from the backpack when pressed
+        if (particlespawner_ == NULL) {
+            for (WorldEntity* object : this->getAttachedObjects())
+            {
+               if (object->isA(Class(ParticleSpawner)))
+                particlespawner_ = object;
+            }
+
+        }
+
+        if(particlespawner_ != NULL)
+            particlespawner_->setVisible(true);
         if (!changeAllowed_) {
             changedOn_+= dt;

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

@@ -72 +72 @@
             float changedOn_;
             int hitCounter_;
+            WorldEntity* particlespawner_;
+