Changeset 11246

Timestamp:

Oct 24, 2016, 4:06:00 PM (8 years ago)

Author:

bberabi

Message:

sound and countdown erledigt, flugzeuge konnen nicht mehr sich bewegen bevor countdown ends

Location:

code/branches/SpaceRace_HS16

Files:

• data/levels/Spacerace2.oxw (modified) (1 diff)
• data/levels/newnewnewspacerace.oxw (modified) (3 diffs)
• data/levels/spaceRace.oxw (modified) (1 diff)
• src/modules/gametypes/OldSpaceRace.cc (modified) (3 diffs)
• src/modules/gametypes/OldSpaceRace.h (modified) (2 diffs)
• src/modules/gametypes/SpaceRace.cc (modified) (3 diffs)
• src/modules/gametypes/SpaceRace.h (modified) (1 diff)
• src/modules/gametypes/SpaceRaceController.cc (modified) (1 diff)
• src/orxonox/controllers/HumanController.h (modified) (1 diff)
• src/orxonox/sound/WorldAmbientSound.cc (modified) (1 diff)

code/branches/SpaceRace_HS16/data/levels/Spacerace2.oxw

@@ -24 +24 @@
  name         = "Spacerace2"
  description  = "Just a few tests"
- plugins = gametypes
- gametype = SpaceRace
+ plugins = "gametypes"
+ gametype = "SpaceRace"
 >
   <templates>

code/branches/SpaceRace_HS16/data/levels/newnewnewspacerace.oxw

@@ -32 +32 @@
   
   <!-- SOUNDS & MUSIC -->
-  <!--  <WorldSound name="scoreSound" position="0,-2100,0" source="sounds/ReadyGo.ogg" >
-      <events>
-        <play>
-          <EventListener event="start" />
-        </play>
-      </events>
-    </WorldSound> -->
   
-<WorldSound name="Countdown" position="0,-2100,0" source="sounds/Countdown.ogg" >
+  
+<WorldSound name="Countdown" position="0,0,0" source="sounds/Countdown.ogg" >
       <events>
         <play>
@@ -49 +43 @@
 
 
-<WorldSound name="Go" position="0,-2100,0" source="sounds/Go.ogg" >
+<WorldSound name="Go" position="0,0,0" source="sounds/Go.ogg" >
       <events>
         <play>
@@ -57 +51 @@
     </WorldSound>
 
-<WorldSound name="racetheme" position="0,-2100,0" source="sounds/racetheme.ogg" >
-      <events>
+
+    <DistanceTrigger name="start1" position="0,0,0"  target="Pawn" distance=100 stayActive="true" delay=0.5 />
+    <DistanceTrigger name="go" position="0,0,0"  target="Pawn" distance=100 stayActive="true" delay=10.5  />
+
+    <DistanceTrigger name="racetheme" position="0,0,0"  target="Pawn" distance=100 stayActive="true" delay=10.75  />
+
+
+
+     
+      <WorldAmbientSound source="racetheme.ogg" looping="true" playOnLoad="false" >
+    <events>
         <play>
           <EventListener event="racetheme" />
         </play>
       </events>
-    </WorldSound>
-
-    <DistanceTrigger name="start1" position="0,-2100,0"  target="Pawn" distance=100 stayActive="true" delay=0.5 />
-        <DistanceTrigger name="go" position="0,-2100,0"  target="Pawn" distance=100 stayActive="true" delay=10.5  />
-         <DistanceTrigger name="racetheme" position="0,-2100,0"  target="Pawn" distance=100 stayActive="true" delay=10.7  />
+    </WorldAmbientSound>
 
 
 
 
-      <WorldAmbientSound source="racetheme.ogg" looping="true" playOnLoad="true" />
+
+        
+
 
   <!--   <WorldAmbientSound source="Ganymede.ogg" looping="true" playOnLoad="true" /> -->

code/branches/SpaceRace_HS16/data/levels/spaceRace.oxw

@@ -53 +53 @@
     <DistanceTrigger name="start" position="0,-2100,0"  target="Pawn" distance=100 stayActive="true" delay=0.5 />
   
-    <WorldAmbientSound source="Ganymede.ogg" looping="true" playOnLoad="true" />
   
 

code/branches/SpaceRace_HS16/src/modules/gametypes/OldSpaceRace.cc

@@ -33 +33 @@
 #include "util/Convert.h"
 #include "util/Math.h"
+#include "SpaceRaceBot.h"
+#include "items/Engine.h"
+#include "controllers/HumanController.h"
+
+
 
 namespace orxonox
@@ -43 +48 @@
         this->checkpointsReached_ = 0;
         this->bTimeIsUp_ = false;
-        this->numberOfBots_ = 0;
+        this->numberOfBots_ = 1;
     }
 
@@ -84 +89 @@
         Gametype::start();
 
-        std::string message("Take Them All!");
+   if (true)
+        {
+            this->spawnPlayersIfRequested();
+            this->cantMove_ = true;
+
+            for (Engine* engine : ObjectList<Engine>()){
+                engine->setActive(false);
+                
+
+            }
+            
+        }
+
+        
+
+        std::string message("BE FAST BE FIRST");
         this->getGametypeInfo()->sendAnnounceMessage(message);
         ChatManager::message(message);
+
+Timer* countdownTimer = new Timer();
+        countdownTimer->setTimer(11, false, createExecutor(createFunctor(&OldSpaceRace::countdownFinished, this)));
     }
 
+    void OldSpaceRace::countdownFinished()
+    {
+
+        std::string message("RACE STARTED ");
+        this->getGametypeInfo()->sendAnnounceMessage(message);
+        ChatManager::message(message);
+
+
+    for (Engine* engine : ObjectList<Engine>())
+                engine->setActive(true);
+    
+
+
+    }
+ 
     void OldSpaceRace::newCheckpointReached()
     {

code/branches/SpaceRace_HS16/src/modules/gametypes/OldSpaceRace.h

@@ -56 +56 @@
 
             virtual void start() override;
+
             virtual void end() override;
+
 
             virtual void newCheckpointReached();
             virtual void addBots(unsigned int amount) override{} //<! overwrite function in order to bypass the addbots command.
-                                                        //<! This is only a temporary solution. Better: create racingBots.
+            virtual  void countdownFinished();
+                                          //<! This is only a temporary solution. Better: create racingBots.
 
             inline void setCheckpointsReached(int n)
@@ -72 +75 @@
 
         private:
+            bool cantMove_;                                            ///< Helper variable, used to stall the engines before the race starts.
             int checkpointsReached_; //The current number of check points reached by the player.
             std::set<float> scores_; //The times of the players are saved in a set.

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

@@ -49 +49 @@
         this->cantMove_ = false;
         this->bTimeIsUp_ = false;
-        this->numberOfBots_ = 0; // quick fix: don't allow default-bots to enter the race
+        this->numberOfBots_ = 1; // quick fix: don't allow default-bots to enter the race
                                  // remove this line, if a raceBot has been created.
     }
+
+
+
+
+
+
 
     void SpaceRace::end()
@@ -78 +84 @@
     }
 
+    
+
+
+
+
     void SpaceRace::tick(float dt)
     {
@@ -100 +111 @@
             this->cantMove_= false;
 
-            std::string message = "The race begins! Reach the check points as quickly as possible!";
+
+
+            std::string message = "Hello!";
             this->getGametypeInfo()->sendAnnounceMessage(message);
             ChatManager::message(message);
         }
     }
+
+
+
+
+
 
     void SpaceRace::newCheckpointReached(RaceCheckPoint* checkpoint, PlayerInfo* player)

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

@@ -57 +57 @@
             virtual ~SpaceRace() {}
 
+
             virtual void tick(float dt) override;
 

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

@@ -16 +16 @@
  *   GNU General Public License for more details.
  *
- *   You should have received a copy of the GNU General Public License
+ *   You should have     a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

code/branches/SpaceRace_HS16/src/orxonox/controllers/HumanController.h

@@ -93 +93 @@
             //friend class, for mouselook
             friend class Map;
+            static HumanController* localController_s;
 
         protected:
-            static HumanController* localController_s;
             bool controlPaused_;
 

code/branches/SpaceRace_HS16/src/orxonox/sound/WorldAmbientSound.cc

@@ -58 +58 @@
         soundList_.emplace_back("Ganymede.ogg");
         soundList_.emplace_back("luke_grey_-_hypermode.ogg");
+        soundList_.emplace_back("racetheme.ogg");
+
 
     }