Changeset 12371 for code/branches/OrxoBlox_FS19/src

Timestamp:

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

Author:

pomselj

Message:

BallProjectiles fly

Location:

code/branches/OrxoBlox_FS19/src/modules

Files:

• OrxoBlox/CMakeLists.txt (modified) (1 diff)
• OrxoBlox/OrxoBlox.cc (modified) (7 diffs)
• OrxoBlox/OrxoBlox.h (modified) (2 diffs)
• OrxoBlox/OrxoBloxPrereqs.h (modified) (1 diff)
• weapons/projectiles/BallProjectile.cc (modified) (8 diffs)
• weapons/weaponmodes/BallGun.cc (modified) (2 diffs)

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/CMakeLists.txt

@@ -3 +3 @@
   OrxoBlox.cc
   OrxoBloxWall.cc
-  OrxoBloxBall.cc
   OrxoBloxCenterpoint.cc
   OrxoBloxStones.cc

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)

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

@@ -89 +89 @@
             OrxoBloxCenterpoint* getCenterpoint(void)
                 { return this->center_; }
-            OrxoBloxStones* CheckForCollision(OrxoBloxBall* Ball);
+            //OrxoBloxStones* CheckForCollision(OrxoBloxBall* Ball);
             virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command
         protected:
@@ -95 +95 @@
             void startWall(void);
             void createWall(void);
-            void startBall(); //!< Starts the ball with some default speed.
+            //void startBall(); //!< Starts the ball with some default speed.
             void cleanup(); //!< Cleans up the Gametype by destroying the ball and the bats.
 
             WeakPtr<OrxoBloxCenterpoint> center_; //!< The playing field.
-            WeakPtr<OrxoBloxBall> ball_; //!< The OrxoBlox ball.
+            //WeakPtr<OrxoBloxBall> ball_; //!< The OrxoBlox ball.
             unsigned int level_;
 

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

@@ -69 +69 @@
 {
     class OrxoBlox;
-    class OrxoBloxBall;
+    //class OrxoBloxBall;
     class OrxoBloxCenterpoint;
     class OrxoBloxWall;

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

@@ -34 +34 @@
 #include "BallProjectile.h"
 #include "../OrxoBlox/OrxoBlox.h"
+#include "../OrxoBlox/OrxoBloxStones.h"
 #include "gametypes/Gametype.h"
 
@@ -57 +58 @@
         this->maxTextureIndex_ = 8;
         this->setDestroyAfterCollision(false); //I want the ball to bounce, not to be destroyed
+        this->fieldWidth_ = 46;
+        this->fieldHeight_ =  49;
         //this->orxoblox_ = this->getOrxoBlox();
 
@@ -64 +67 @@
     void BallProjectile::registerVariables()
     {
-        registerVariable( this->fieldWidth_ );
-        registerVariable( this->fieldHeight_ );
         registerVariable(this->materialBase_);
         registerVariable( this->speed_ );
@@ -145 +146 @@
         orxout() << "wanna bounce..." << endl;
         bool result = BasicProjectile::processCollision(otherObject, contactPoint, cs);
-        Bounce(otherObject, contactPoint, cs);
+        if (result == true) {
+            if (otherObject->isA(Class(OrxoBloxStones))) {
+                Bounce(otherObject, contactPoint, cs);
+            }
+        }
         orxout() << "BOUNCED!" << endl;
 
@@ -175 +180 @@
         Vector3 acceleration = this->getAcceleration();
 
+        velocity.y = 0;
+        position.y = 0;
+
         // If the ball has gone over the top or bottom boundary of the playing field (i.e. the ball has hit the top or bottom delimiters).
-        if (position.z > this->fieldHeight_ / 2 || position.z < -this->fieldHeight_ / 2)
+        if (position.z > this->fieldHeight_ || position.z < -this->fieldHeight_)
         {
 
             velocity.z = -velocity.z;
             // And its position is set as to not overstep the boundary it has just crossed. Remember z axis is reverted!!!
-            if (position.z > this->fieldHeight_ / 2){
+            if (position.z > this->fieldHeight_){
                 // Set the ball to be exactly at the boundary.
-                position.z = this-> fieldHeight_ / 2;
+                position.z = this-> fieldHeight_;
                 
                 //orxoblox_->LevelUp();
@@ -218 +226 @@
 
             }
-            if (position.z < -this->fieldHeight_ / 2){
-                position.z = -this->fieldHeight_ / 2 ;
+            if (position.z < -this->fieldHeight_){
+                position.z = -this->fieldHeight_;
                 
             }
@@ -228 +236 @@
         //Ball hits the right or left wall and should bounce back.
         // If the ball has crossed the left or right boundary of the playing field.
-        if (position.x > this->fieldWidth_ / 2 || position.x < -this->fieldWidth_ / 2)
+        if (position.x > this->fieldWidth_ || position.x < -this->fieldWidth_)
         {
             //Ball hits the right Wall
-            if (position.x > this->fieldWidth_ / 2)
+            if (position.x > this->fieldWidth_)
                 {
                     // Set the ball to be exactly at the boundary.
-                    position.x = this->fieldWidth_ / 2;
+                    position.x = this->fieldWidth_;
                     // Invert its velocity in x-direction (i.e. it bounces off).
                     velocity.x = -velocity.x;
@@ -241 +249 @@
 
             //Ball hits the left wall
-            else if (position.x < -this->fieldWidth_ / 2)
+            else if (position.x < -this->fieldWidth_)
                 {
                         // Set the ball to be exactly at the boundary.
-                        position.x = -this->fieldWidth_ / 2;
+                        position.x = -this->fieldWidth_;
                         // Invert its velocity in x-direction (i.e. it bounces off).
                         velocity.x = -velocity.x;

code/branches/OrxoBlox_FS19/src/modules/weapons/weaponmodes/BallGun.cc

@@ -34 +34 @@
 #include "BallGun.h"
 
+
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
@@ -59 +60 @@
         this->reloadTime_ = 0.25f;
         this->damage_ = 0.0f; //default 15
-        this->speed_ = 750.0f;
-        this->delay_ = 0.0f;
+        this->speed_ = 50;
+        this->delay_ = 100;
         this->setMunitionName("BallMunition");
         this->mesh_ = "laserbeam.mesh";