Changeset 11577 for code/branches/SOBv2_HS17/src

Timestamp:

Nov 20, 2017, 4:05:27 PM (7 years ago)

Author:

zarron

Message:

first atempt to set dir of fireballs correctly

Location:

code/branches/SOBv2_HS17/src/modules/superorxobros

Files:

• SOBFigure.cc (modified) (3 diffs)
• SOBFireball.cc (modified) (1 diff)
• SOBFireball.h (modified) (1 diff)

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

@@ -39 +39 @@
 #include "graphics/Camera.h"
 #include "graphics/ParticleSpawner.h"
+#include <OgreMath.h>
 
 #include "SOBMushroom.h"
@@ -156 +157 @@
 
         else if (fireball != nullptr && !(fireball->hasCollided_)){
-            this-> die();
+            //this-> die();
         }
 
@@ -197 +198 @@
             ball->addTemplate("fireball");
             ball->setPosition(spawnpos);
-            
+            bool direction = ((this->getWorldOrientation().getRoll().valueRadians())>-1.6&&(this->getWorldOrientation().getRoll().valueRadians()<1.6));
+            ball->setDirection(direction);
+            orxout() << "Rotation: " << this->getWorldOrientation().getRoll() << " direction: "<< direction <<endl;
+            //ball->
+
         }
      }

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

@@ -79 +79 @@
 
 
+    }
+
+    void SOBFireball::setDirection(const bool direction)
+    {
+        if(direction)
+        {
+            goesRight_=true;
+        }
+        else
+        {
+            goesRight_=false;
+        }
     }
 

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

@@ -53 +53 @@
             virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
             virtual void tick(float dt) override;
-
+            void setDirection(const bool direction);
           
             bool attachedToFigure_;