Changeset 12337

Timestamp:

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

Author:

pomselj

Message:

Ball can do bouncy stuff

Location:

code/branches/OrxoBlox_FS19

Files:

• data/levels/orxoblox.oxw (modified) (1 diff)
• data/levels/templates/spaceshipOrxoBlox.oxt (modified) (3 diffs)
• src/modules/OrxoBlox/OrxoBlox.cc (modified) (5 diffs)
• src/modules/OrxoBlox/OrxoBlox.h (modified) (3 diffs)
• src/modules/OrxoBlox/OrxoBloxBall.h (modified) (2 diffs)
• src/modules/OrxoBlox/OrxoBloxShip.cc (modified) (2 diffs)

code/branches/OrxoBlox_FS19/data/levels/orxoblox.oxw

@@ -17 +17 @@
   include("templates/spaceshipPirate.oxt")
   include("templates/spaceshipOrxoBlox.oxt")
-  include("templates/enemyInvader.oxt")
-  include("overlays/Asteroids2DHUD.oxo")
-  include("templates/asteroidsAsteroids2D.oxt")
 ?>
 

code/branches/OrxoBlox_FS19/data/levels/templates/spaceshipOrxoBlox.oxt

@@ -1 @@
-<Template name=spaceshipOrxBlox>
+<Template name=spaceshipOrxoBlox>
   <OrxoBloxShip
    hudtemplate            = spaceshiphud
@@ -43 +43 @@
   >
     <engines>
-      <MultiStateEngine position=" 7.6, 0, 6" template=spaceshipOrxoBloxdengine />
-      <MultiStateEngine position="-7.6, 0, 0" template=spaceshipOrxoBloxdengine />
+      <MultiStateEngine position=" 7.6, 0, 6" template=spaceshipOrxoBloxengine />
+      <MultiStateEngine position="-7.6, 0, 0" template=spaceshipOrxoBloxengine />
     </engines>
     <attached>
@@ -93 +93 @@
 </Template>
 
-<Template name=spaceshiporxobloxdengine baseclass=MultiStateEngine>
+<Template name=spaceshipOrxoBloxengine baseclass=MultiStateEngine>
   <MultiStateEngine
    boostfactor    = 2.2

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

@@ -64 +64 @@
         Constructor. Registers and initializes the object.
     */
-    OrxoBlox::OrxoBlox(Context* context) : Deathmatch(context)
+    OrxoBlox::OrxoBlox(Context* context) : ::orxonox::Deathmatch::Deathmatch(context)
     {
         RegisterObject(OrxoBlox);
@@ -154 +154 @@
             this->createWall();
 
+            //Create Ship
+            //this->ship_ = new OrxoBloxShip(this->center_->getContext());
+            //this->ship_->setPosition(0, 0, 0);
+
         }
         else // If no centerpoint was specified, an error is thrown and the level is exited.
@@ -166 +170 @@
 
         // Set variable to temporarily force the player to spawn.
-        this->bForceSpawn_ = false;
+        this->bForceSpawn_ = true;
 
         // Call start for the parent class.
@@ -186 +190 @@
     }
 
-    /**
-    @brief
-        Spawns the input player.
-    @param player
-        The player to be spawned.
-    */
+    OrxoBloxShip* OrxoBlox::getPlayer()
+    {
+        if (playership == nullptr)
+        {
+            for (OrxoBloxShip* ship_ : ObjectList<OrxoBloxShip>())
+            {
+                playership = ship_;
+            }
+        }
+        return playership;
+    }
+   
     void OrxoBlox::spawnPlayer(PlayerInfo* player)
     {
-         assert(player);
+        assert(player);
 
         if(this->player_ == nullptr)
@@ -201 +211 @@
             this->players_[player].state_ = PlayerState::Alive;
         }
-    }
-
-
-    OrxoBloxShip* OrxoBlox::getPlayer()
-    {
-        for (OrxoBloxShip* ship : ObjectList<OrxoBloxShip>())
-        {
-            return ship;
-        }
-        return nullptr;
+
     }
 
     //void startWall(void);
-    
     void OrxoBlox::LevelUp(){
         level_++;

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

@@ -43 +43 @@
 #include "OrxoBloxCenterpoint.h"
 #include "OrxoBloxWall.h"
+#include "OrxoBloxShip.h"
 
 namespace orxonox
@@ -72 +73 @@
             virtual void end() override; ///!< Ends the OrxoBlox minigame.
 
-            virtual void spawnPlayer(PlayerInfo* player) override; //!< Spawns the input player.
-
             OrxoBloxShip* getPlayer();
+            void spawnPlayer(PlayerInfo* Player) override;
 
             void LevelUp();
@@ -97 +97 @@
             WeakPtr<OrxoBloxCenterpoint> center_; //!< The playing field.
             WeakPtr<OrxoBloxBall> ball_; //!< The OrxoBlox ball.
+            unsigned int level_;
             
+            WeakPtr<OrxoBloxShip> playership;
             PlayerInfo* player_;
-            unsigned int level_;
-
             Timer starttimer_; //!< A timer to delay the start of the game.
             

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:

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

@@ -34 +34 @@
 
 #include "OrxoBloxShip.h"
-#include "OrxoBloxShip.h"
 #include "core/CoreIncludes.h"
 
@@ -48 +47 @@
         this->width = 120;
         this->height = 100;
+        orxout() << "Spawned" << std::endl;
 
         //timer.setTimer(3.5f, true, createExecutor(createFunctor(&OrxoBloxShip::showorientation, this)));