Changeset 12411 for code/branches/Presentation_FS19/src

Timestamp:

May 22, 2019, 2:59:08 PM (6 years ago)

Author:

wiesep

Message:

Merged OrxoBlox_FS19

Location:

code/branches/Presentation_FS19

Files:

• . (modified) (1 prop)
• src/modules/CMakeLists.txt (modified) (1 diff)
• src/modules/OrxoBlox (copied) (copied from code/branches/OrxoBlox_FS19/src/modules/OrxoBlox)
• src/modules/asteroids2D/Asteroids2DShip.cc (modified) (1 diff)
• src/modules/pong/Pong.cc (modified) (1 diff)
• src/modules/weapons/munitions/BallMunition.cc (copied) (copied from code/branches/OrxoBlox_FS19/src/modules/weapons/munitions/BallMunition.cc)
• src/modules/weapons/munitions/BallMunition.h (copied) (copied from code/branches/OrxoBlox_FS19/src/modules/weapons/munitions/BallMunition.h)
• src/modules/weapons/munitions/CMakeLists.txt (modified) (1 diff)
• src/modules/weapons/projectiles/BallProjectile.cc (copied) (copied from code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.cc)
• src/modules/weapons/projectiles/BallProjectile.h (copied) (copied from code/branches/OrxoBlox_FS19/src/modules/weapons/projectiles/BallProjectile.h)
• src/modules/weapons/projectiles/BasicProjectile.cc (modified) (2 diffs)
• src/modules/weapons/projectiles/BasicProjectile.h (modified) (1 diff)
• src/modules/weapons/weaponmodes/BallGun.cc (copied) (copied from code/branches/OrxoBlox_FS19/src/modules/weapons/weaponmodes/BallGun.cc)
• src/modules/weapons/weaponmodes/BallGun.h (copied) (copied from code/branches/OrxoBlox_FS19/src/modules/weapons/weaponmodes/BallGun.h)

code/branches/Presentation_FS19/src/modules/CMakeLists.txt

@@ -55 +55 @@
 ADD_SUBDIRECTORY(MouseAPI)
 ADD_SUBDIRECTORY(MouseAPIExample)
+ADD_SUBDIRECTORY(OrxoBlox)

code/branches/Presentation_FS19/src/modules/asteroids2D/Asteroids2DShip.cc

@@ -69 +69 @@
     void Asteroids2DShip::tick(float dt)
     {
-        SUPER(Asteroids2DShip, tick, dt);
+        //SUPER(Asteroids2DShip, tick, dt);
         Vector3 pos = this->getPosition();
 

code/branches/Presentation_FS19/src/modules/pong/Pong.cc

@@ -127 +127 @@
     void Pong::start()
     {
+        orxout() << "Hello" << endl;
         if (this->center_ != nullptr) // There needs to be a PongCenterpoint, i.e. the area the game takes place.
         {

code/branches/Presentation_FS19/src/modules/weapons/munitions/CMakeLists.txt

@@ -9 +9 @@
   SplitMunition.cc
   MineMunition.cc
+  BallMunition.cc
 )

code/branches/Presentation_FS19/src/modules/weapons/projectiles/BasicProjectile.cc

@@ -172 +172 @@
     void BasicProjectile::destroyCheck(void)
     {
-        if(GameMode::isMaster() && this->bDestroy_)
+        if(GameMode::isMaster() && this->bDestroy_) {
             this->destroy();
+        }
     }
 
@@ -182 +183 @@
     void BasicProjectile::destroyObject(void)
     {
-        if(GameMode::isMaster())
+        if(GameMode::isMaster()) {
             this->destroy();
+        }
     }
 }

code/branches/Presentation_FS19/src/modules/weapons/projectiles/BasicProjectile.h

@@ -117 +117 @@
 
         protected:
-            bool processCollision(WorldEntity* otherObject, btManifoldPoint& contactPoint, const btCollisionShape* cs);
+            virtual bool processCollision(WorldEntity* otherObject, btManifoldPoint& contactPoint, const btCollisionShape* cs);
             void destroyCheck(void);
             inline void setDestroyAfterCollision(bool destroyAfterCollision)