Changeset 11597 for code/branches/SOBv2_HS17

Timestamp:

Nov 27, 2017, 2:21:11 PM (7 years ago)

Author:

varxth

Message:

Collisionshape of fireball

Location:

code/branches/SOBv2_HS17

Files:

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

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

@@ -64 +64 @@
         </Template> 
 
-                                        <!--Test Fireball-->
-
 
         <Template name=fireball>
-                <SOBFireball collisionType="dynamic" speed=80>
+                <SOBFireball collisionType="dynamic" speed=90>
                         <attached>
                                 <Model mesh="planets/sol.mesh" position="0,0,0" scale=3 pitch=90/> 
@@ -74 +72 @@
                         </attached>
                         <collisionShapes>
-                                <SphereCollisionShape position="0,0,0" halfExtents="5,5,5" />                   
+                                <SphereCollisionShape position="0,0,0" radius="3" />                    
                         </collisionShapes>
                 </SOBFireball>

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

@@ -160 +160 @@
 
         else if (fireball != nullptr && !(fireball->hasCollided_)){
-            //this-> die();
+            PowerUpCounter_--;
+            this->changeClothes();
         }
 

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

@@ -165 +165 @@
             velocity.x = dir*speed_;
             velocity.y = 0;
-            if(hitCounter_ >= 3) velocity.y = 50;
+            if(hitCounter_ >= 3) velocity.y = 0.1*speed_;
             setVelocity(velocity);
 

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

@@ -65 +65 @@
         float v_z = otherObject->getVelocity().z;
         int collDisZ_ = getPosition().z - contactPoint.getPositionWorldOnB().getZ();
-        orxout() << "Distanz in z: " << collDisZ_ << endl;
         if (!used_ && v_z > 50.0 && collDisZ_ > 0) {
             used_ = true;