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

Timestamp:

May 2, 2019, 4:40:50 PM (5 years ago)

Author:

pomselj

Message:

Ball can do bouncy stuff

File:

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

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

@@ -122 +122 @@
                 { return this->batlength_; }
 
+
+            void Bounce(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint);
             
-
+            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
 
             static const float MAX_REL_Z_VELOCITY;
@@ -133 +135 @@
             void setDefBoundarySound(const std::string& engineSound);
             const std::string& getDefBoundarySound();
-            void Bounce(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint);
-            virtual bool collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) override;
 
         private: