Changeset 11556 for code/branches/SOBv2_HS17

Timestamp:

Nov 13, 2017, 4:07:13 PM (7 years ago)

Author:

zarron

Message:

Fireball implemented, Physics are crazy at the moment

Location:

code/branches/SOBv2_HS17

Files:

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

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

@@ -14 +14 @@
         ?>
 
-                                        <!--THEO-->
 
 
@@ -100 +99 @@
                         </MovableEntity>
 
-
-                                        <!--Gumba-->
+                                        <!--Test Fireball-->
+
+
+
+                                        <SOBFireball collisionType="dynamic" speed=40 position = "20,0,100">
+                                                <attached>
+                                                        <Model mesh="planets/sol.mesh" position="0,0,1" scale=3 pitch=90/> 
+                                                        
+                                                </attached>
+                                                <collisionShapes>
+                                                        <BoxCollisionShape position="0,0,0" halfExtents="5,5,5" />                      
+                                                </collisionShapes>
+                                        </SOBFireball>
+
+
+
+
+                                        <!--Gumba
 
                                         <SOBGumba collisionType="dynamic" speed=40 position = "240,0,0">
@@ -112 +127 @@
                                                 </collisionShapes>
                                         </SOBGumba>
+                                Gumba-->
                                         <SOBGumba collisionType="dynamic" speed=30 position = "420,0,0">
                                                 <attached>
@@ -231 +247 @@
                                                 </collisionShapes>
                                         </StaticEntity>
-
-
-
-                                        
-
 
 

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

@@ -9 +9 @@
   SOBHUDInfo.cc
   SOBGumba.cc
+  SOBFireball.cc
   SOBFlagstone.cc
   SOBCastlestone.cc

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

@@ -122 +122 @@
          else if (gumba != nullptr && !(gumba->hasCollided_)) {
 
-            //If player doesn't jump on its head, kill it, else, kill the player
+            //If player jumps on its head, kill the Gumba, else, kill the player
             if (getVelocity().z >= -20) {
                 // If player hasn't a power up, he dies. Else he shrinks and the gumba dies.