Changeset 12346 for code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.h

Timestamp:

May 9, 2019, 11:36:28 AM (5 years ago)

Author:

pomselj

Message:

Worked on Collision, doesn't work yet, compiles tho

File:

• code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.h (modified) (5 diffs)

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxBall.h

@@ -40 +40 @@
 #include "util/Math.h"
 
-#include "worldentities/MovableEntity.h"
+#include "worldentities/pawns/Pawn.h"
 #include <bullet/BulletCollision/NarrowPhaseCollision/btManifoldPoint.h>
 
@@ -58 +58 @@
     @ingroup OrxoBlox
     */
-    class _OrxoBloxExport OrxoBloxBall : public MovableEntity
+    class _OrxoBloxExport OrxoBloxBall : public Pawn
     {
         public:
@@ -123 +123 @@
 
 
-            void Bounce(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint);
-            
-            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
+            void Bounce(OrxoBloxStones* otherObject);
+            void Collides(OrxoBloxStones* otherObject);
 
             static const float MAX_REL_Z_VELOCITY;
@@ -139 +138 @@
             void registerVariables();
 
+            OrxoBlox* getOrxoBlox();
             float fieldWidth_; //!< The width of the playing field.
             float fieldHeight_; //!< The height of the playing field.
@@ -150 +150 @@
             WorldSound* defBatSound_;
             WorldSound* defBoundarySound_;
+            OrxoBlox* orxoblox_;
     };
 }