Changeset 12029 for code/branches/mergeFS18/src

Timestamp:

Oct 10, 2018, 3:36:53 PM (6 years ago)

Author:

merholzl

Message:

added space race improvements

Location:

code/branches/mergeFS18

Files:

• . (modified) (1 prop)
• src/libraries/tools/Timer.h (modified) (1 diff)
• src/modules/gametypes/SpaceRace.cc (modified) (9 diffs)
• src/modules/gametypes/SpaceRace.h (modified) (4 diffs)
• src/modules/gametypes/SpaceRaceController.cc (modified) (15 diffs)
• src/modules/gametypes/SpaceRaceController.h (modified) (3 diffs)
• src/modules/gametypes/SpaceRaceManager.cc (modified) (1 diff)
• src/orxonox/items/Engine.cc (modified) (3 diffs)
• src/orxonox/worldentities/pawns/SpaceShip.cc (modified) (1 diff)
• src/orxonox/worldentities/pawns/SpaceShip.h (modified) (3 diffs)

code/branches/mergeFS18/src/libraries/tools/Timer.h

@@ -115 +115 @@
             void run();
 
+
             /// Re-starts the timer: The executor will be called after @a interval seconds.
             inline void startTimer()

code/branches/mergeFS18/src/modules/gametypes/SpaceRace.cc

@@ -69 +69 @@
 #include "SpaceRaceBot.h"
 #include "items/Engine.h"
-#include <vector>
+#include <vector> 
+#include <iostream>
+#include <string>
 
 
@@ -83 +85 @@
         this->cantMove_ = false;
         this->bTimeIsUp_ = false;
-
         this->numberOfBots_ = 5; // quick fix: don't allow default-bots to enter the race 
+        this->bLost =false;
         //we fixed the number of bots in order to have the same starting position all the time ! 
     }
@@ -101 +103 @@
         startpos[4] =-40;
         startpos[5] =100;
-        
+         
         startpos[6] =100;
         startpos[7] =-40;
@@ -117 +119 @@
 
         this->spawnPlayersIfRequested();
+        this->countdown_mode=true;
         this->cantMove_ = true;
         //players are unable to move while countdown is running
@@ -122 +125 @@
         {
             engine->setActive(false);
+            engine->addSpeedMultiply(1.7);
         }
 
@@ -138 +142 @@
         }
 
-        std::string message("Use headphones to hear the countdown!");
-        this->getGametypeInfo()->sendAnnounceMessage(message);
-        ChatManager::message(message);
-
-        //after 11 seconds , countdownFinished function is called to activate bots` engines
-        Timer* countdownTimer = new Timer();
-        countdownTimer->setTimer(11, false, createExecutor(createFunctor(&SpaceRace::countdownFinished, this)));
-    }
-
-
-
+        std::string message("Use headphones to hear the countdown! Press W for forward acceleration, press W+space for boost!");
+
+        this->getGametypeInfo()->sendAnnounceMessage(message);
+        ChatManager::message(message);
+        
+
+
+        
+    }
+
+    // Counter in the beginning of the game
+    void SpaceRace::tick(float dt) {
+        SUPER(SpaceRace, tick, dt);
+        
+        //countdown_mode is set true,when spawnIfRequested is called
+        if (countdown_mode) {
+            //10 seconds will be counted
+            this->time_passed -= dt;
+
+            //orxout() << "time: " <<(int) time_passed << "s" << endl;
+
+            std::string message=std::to_string((int)time_passed);
+            this->getGametypeInfo()->sendAnnounceMessage(message);
+            if (time_passed <= 1) {
+
+                this->countdownFinished();
+                this->countdown_mode = false;
+            }
+        }
+
+    }
+        
+    void SpaceRace::startmessage(int second){
+
+        std::string message=std::to_string(second);
+        this->getGametypeInfo()->sendAnnounceMessage(message);
+        ChatManager::message(message);
+        
+        
+
+    }
 
     void SpaceRace::end()
     {
+        
         this->clock_.capture();
         int s = this->clock_.getSeconds();
         int ms = static_cast<int>(this->clock_.getMilliseconds() - 1000*s);
         std::string message;
-
         if (this->bTimeIsUp_)
         {
-            message = multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms) + " seconds !!\n"
-                        + "You lose!";
-        }
+            message =  "TIME IS UP! YOU LOOSE!";
+        }
+       else if(this->bLost){
+            message = "YOU LOOSE!";
+
+       }        
+       
         else
         {
@@ -167 +205 @@
                         + "." + multi_cast<std::string>(ms) + " seconds.";
         }
+        
         if (!this->hasEnded())
         {
+
             this->getGametypeInfo()->sendAnnounceMessage(message);
             ChatManager::message(message);
@@ -183 +223 @@
         int ms = this->clock_.getMilliseconds() % 1000;
 
-       
-    
-        const std::string& message = player->getName() + " reached the checkpoint " + multi_cast<std::string>(checkpoint->getCheckpointIndex() + 1) 
+
+        std::string message(player->getName() + " reached the checkpoint " + multi_cast<std::string>(checkpoint->getCheckpointIndex() + 1) 
+        + " after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms) + " seconds.");
+
+        this->getGametypeInfo()->sendAnnounceMessage(message);
+        ChatManager::message(message);
+      /*  const std::string& message = player->getName() + " reached the checkpoint " + multi_cast<std::string>(checkpoint->getCheckpointIndex() + 1) 
         + "after " + multi_cast<std::string>(s) + "." + multi_cast<std::string>(ms) + " seconds.";
         this->getGametypeInfo()->sendAnnounceMessage(message);
-        ChatManager::message(message);
+        ChatManager::message(message);*/
+        
 
     }
@@ -195 +240 @@
     {
 
-        std::string message("RACE STARTED ");
-        this->getGametypeInfo()->sendAnnounceMessage(message);
-        ChatManager::message(message);
+        std::string message("RACE STARTED");
+        this->getGametypeInfo()->sendAnnounceMessage(message);
+        ChatManager::message(message);
+        
 
 
         for (Engine* engine : ObjectList<Engine>())
             engine->setActive(true);
+
+        std::string message2("Press W for forward acceleration, press W+space for boost!");
+        this->getGametypeInfo()->sendAnnounceMessage(message2);
+        ChatManager::message(message2);
     }
 

code/branches/mergeFS18/src/modules/gametypes/SpaceRace.h

@@ -42 +42 @@
 #include "SpaceRaceManager.h"
 
+
 namespace orxonox
 {
@@ -54 +55 @@
 
         public:
-            SpaceRace(Context* context);
+            SpaceRace(Context* context);//, SpaceRace* parentRace);
             virtual ~SpaceRace() {}
 
@@ -60 +61 @@
             virtual void end() override;
             virtual void countdownFinished();
+            
             virtual void addBots(unsigned int amount) override; //<! overwrite function in order to bypass the addbots command.
+            virtual void tick(float dt) override;
+            virtual void startmessage(int second);
 
 
@@ -79 +83 @@
             inline Clock& getClock()
                 { return this->clock_; }
+            //inline void setParentRace(SpaceRace* parentRace) { this->parentRace = parentRace; }
 
             virtual bool allowPawnHit(Pawn* victim, Pawn* originator) override;
             virtual bool allowPawnDamage(Pawn* victim, Pawn* originator) override;
             virtual bool allowPawnDeath(Pawn* victim, Pawn* originator) override;
+            bool countdown_mode = false;
+            float time_passed = 11.0f;
+            
+            bool bLost=false;
 
         private:
             bool cantMove_;                                            ///< Helper variable, used to stall the engines before the race starts.
             std::map<PlayerInfo*, RaceCheckPoint*> checkpointReached_; ///< The number of the last check point reached by each player.
-            bool bTimeIsUp_;                                           ///< True if one of the check points is reached too late.
+            bool bTimeIsUp_;    ///< True if one of the check points is reached too late.
 
             Clock clock_; ///< The clock starts running at the beginning of the game. It is used to give the time at each check point, the give the time at the end of the game, and to stop the game if a check point is reached too late.

code/branches/mergeFS18/src/modules/gametypes/SpaceRaceController.cc

@@ -20 +20 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- *  Created on: Oct 8, 2012
+ *  Created on: Oct 8, 2012findCheck
  *      Author: purgham
  */
@@ -30 +30 @@
 #include "collisionshapes/CollisionShape.h"
 #include "BulletCollision/CollisionShapes/btCollisionShape.h"
+#include "SpaceRace.h"
 
 
@@ -38 +39 @@
     const int ADJUSTDISTANCE = 500;
     const int MINDISTANCE = 5;
+
     /*
      * Idea: Find static Point (checkpoints the spaceship has to reach)
@@ -45 +47 @@
     {
         RegisterObject(SpaceRaceController);
+        //this->parentRace = nullptr;
+
         std::vector<RaceCheckPoint*> checkpoints;
 
@@ -63 +67 @@
 
         int i;
-        for (i = -2; findCheckpoint(i) != nullptr; i--)
+        for (i = -2; findCheckpoint(i) != nullptr; i--)     // WIESO?
         {
             continue;
@@ -103 +107 @@
         return returnVec;
     }
-
+    void SpaceRaceController::endtheGame() const {
+        SpaceRace* gametype = orxonox_cast<SpaceRace*>(this->getGametype());
+        assert(gametype)
+;        if (!gametype)
+        return;
+        gametype->bLost=true;
+        gametype->end();
+
+    }
     /*
      * called from 'findStaticCheckpoints'
@@ -122 +134 @@
             for (int checkpointIndex : currentCheckpoint->getNextCheckpoints())
             {
+                if (findCheckpoint(checkpointIndex) == nullptr){
+                    orxout(internal_warning) << "Problematic Point: " << checkpointIndex << endl;
+                }
                 if (currentCheckpoint == findCheckpoint(checkpointIndex))
                 {
-                    //orxout() << currentCheckpoint->getCheckpointIndex()<<endl;
+                    orxout() << currentCheckpoint->getCheckpointIndex()<<endl;
                     continue;
                 }
-                if (findCheckpoint(checkpointIndex) == nullptr)
-                    orxout(internal_warning) << "Problematic Point: " << checkpointIndex << endl;
+             
                 else
                     numberOfWays += rekSimulationCheckpointsReached(findCheckpoint(checkpointIndex), zaehler);
+
             }
             zaehler[currentCheckpoint] += numberOfWays;
@@ -162 +177 @@
         {
             RaceCheckPoint* nextRaceCheckPoint = findCheckpoint(checkpointIndex);
+
             float distance = recCalculateDistance(nextRaceCheckPoint, this->getControllableEntity()->getPosition());
 
@@ -168 +184 @@
                 minDistance = distance;
                 minNextRaceCheckPoint = nextRaceCheckPoint;
-            }
-
-        }
-
+
+            }
+            //There is a bug. If the user passes through the 19th checkpoint with the opponents, the game will end immediately
+            if(nextRaceCheckPoint->isLast())
+                endtheGame(); 
+
+        }
+        if(minNextRaceCheckPoint == nullptr) { orxout()<<"nullptr found @192 SpaceRaceController" << endl;}
         return minNextRaceCheckPoint;
     }
@@ -208 +228 @@
 
         {
+            if(nextRaceCheckpoint_ == nullptr) orxout()<<"nullptr found @218 SpaceRaceController" << endl;
+
             return nextRaceCheckpoint_;
         }
@@ -213 +235 @@
 
         {
+            if(nextRaceCheckpoint_ == nullptr) orxout()<<"nullptr found @223 SpaceRaceController" << endl;
+
             return nextRaceCheckpoint_;
         }
@@ -221 +245 @@
     }
 
+
+
+
+    
+
     RaceCheckPoint* SpaceRaceController::findCheckpoint(int index) const
     {
-        for (RaceCheckPoint* checkpoint : this->checkpoints_)
-            if (checkpoint->getCheckpointIndex() == index)
-                return checkpoint;
-        return nullptr;
-    }
+        RaceCheckPoint* res = nullptr;
+        for (RaceCheckPoint* checkpoint : this->checkpoints_){
+            //conclusion: index=20 is not 
+            if (checkpoint->getCheckpointIndex() == index){
+                //if(checkpoint == nullptr) orxout()<<"returned nullptr @line 234 SpaceRaceController"<<endl;
+                //orxout()<< "index of the checkpoint "<< index <<endl;
+                res = checkpoint;
+                return res;
+            }
+        }
+    /* if(index>2 )   
+        this->endtheGame();*/
+
+        return res;
+    }
+    
+
 
     /*RaceCheckPoint* SpaceRaceController::addVirtualCheckPoint( RaceCheckPoint* previousCheckpoint, int indexFollowingCheckPoint , const Vector3& virtualCheckPointPosition )
@@ -282 +323 @@
     void SpaceRaceController::tick(float dt)
     {
+        
+
         if (this->getControllableEntity() == nullptr || this->getControllableEntity()->getPlayer() == nullptr )
         {
@@ -312 +355 @@
         {
             nextRaceCheckpoint_ = adjustNextPoint();
+            if(nextRaceCheckpoint_ == nullptr) orxout()<<"nullptr found @327 SpaceRaceController" << endl;
+
             lastPositionSpaceship = this->getControllableEntity()->getPosition();
         }
@@ -325 +370 @@
         }
         //orxout(user_status) << "dt= " << dt << ";  distance= " << (lastPositionSpaceship-this->getControllableEntity()->getPosition()).length() <<std::endl;
-        lastPositionSpaceship = this->getControllableEntity()->getPosition();
-       
+        /*lastPositionSpaceship = this->getControllableEntity()->getPosition();
+        
+        SpaceRace obj=new SpaceRace();
+        obj.setParentRace(parentRace);
+        this->parentRace=obj.parentRace;*/
+        
         this->boostControl();
+
+        /*if(nextRaceCheckpoint_ == nullptr){
+            this->parentRace->bLost=true;
+            this->parentRace->end();
+        }*/
+        // if(nextRaceCheckpoint_ == nullptr ){
+        //    // if( nextRaceCheckpoint_->getCheckpointIndex()==19) 
+        //     orxout()<<"nullptr @351 Line"<<endl;
+        // }
+
+        
         this->moveToPosition(nextRaceCheckpoint_->getPosition());
+
         this->boostControl();
     }
 
+
+    /*void SpaceRaceController::setParentRace(parentRace){
+        this->parentRace=parentRace;
+    }*/
     // True if a coordinate of 'pointToPoint' is smaller then the corresponding coordinate of 'groesse'
     bool SpaceRaceController::vergleicheQuader(const Vector3& pointToPoint, const Vector3& groesse)

code/branches/mergeFS18/src/modules/gametypes/SpaceRaceController.h

@@ -47 +47 @@
     {
         public:
-            SpaceRaceController(Context* context);
+            SpaceRaceController(Context* context);//, SpaceRace* parentRace);
             virtual ~SpaceRaceController();
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
             virtual void tick(float dt) override;
+            
 
         private:
@@ -57 +58 @@
             RaceCheckPoint* nextPointFind(RaceCheckPoint*);
             RaceCheckPoint* adjustNextPoint();
+            void endtheGame() const;
+
             std::vector<RaceCheckPoint*> findStaticCheckpoints(RaceCheckPoint*, const std::vector<RaceCheckPoint*>&);
             std::vector<RaceCheckPoint*> staticCheckpoints();
@@ -74 +77 @@
             Vector3 lastPositionSpaceship;
             int virtualCheckPointIndex;
+            //SpaceRace* parentRace;
     };
 

code/branches/mergeFS18/src/modules/gametypes/SpaceRaceManager.cc

@@ -113 +113 @@
     RaceCheckPoint* SpaceRaceManager::findCheckpoint(int index) const
     {
-        for (RaceCheckPoint* checkpoint : this->checkpoints_)
+        /*for (RaceCheckPoint* checkpoint : this->checkpoints_)
         if (checkpoint->getCheckpointIndex() == index)
         return checkpoint;
+        return nullptr;*/
+        for (RaceCheckPoint* checkpoint : this->checkpoints_){
+            if (checkpoint->getCheckpointIndex() == index)
+                return checkpoint;
+        }
+        orxout()<<"returned checkpoint @line 123 SpaceRaceManager"<<endl;
         return nullptr;
     }

code/branches/mergeFS18/src/orxonox/items/Engine.cc

@@ -54 +54 @@
         this->relativePosition_ = Vector3::ZERO;
 
-        this->boostFactor_ = 1.5f;
+        this->boostFactor_ = 1.2f;
 
         this->maxSpeedFront_ = 0.0f;
@@ -61 +61 @@
         this->maxSpeedUpDown_ = 0.0f;
 
-        this->accelerationFront_ = 0.0f;
+        this->accelerationFront_ = 1.0f;
         this->accelerationBrake_ = 0.0f;
         this->accelerationBack_ = 0.0f;
@@ -68 +68 @@
 
         this->speedAdd_ = 0.0f;
-        this->speedMultiply_ = 1.0f;
+        this->speedMultiply_ = 1.0f;                       //////////////////////////////////////////
 
         this->setConfigValues();

code/branches/mergeFS18/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -65 +65 @@
         this->boostPowerRate_ = 1.0f;
         this->boostRate_ = 5.0f;
-        this->boostCooldownDuration_ = 5.0f;
+        this->boostCooldownDuration_ = 10.0f;
 
         this->shakeFrequency_ = 15.0f;

code/branches/mergeFS18/src/orxonox/worldentities/pawns/SpaceShip.h

@@ -103 +103 @@
             */
             virtual void moveFrontBack(const Vector2& value)
-                { this->steering_.z -= value.x; }
+                { this->steering_.z -= (0.6)*value.x; }
             /**
             @brief Move right or left.
@@ -109 +109 @@
             */
             virtual void moveRightLeft(const Vector2& value)
-                { this->steering_.x += value.x; }
+                { this->steering_.x += (0.6)*value.x; }
             /**
             @brief Move up or down.
@@ -115 +115 @@
             */
             virtual void moveUpDown(const Vector2& value)
-                { this->steering_.y += value.x; }
+                { this->steering_.y += (0.6)*value.x; }
 
             inline void moveFrontBack(float value)