Changeset 5725

Timestamp:

Aug 31, 2009, 8:23:07 PM (15 years ago)

Author:

landauf

Message:

added a new module for the pong gametype and all related classes

Location:

code/branches/libraries2/src

Files:

• modules/CMakeLists.txt (modified) (1 diff)
• modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
• modules/pong (added)
• modules/pong/CMakeLists.txt (added)
• modules/pong/Pong.cc (moved) (moved from code/branches/libraries2/src/orxonox/objects/gametypes/Pong.cc) (1 diff)
• modules/pong/Pong.h (moved) (moved from code/branches/libraries2/src/orxonox/objects/gametypes/Pong.h) (1 diff)
• modules/pong/PongAI.cc (moved) (moved from code/branches/libraries2/src/orxonox/objects/controllers/PongAI.cc) (1 diff)
• modules/pong/PongAI.h (moved) (moved from code/branches/libraries2/src/orxonox/objects/controllers/PongAI.h) (1 diff)
• modules/pong/PongBall.cc (moved) (moved from code/branches/libraries2/src/orxonox/objects/worldentities/PongBall.cc) (1 diff)
• modules/pong/PongBall.h (moved) (moved from code/branches/libraries2/src/orxonox/objects/worldentities/PongBall.h) (2 diffs)
• modules/pong/PongBat.cc (moved) (moved from code/branches/libraries2/src/orxonox/objects/worldentities/PongBat.cc)
• modules/pong/PongBat.h (moved) (moved from code/branches/libraries2/src/orxonox/objects/worldentities/PongBat.h) (1 diff)
• modules/pong/PongBot.cc (moved) (moved from code/branches/libraries2/src/orxonox/objects/infos/PongBot.cc) (1 diff)
• modules/pong/PongBot.h (moved) (moved from code/branches/libraries2/src/orxonox/objects/infos/PongBot.h) (1 diff)
• modules/pong/PongCenterpoint.cc (moved) (moved from code/branches/libraries2/src/orxonox/objects/worldentities/PongCenterpoint.cc) (1 diff)
• modules/pong/PongCenterpoint.h (moved) (moved from code/branches/libraries2/src/orxonox/objects/worldentities/PongCenterpoint.h) (2 diffs)
• modules/pong/PongPrereqs.h (added)
• modules/pong/PongScore.cc (moved) (moved from code/branches/libraries2/src/modules/overlays/hud/PongScore.cc) (1 diff)
• modules/pong/PongScore.h (moved) (moved from code/branches/libraries2/src/modules/overlays/hud/PongScore.h) (2 diffs)
• orxonox/OrxonoxPrereqs.h (modified) (4 diffs)
• orxonox/objects/controllers/CMakeLists.txt (modified) (1 diff)
• orxonox/objects/gametypes/CMakeLists.txt (modified) (1 diff)
• orxonox/objects/infos/CMakeLists.txt (modified) (1 diff)
• orxonox/objects/worldentities/CMakeLists.txt (modified) (1 diff)

code/branches/libraries2/src/modules/CMakeLists.txt

@@ -22 +22 @@
 ADD_SUBDIRECTORY(gamestates)
 ADD_SUBDIRECTORY(overlays)
+ADD_SUBDIRECTORY(pong)
 ADD_SUBDIRECTORY(questsystem)
 ADD_SUBDIRECTORY(weapons)

code/branches/libraries2/src/modules/overlays/hud/CMakeLists.txt

@@ -11 +11 @@
   KillMessage.cc
   DeathMessage.cc
-  PongScore.cc
   UnderAttackHealthBar.cc
   TeamBaseMatchScore.cc

code/branches/libraries2/src/modules/pong/Pong.cc

@@ -31 +31 @@
 #include "core/CoreIncludes.h"
 #include "core/Executor.h"
-#include "objects/worldentities/PongCenterpoint.h"
-#include "objects/worldentities/PongBall.h"
-#include "objects/worldentities/PongBat.h"
-#include "objects/infos/PongBot.h"
-#include "objects/controllers/PongAI.h"
+#include "PongCenterpoint.h"
+#include "PongBall.h"
+#include "PongBat.h"
+#include "PongBot.h"
+#include "PongAI.h"
 
 namespace orxonox

code/branches/libraries2/src/modules/pong/Pong.h

@@ -30 +30 @@
 #define _Pong_H__
 
-#include "OrxonoxPrereqs.h"
+#include "pong/PongPrereqs.h"
 
 #include "tools/Timer.h"
-#include "Deathmatch.h"
+#include "objects/gametypes/Deathmatch.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Pong : public Deathmatch
+    class _PongExport Pong : public Deathmatch
     {
         public:

code/branches/libraries2/src/modules/pong/PongAI.cc

@@ -33 +33 @@
 #include "tools/Timer.h"
 #include "objects/worldentities/ControllableEntity.h"
-#include "objects/worldentities/PongBall.h"
+#include "PongBall.h"
 
 namespace orxonox

code/branches/libraries2/src/modules/pong/PongAI.h

@@ -30 +30 @@
 #define _PongAI_H__
 
-#include "OrxonoxPrereqs.h"
+#include "pong/PongPrereqs.h"
 
 #include <list>
 #include "util/Math.h"
 #include "tools/interfaces/Tickable.h"
-#include "Controller.h"
+#include "objects/controllers/Controller.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport PongAI : public Controller, public Tickable
+    class _PongExport PongAI : public Controller, public Tickable
     {
         public:

code/branches/libraries2/src/modules/pong/PongBall.cc

@@ -32 +32 @@
 #include "core/GameMode.h"
 #include "objects/gametypes/Gametype.h"
-#include "objects/worldentities/PongBat.h"
+#include "PongBat.h"
 #include "sound/SoundBase.h"
 

code/branches/libraries2/src/modules/pong/PongBall.h

@@ -30 +30 @@
 #define _PongBall_H__
 
-#include "OrxonoxPrereqs.h"
+#include "pong/PongPrereqs.h"
 
 #include "util/Math.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    class _OrxonoxExport PongBall : public MovableEntity
+    class _PongExport PongBall : public MovableEntity
     {
         public:

code/branches/libraries2/src/modules/pong/PongBat.h

@@ -30 +30 @@
 #define _PongBat_H__
 
-#include "OrxonoxPrereqs.h"
+#include "pong/PongPrereqs.h"
 #include "objects/worldentities/ControllableEntity.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport PongBat : public ControllableEntity
+    class _PongExport PongBat : public ControllableEntity
     {
         public:

code/branches/libraries2/src/modules/pong/PongBot.cc

@@ -30 +30 @@
 
 #include "core/CoreIncludes.h"
-#include "objects/controllers/PongAI.h"
+#include "PongAI.h"
 
 namespace orxonox

code/branches/libraries2/src/modules/pong/PongBot.h

@@ -30 +30 @@
 #define _PongBot_H__
 
-#include "OrxonoxPrereqs.h"
-#include "Bot.h"
+#include "pong/PongPrereqs.h"
+#include "objects/infos/Bot.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport PongBot : public Bot
+    class _PongExport PongBot : public Bot
     {
         public:

code/branches/libraries2/src/modules/pong/PongCenterpoint.cc

@@ -31 +31 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "objects/gametypes/Pong.h"
+#include "Pong.h"
 
 namespace orxonox

code/branches/libraries2/src/modules/pong/PongCenterpoint.h

@@ -30 +30 @@
 #define _PongCenterpoint_H__
 
-#include "OrxonoxPrereqs.h"
+#include "pong/PongPrereqs.h"
 
 #include <string>
@@ -38 +38 @@
 namespace orxonox
 {
-    class _OrxonoxExport PongCenterpoint : public StaticEntity
+    class _PongExport PongCenterpoint : public StaticEntity
     {
         public:

code/branches/libraries2/src/modules/pong/PongScore.cc

@@ -32 +32 @@
 #include "core/CoreIncludes.h"
 #include "core/XMLPort.h"
-#include "objects/gametypes/Pong.h"
+#include "Pong.h"
 #include "objects/infos/PlayerInfo.h"
 

code/branches/libraries2/src/modules/pong/PongScore.h

@@ -30 +30 @@
 #define _PongScore_H__
 
-#include "overlays/OverlaysPrereqs.h"
+#include "pong/PongPrereqs.h"
 
 #include "tools/interfaces/Tickable.h"
@@ -37 +37 @@
 namespace orxonox
 {
-    class _OverlaysExport PongScore : public OverlayText, public Tickable
+    class _PongExport PongScore : public OverlayText, public Tickable
     {
         public:

code/branches/libraries2/src/orxonox/OrxonoxPrereqs.h

@@ -106 +106 @@
 
     // mixed
-    class PongCenterpoint;
-    class PongBall;
-    class PongBat;
-
     class EventListener;
     class EventDispatcher;
@@ -139 +135 @@
     class TeamBaseMatch;
     class UnderAttack;
-    class Pong;
 
     // pickups
@@ -187 +182 @@
     class WaypointController;
     class WaypointPatrolController;
-    class PongAI;
 
     // infos
@@ -194 +188 @@
     class HumanPlayer;
     class Bot;
-    class PongBot;
     class GametypeInfo;
 

code/branches/libraries2/src/orxonox/objects/controllers/CMakeLists.txt

@@ -7 +7 @@
   WaypointController.cc
   WaypointPatrolController.cc
-  PongAI.cc
 )

code/branches/libraries2/src/orxonox/objects/gametypes/CMakeLists.txt

@@ -4 +4 @@
   TeamDeathmatch.cc
   TeamBaseMatch.cc
-  Pong.cc
   UnderAttack.cc
   Asteroids.cc

code/branches/libraries2/src/orxonox/objects/infos/CMakeLists.txt

@@ -1 +1 @@
 ADD_SOURCE_FILES(ORXONOX_SRC_FILES
   Bot.cc
-  PongBot.cc
   Info.cc
   PlayerInfo.cc

code/branches/libraries2/src/orxonox/objects/worldentities/CMakeLists.txt

@@ -22 +22 @@
   SpawnPoint.cc
   TeamSpawnPoint.cc
-  PongCenterpoint.cc
-  PongBall.cc
-  PongBat.cc
   ForceField.cc
 )