Changeset 12371 for code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc

Timestamp:

May 16, 2019, 1:13:58 PM (5 years ago)

Author:

pomselj

Message:

BallProjectiles fly

File:

• code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/OrxoBlox.cc (modified) (7 diffs)

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

@@ -48 +48 @@
 
 #include "OrxoBloxCenterpoint.h"
-#include "OrxoBloxBall.h"
 #include "OrxoBloxStones.h"
 #include "OrxoBloxWall.h"
@@ -68 +67 @@
 
         this->center_ = nullptr;
-        this->ball_ = nullptr;
+        //this->ball_ = nullptr;
         this->futureWall_ = nullptr;
         this->player_ = nullptr;
@@ -77 +76 @@
 
         // Pre-set the timer, but don't start it yet.
-        this->starttimer_.setTimer(1.0, false, createExecutor(createFunctor(&OrxoBlox::startBall, this)));
+        this->starttimer_.setTimer(1.0, false, createExecutor(createFunctor(&OrxoBlox::LevelUp, this)));
         this->starttimer_.stopTimer();
 
@@ -100 +99 @@
     void OrxoBlox::cleanup()
     {
-        if (this->ball_ != nullptr) // Destroy the ball, if present.
-        {
-            this->ball_->destroy();
-            this->ball_ = nullptr;
-        }
+        //if (this->ball_ != nullptr) // Destroy the ball, if present.
+        //{
+        //    this->ball_->destroy();
+        //    this->ball_ = nullptr;
+        //}
 
         if (this->futureWall_ != nullptr)
@@ -135 +134 @@
         if (this->center_ != nullptr) // There needs to be a OrxoBloxCenterpoint, i.e. the area the game takes place.
         {
-            if (this->ball_ == nullptr) // If there is no ball, create a new ball.
-            {
-                this->ball_ = new OrxoBloxBall(this->center_->getContext());
+            //if (this->ball_ == nullptr) // If there is no ball, create a new ball.
+            //{
+            //    this->ball_ = new OrxoBloxBall(this->center_->getContext());
                 // Apply the template for the ball specified by the centerpoint.
-                this->ball_->addTemplate(this->center_->getBalltemplate());
-            }
+            //    this->ball_->addTemplate(this->center_->getBalltemplate());
+            //}
 
             // Attach the ball to the centerpoint and set the parameters as specified in the centerpoint, the ball is attached to.
-            this->center_->attach(this->ball_);
+            //this->center_->attach(this->ball_);
             //Startposition Ball
-            this->ball_->setPosition(0, 0, 40);
-            this->ball_->setFieldDimension(this->center_->getFieldDimension());
-            this->ball_->setSpeed(0);
-            this->ball_->setAccelerationFactor(this->center_->getBallAccelerationFactor());
+            //this->ball_->setPosition(0, 0, 40);
+            //this->ball_->setFieldDimension(this->center_->getFieldDimension());
+            //this->ball_->setSpeed(0);
+            //this->ball_->setAccelerationFactor(this->center_->getBallAccelerationFactor());
             
             level_=1;
@@ -286 +285 @@
         Starts the ball with some default speed.
     */
-    void OrxoBlox::startBall()
-    {
-        if (this->ball_ != nullptr && this->center_ != nullptr)
-            this->ball_->setSpeed(this->center_->getBallSpeed());
-    }
+    //void OrxoBlox::startBall()
+    //{
+    //    if (this->ball_ != nullptr && this->center_ != nullptr)
+    //        this->ball_->setSpeed(this->center_->getBallSpeed());
+    //}
      
-    OrxoBloxStones* OrxoBlox::CheckForCollision(OrxoBloxBall* Ball) {
-
+    /*OrxoBloxStones* OrxoBlox::CheckForCollision(OrxoBloxBall* Ball) {
         //orxout() << "Checking for Collision" << endl;
         Vector3 BallPosition = Ball->getPosition();
@@ -314 +312 @@
         return nullptr;
     }
+    */
 
     void OrxoBlox::playerPreSpawn(PlayerInfo* player)