Changeset 12393 for code/branches/OrxoBlox_FS19/src

Timestamp:

May 16, 2019, 5:16:22 PM (6 years ago)

Author:

ahuwyler

Message:

BOUNCE

Location:

code/branches/OrxoBlox_FS19/src/modules

Files:

• OrxoBlox/OrxoBloxStones.cc (modified) (1 diff)
• OrxoBlox/OrxoBloxStones.h (modified) (2 diffs)
• OrxoBlox/OrxoBloxWall.cc (modified) (1 diff)
• weapons/projectiles/BallProjectile.cc (modified) (1 diff)

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxStones.cc

@@ -13 +13 @@
         Constructor. Registers and initializes the object.
     */
-    OrxoBloxStones::OrxoBloxStones(Context* context) : StaticEntity(context)
+    OrxoBloxStones::OrxoBloxStones(Context* context) : Pawn(context)
     {
         RegisterObject(OrxoBloxStones);

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

@@ -7 +7 @@
 
 #include "worldentities/StaticEntity.h"
+#include "worldentities/pawns/Pawn.h"
 #include "tools/Timer.h"
 
@@ -19 +20 @@
     @ingroup OrxoBlox
     */
-    class _OrxoBloxExport OrxoBloxStones : public StaticEntity
+    class _OrxoBloxExport OrxoBloxStones : public Pawn
     {
         public:

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBloxWall.cc

@@ -35 +35 @@
                 this->size_ = 9.0f;
                 OrxoBloxStones* stone = new OrxoBloxStones(this->center_->getContext());
+                stone->addTemplate(this->orxoblox_->getCenterpoint()->getStoneTemplate());
                 if (stone == nullptr) {
                     std::abort();

code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc

@@ -142 +142 @@
                 Bounce(otherObject, contactPoint, cs);
                 orxout() << "BOUNCED!" << endl;
+                
             }
         }