Changeset 12346 for code/branches/OrxoBlox_FS19

Timestamp:

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

Author:

pomselj

Message:

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

Location:

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox

Files:

• OrxoBlox.cc (modified) (3 diffs)
• OrxoBlox.h (modified) (1 diff)
• OrxoBloxBall.cc (modified) (6 diffs)
• OrxoBloxBall.h (modified) (5 diffs)
• OrxoBloxWall.cc (modified) (1 diff)
• OrxoBloxWall.h (modified) (1 diff)

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

@@ -147 +147 @@
 
             // Create the first Wall.
-            this->LevelUp();
+            this->createWall();
 
             //Create Ship
@@ -213 +213 @@
         this->createWall();
         this->activeWalls_.push_back(this->futureWall_);
+        for (int i = 0; i < this->futureWall_->getNumberOfStones(); i++)
+            this->stones_.push_back(this->futureWall_->getStone(i));
         //new location of ship
         //new amount of balls
         //create balls
         //insert new wall
-
     }
 
@@ -243 +244 @@
     }
 
-    
+    OrxoBloxStones* OrxoBlox::CheckForCollision(OrxoBloxBall* Ball) {
+
+        orxout() << "Checking for Collision" << endl;
+        Vector3 BallPosition = Ball->getPosition();
+        for(OrxoBloxStones* someStone : this->stones_)
+        {
+            orxout() << "Checking a stone" << endl;
+            const Vector3& StonePosition = someStone->getPosition(); //!< Saves the position of the currentStone
+            int size = someStone->getSize();
+            if((BallPosition.x >= StonePosition.x - size && BallPosition.x <= StonePosition.x + size) || 
+                (BallPosition.z >= StonePosition.z - size && BallPosition.z <= StonePosition.z + size)) {
+                orxout() << "FOUND ONE" << endl;
+                return someStone;
+            }
+        }
+        orxout() << "Found nothing...." << endl;
+        return nullptr;
+    }
     
 }

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

@@ -87 +87 @@
             OrxoBloxCenterpoint* getCenterpoint(void)
                 { return this->center_; }
+            OrxoBloxStones* CheckForCollision(OrxoBloxBall* Ball);
 
         protected:

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

@@ -55 +55 @@
     */
     OrxoBloxBall::OrxoBloxBall(Context* context)
-        : MovableEntity(context)
+        : Pawn(context)
     {
         RegisterObject(OrxoBloxBall);
@@ -63 +63 @@
         this->bDeleteBats_ = false;
         this->relMercyOffset_ = 0.05f;
+        this->orxoblox_ = this->getOrxoBlox();
 
         this->registerVariables();
@@ -206 +207 @@
         if (position != this->getPosition())
             this->setPosition(position);
+        this->Collides((this->orxoblox_->CheckForCollision(this)));
+
+ 
     }
 
@@ -287 +291 @@
 
 
-    void OrxoBloxBall::Bounce(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint) {
+    void OrxoBloxBall::Bounce(OrxoBloxStones* otherObject) {
 
         Vector3 velocity = this->getVelocity();
-        Vector3 myPosition = otherObject->getPosition();
-        btVector3 positionOtherObject = contactPoint.getPositionWorldOnA();
+        Vector3 positionOtherObject = otherObject->getPosition();
+        Vector3 myPosition = this->getPosition();
         orxout() << "About to Bounce >D" << endl;
         //if (positionOtherObject.y < 0) {
@@ -298 +302 @@
         //else {
         
-            int distance_X = positionOtherObject.getX() - myPosition.x;
-            int distance_Z = positionOtherObject.getZ() - myPosition.z;
+            int distance_X = myPosition.x - positionOtherObject.x;
+            int distance_Z = myPosition.z - positionOtherObject.z;
 
             if (distance_X < 0)
@@ -325 +329 @@
             }
             this->setVelocity(velocity);
-        //}
-    }
-
-
-    bool OrxoBloxBall::collidesAgainst(WorldEntity* otherObject, const btCollisionShape* ownCollisionShape, btManifoldPoint& contactPoint)
-    {
+    }
+
+
+    void OrxoBloxBall::Collides(OrxoBloxStones* otherObject)
+    {
+
+        if(otherObject == nullptr)
+            return;
+
         orxout() << "About to Bounce >D" << endl;
-        bool result = MovableEntity::collidesAgainst(otherObject, ownCollisionShape, contactPoint);
-        Bounce(otherObject, ownCollisionShape, contactPoint);
-        return result;
+        Bounce(otherObject);
+    }
+
+    OrxoBlox* OrxoBloxBall::getOrxoBlox()
+    {
+        if (this->getGametype() != nullptr && this->getGametype()->isA(Class(OrxoBlox)))
+        {
+            OrxoBlox* orxobloxGametype = orxonox_cast<OrxoBlox*>(this->getGametype());
+            return orxobloxGametype;
+        }
+        else orxout()<<"There is no Gametype for OrxoBlox! ask Anna"<< endl;
+        return nullptr;
     }
 

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_;
     };
 }

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

@@ -89 +89 @@
         return nullptr;
     }
+
+    int OrxoBloxWall::getNumberOfStones() {
+        return num_Stones_;
+    }
 }

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

@@ -42 +42 @@
             void setGame(OrxoBlox* orxoblox)
                 { assert(orxoblox); orxoblox_ = orxoblox; }
+            int getNumberOfStones();
         private:
             void createWall(void);