Changeset 12268 for code

Timestamp:

Apr 4, 2019, 2:40:29 PM (5 years ago)

Author:

ahuwyler

Message:

OrxoBlox in the HUD

Location:

code/branches/OrxoBlox_FS19

Files:

• data/levels/orxoblox.oxw (modified) (10 diffs)
• data/overlays/OrxoBloxHUD.oxo (added)
• src/modules/OrxoBlox/CMakeLists.txt (modified) (1 diff)
• src/modules/OrxoBlox/OrxoBlox.cc (modified) (6 diffs)
• src/modules/OrxoBlox/OrxoBlox.h (modified) (1 diff)
• src/modules/OrxoBlox/OrxoBloxBot.cc (modified) (2 diffs)

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

@@ -9 +9 @@
   include("HUDTemplates3.oxo")
   include("stats.oxo")
-  include("pongHUD.oxo")
+  include("OrxoBloxHUD.oxo")
   include("templates/lodInformation.oxt")
 ?>
 
-<Template name=pongbatcameras defaults=0>
-  <PongBat>
+<Template name=OrxoBloxbatcameras defaults=0>
+  <OrxoBloxBat>
     <camerapositions>
       <CameraPosition position="0,150,0" pitch=-90 absolute=true />
@@ -21 +21 @@
       <CameraPosition position="0,30, 90" drag=true mouselook=true />
     </camerapositions>
-  </PongBat>
+  </OrxoBloxBat>
 </Template>
 
-<Template name=pongbat>
-  <PongBat camerapositiontemplate=pongbatcameras>
+<Template name=OrxoBloxbat>
+  <OrxoBloxBat camerapositiontemplate=OrxoBloxbatcameras>
     <attached>
       <Model position="0,0,3" mesh="cube.mesh" scale3D="14,2,2" />
-      <!--Model roll=180 mesh="pongbat.mesh" scale=0.045 /-->
+      <!--Model roll=180 mesh="OrxoBloxbat.mesh" scale=0.045 /-->
     </attached>
-  </PongBat>
+  </OrxoBloxBat>
 </Template>
 
-<Template name=pongball>
-  <PongBall 
+<Template name=OrxoBloxball>
+  <OrxoBloxBall 
    defScoreSound = "sounds/PlayerWinScore_cut.ogg"
    defBatSound = "sounds/Button.ogg"
@@ -48 +48 @@
       <EventTarget target=hiteffect />
     </eventlisteners>
-  </PongBall>
+  </OrxoBloxBall>
 </Template>
 
@@ -55 +55 @@
 <Level
   plugins = "OrxoBlox_FS19"
- gametype = "OrxoBlox"
+ gametype = "Pong"
 >
 
@@ -64 +64 @@
 
   <WorldAmbientSound source="Ganymede.ogg" looping="true" playOnLoad="true"/>
-  <PongBot />
+  <OrxoBloxBot />
 
   <Scene
@@ -76 +76 @@
     <MovableEntity rotationrate=5 rotationaxis="0,0,1">
       <attached>
-        <PongCenterpoint name=pongcenter dimension="200,120" balltemplate=pongball battemplate=pongbat ballspeed=200 ballaccfactor=1.0 batspeed=130 batlength=0.25>
+        <OrxoBloxCenterpoint name=OrxoBloxcenter dimension="200,120" balltemplate=OrxoBloxball battemplate=OrxoBloxbat ballspeed=200 ballaccfactor=1.0 batspeed=130 batlength=0.25>
           <attached>
             <Model position="0,0,60" mesh="cube.mesh" scale3D="105,1,1" />
@@ -97 +97 @@
             <ParticleSpawner name=scoreeffect_left position="-120,0,-45" source="Orxonox/sparks2" lifetime=0.1 autostart=0 />
 
-<!-- TODO: Create a Pong Score Sound and include it here.
+<!-- TODO: Create a OrxoBlox Score Sound and include it here.
 This WorldSound works, but doesn't make sense, since it is played together with ambient/moodDependedDirectory/Ganymede.ogg -->
-            <!--WorldSound name="scoreSound" position="0,0,0" source="sounds/PongScore_cut.ogg" >
+            <!--WorldSound name="scoreSound" position="0,0,0" source="sounds/OrxoBloxScore_cut.ogg" >
               <events>
                 <play>
-                  <EventListener event=pongcenter />
+                  <EventListener event=OrxoBloxcenter />
                 </play>
               </events>
@@ -114 +114 @@
 
           </attached>
-        </PongCenterpoint>
+        </OrxoBloxCenterpoint>
       </attached>
     </MovableEntity>
@@ -129 +129 @@
               <EventName name=right />
             </names>
-            <EventListener event=pongcenter />
+            <EventListener event=OrxoBloxcenter />
           </EventFilter>
         </spawn>
@@ -145 +145 @@
               <EventName name=left />
             </names>
-            <EventListener event=pongcenter />
+            <EventListener event=OrxoBloxcenter />
           </EventFilter>
         </spawn>

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

@@ -6 +6 @@
   BallGun/BallProjectile.cc
   OrxoBlox.cc
-  OrxoBloxAI.cc
+  
   OrxoBloxBall.cc
   OrxoBloxBat.cc

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

@@ -46 +46 @@
 #include "OrxoBloxBat.h"
 #include "OrxoBloxBot.h"
-#include "OrxoBloxAI.h"
+#include "OrxoBloxStones.h"
 
 namespace orxonox
@@ -75 +75 @@
 
         // Set the type of Bots for this particular Gametype.
-        this->botclass_ = Class(OrxoBloxBot);
+        this->botclass_ = Class(OrxoBloxBat);
 
         this->scoreLimit_ = 10;
@@ -193 +193 @@
     void OrxoBlox::end()
     {
+        ChatManager::message("You suck!!");
         this->cleanup();
 
@@ -233 +234 @@
         else
             return;
-
-        // If the player is an AI, it receives a pointer to the ball.
-        if (player->getController() != nullptr && player->getController()->isA(Class(OrxoBloxAI)))
-        {
-            OrxoBloxAI* ai = orxonox_cast<OrxoBloxAI*>(player->getController());
-            ai->setOrxoBloxBall(this->ball_);
-        }
     }
 
@@ -278 +272 @@
         }
 
-        // If a player gets enough points, he won the game -> end of game
-        PlayerInfo* winningPlayer = nullptr;
-        if (this->getLeftPlayer() && this->getScore(this->getLeftPlayer()) >= scoreLimit_)
-            winningPlayer = this->getLeftPlayer();
-
-        if (winningPlayer)
-        {
-             ChatManager::message(winningPlayer->getName() + " has won!");
-             this->end();
-        }
 
         // Restart the timer to start the ball.
@@ -317 +301 @@
     }
 
-    /**
-    @brief
-        Get the right player.
-    @return
-        Returns a pointer to the player playing on the right. If there is no right player, nullptr is returned.
-    */
     
 }

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

@@ -84 +84 @@
 
             PlayerInfo* getLeftPlayer() const; //!< Get the left player.
-            PlayerInfo* getRightPlayer() const; //!< Get the right player.
 
         protected:

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

@@ -35 +35 @@
 
 #include "core/CoreIncludes.h"
-#include "OrxoBloxAI.h"
 
 namespace orxonox
@@ -49 +48 @@
         RegisterObject(OrxoBloxBot);
 
-        this->defaultController_ = Class(OrxoBloxAI);
-        this->createController();
+        
     }
 }