Changeset 2824 for code/branches

Timestamp:

Mar 23, 2009, 11:26:46 AM (16 years ago)

Author:

landauf

Message:

Added "Pong" minigame

Location:

code/branches/miniprojects/src/orxonox

Files:

• OrxonoxPrereqs.h (modified) (3 diffs)
• objects/gametypes/CMakeLists.txt (modified) (1 diff)
• objects/gametypes/Deathmatch.cc (modified) (3 diffs)
• objects/gametypes/Deathmatch.h (modified) (1 diff)
• objects/gametypes/Gametype.cc (modified) (2 diffs)
• objects/gametypes/Gametype.h (modified) (2 diffs)
• objects/gametypes/Pong.cc (added)
• objects/gametypes/Pong.h (added)
• objects/worldentities/CMakeLists.txt (modified) (1 diff)
• objects/worldentities/CameraPosition.cc (modified) (2 diffs)
• objects/worldentities/CameraPosition.h (modified) (2 diffs)
• objects/worldentities/ControllableEntity.cc (modified) (1 diff)
• objects/worldentities/PongBall.cc (added)
• objects/worldentities/PongBall.h (added)
• objects/worldentities/PongBat.cc (added)
• objects/worldentities/PongBat.h (added)
• objects/worldentities/PongCenterpoint.cc (added)
• objects/worldentities/PongCenterpoint.h (added)

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

@@ -104 +104 @@
     class RadarListener;
 
+    class Teamcolourable;
+
     class CameraManager;
     class LevelManager;
@@ -149 +151 @@
     class ParticleSpawner;
 
+    class PongCenterpoint;
+    class PongBall;
+    class PongBat;
+
     class Camera;
     class CameraPosition;
     class SpawnPoint;
+    class TeamSpawnPoint;
 
     class Spectator;
@@ -193 +200 @@
 
     class Gametype;
+    class Deathmatch;
+    class TeamDeathmatch;
+    class Pong;
 
     class Scores;

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

@@ -3 +3 @@
   Deathmatch.cc
   TeamDeathmatch.cc
+  Pong.cc
 )

code/branches/miniprojects/src/orxonox/objects/gametypes/Deathmatch.cc

@@ -49 +49 @@
         Gametype::start();
 
-        COUT(0) << "game started" << std::endl;
+        std::string message = "The match has started!";
+        COUT(0) << message << std::endl;
+        Host::Broadcast(message);
     }
 
@@ -56 +58 @@
         Gametype::end();
 
-        COUT(0) << "game ended" << std::endl;
+        std::string message = "The match has ended.";
+        COUT(0) << message << std::endl;
+        Host::Broadcast(message);
     }
 
@@ -117 +121 @@
         Gametype::pawnKilled(victim, killer);
     }
+
+    void Deathmatch::playerScored(PlayerInfo* player)
+    {
+        Gametype::playerScored(player);
+
+        if (player)
+        {
+            std::string message = player->getName() + " scores!";
+            COUT(0) << message << std::endl;
+            Host::Broadcast(message);
+        }
+    }
 }

code/branches/miniprojects/src/orxonox/objects/gametypes/Deathmatch.h

@@ -49 +49 @@
 
             virtual void pawnKilled(Pawn* victim, Pawn* killer = 0);
+            virtual void playerScored(PlayerInfo* player);
     };
 }

code/branches/miniprojects/src/orxonox/objects/gametypes/Gametype.cc

@@ -200 +200 @@
                 // Reward killer
                 if (killer)
-                {
-                    std::map<PlayerInfo*, Player>::iterator itKiller = this->players_.find(killer->getPlayer());
-                    if (itKiller != this->players_.end())
-                    {
-                        this->playerScored(itKiller->second);
-                    }
-                    else
-                        COUT(2) << "Warning: Killing Pawn was not in the playerlist" << std::endl;
-                }
+                    this->playerScored(killer->getPlayer());
 
                 ControllableEntity* entity = this->defaultControllableEntity_.fabricate(victim->getCreator());
@@ -228 +220 @@
     }
 
-    void Gametype::playerScored(Player& player)
-    {
-        player.frags_++;
+    void Gametype::playerScored(PlayerInfo* player)
+    {
+        std::map<PlayerInfo*, Player>::iterator it = this->players_.find(player);
+        if (it != this->players_.end())
+            it->second.frags_++;
     }
 

code/branches/miniprojects/src/orxonox/objects/gametypes/Gametype.h

@@ -89 +89 @@
             virtual bool playerChangedName(PlayerInfo* player);
 
-            virtual void playerScored(Player& player);
+            virtual void playerScored(PlayerInfo* player);
 
             virtual bool allowPawnHit(Pawn* victim, Pawn* originator = 0);
@@ -129 +129 @@
             virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;
 
-            void addPlayer(PlayerInfo* player);
-            void removePlayer(PlayerInfo* player);
-
-            void assignDefaultPawnsIfNeeded();
-            void checkStart();
-            void spawnPlayer(PlayerInfo* player);
-            void spawnPlayersIfRequested();
-            void spawnDeadPlayersIfRequested();
+            virtual void assignDefaultPawnsIfNeeded();
+            virtual void checkStart();
+            virtual void spawnPlayer(PlayerInfo* player);
+            virtual void spawnPlayersIfRequested();
+            virtual void spawnDeadPlayersIfRequested();
 
             GametypeInfo gtinfo_;

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

@@ -20 +20 @@
   SpawnPoint.cc
   TeamSpawnPoint.cc
+  PongCenterpoint.cc
+  PongBall.cc
+  PongBat.cc
 )
 

code/branches/miniprojects/src/orxonox/objects/worldentities/CameraPosition.cc

@@ -44 +44 @@
         this->bDrag_ = false;
         this->bAllowMouseLook_ = false;
+        this->bAbsolute_ = false;
 
         this->setObjectMode(0x0);
@@ -58 +59 @@
         XMLPortParam(CameraPosition, "drag", setDrag, getDrag, xmlelement, mode).defaultValues(false);
         XMLPortParam(CameraPosition, "mouselook", setAllowMouseLook, getAllowMouseLook, xmlelement, mode).defaultValues(false);
+        XMLPortParam(CameraPosition, "absolute", setIsAbsolute, getIsAbsolute, xmlelement, mode).defaultValues(false);
     }
 

code/branches/miniprojects/src/orxonox/objects/worldentities/CameraPosition.h

@@ -54 +54 @@
                 { return this->bAllowMouseLook_; }
 
+            inline void setIsAbsolute(bool bAbsolute)
+                { this->bAbsolute_ = bAbsolute; }
+            inline bool getIsAbsolute() const
+                { return this->bAbsolute_; }
+
             void attachCamera(Camera* camera);
 
@@ -59 +64 @@
             bool bDrag_;
             bool bAllowMouseLook_;
+            bool bAbsolute_;
     };
 }

code/branches/miniprojects/src/orxonox/objects/worldentities/ControllableEntity.cc

@@ -144 +144 @@
     void ControllableEntity::addCameraPosition(CameraPosition* position)
     {
-        if (position->getAllowMouseLook())
-            position->attachToNode(this->cameraPositionRootNode_);
+        if (!position->getIsAbsolute())
+        {
+            if (position->getAllowMouseLook())
+                position->attachToNode(this->cameraPositionRootNode_);
+            else
+                this->attach(position);
+        }
         else
-            this->attach(position);
+        {
+            WorldEntity* parent = this->getParent();
+            if (parent)
+                parent->attach(position);
+        }
         this->cameraPositions_.push_back(position);
     }