Changeset 3033 for code/trunk

Timestamp:

May 23, 2009, 9:57:52 PM (16 years ago)

Author:

landauf

Message:

merged gametypes branch back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/OrxonoxPrereqs.h (modified) (5 diffs)
• src/orxonox/objects/gametypes/Asteroids.cc (copied) (copied from code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.cc)
• src/orxonox/objects/gametypes/Asteroids.h (copied) (copied from code/branches/gametypes/src/orxonox/objects/gametypes/Asteroids.h)
• src/orxonox/objects/gametypes/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/gametypes/Gametype.cc (modified) (7 diffs)
• src/orxonox/objects/gametypes/Gametype.h (modified) (3 diffs)
• src/orxonox/objects/gametypes/TeamBaseMatch.cc (copied) (copied from code/branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.cc) (2 diffs)
• src/orxonox/objects/gametypes/TeamBaseMatch.h (copied) (copied from code/branches/gametypes/src/orxonox/objects/gametypes/TeamBaseMatch.h)
• src/orxonox/objects/gametypes/TeamDeathmatch.cc (modified) (2 diffs)
• src/orxonox/objects/gametypes/TeamDeathmatch.h (modified) (1 diff)
• src/orxonox/objects/gametypes/UnderAttack.cc (copied) (copied from code/branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.cc)
• src/orxonox/objects/gametypes/UnderAttack.h (copied) (copied from code/branches/gametypes/src/orxonox/objects/gametypes/UnderAttack.h)
• src/orxonox/objects/quest/QuestEffectBeacon.cc (modified) (2 diffs)
• src/orxonox/objects/worldentities/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/worldentities/ForceField.cc (copied) (copied from code/branches/gametypes/src/orxonox/objects/worldentities/ForceField.cc)
• src/orxonox/objects/worldentities/ForceField.h (copied) (copied from code/branches/gametypes/src/orxonox/objects/worldentities/ForceField.h)
• src/orxonox/objects/worldentities/MobileEntity.cc (modified) (1 diff)
• src/orxonox/objects/worldentities/MobileEntity.h (modified) (1 diff)
• src/orxonox/objects/worldentities/MovableEntity.cc (modified) (2 diffs)
• src/orxonox/objects/worldentities/MovableEntity.h (modified) (3 diffs)
• src/orxonox/objects/worldentities/SpawnPoint.cc (modified) (1 diff)
• src/orxonox/objects/worldentities/pawns/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/worldentities/pawns/Destroyer.cc (copied) (copied from code/branches/gametypes/src/orxonox/objects/worldentities/pawns/Destroyer.cc)
• src/orxonox/objects/worldentities/pawns/Destroyer.h (copied) (copied from code/branches/gametypes/src/orxonox/objects/worldentities/pawns/Destroyer.h)
• src/orxonox/objects/worldentities/pawns/Pawn.cc (modified) (2 diffs)
• src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc (copied) (copied from code/branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.cc)
• src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h (copied) (copied from code/branches/gametypes/src/orxonox/objects/worldentities/pawns/TeamBaseMatchBase.h)
• src/orxonox/objects/worldentities/triggers/CMakeLists.txt (modified) (1 diff)
• src/orxonox/objects/worldentities/triggers/CheckPoint.cc (copied) (copied from code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.cc)
• src/orxonox/objects/worldentities/triggers/CheckPoint.h (copied) (copied from code/branches/gametypes/src/orxonox/objects/worldentities/triggers/CheckPoint.h)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc (modified) (3 diffs)
• src/orxonox/objects/worldentities/triggers/DistanceTrigger.h (modified) (1 diff)
• src/orxonox/objects/worldentities/triggers/PlayerTrigger.h (modified) (3 diffs)
• src/orxonox/objects/worldentities/triggers/Trigger.cc (modified) (3 diffs)
• src/orxonox/objects/worldentities/triggers/Trigger.h (modified) (2 diffs)
• src/orxonox/overlays/hud/CMakeLists.txt (modified) (1 diff)
• src/orxonox/overlays/hud/HUDTimer.cc (copied) (copied from code/branches/gametypes/src/orxonox/overlays/hud/HUDTimer.cc)
• src/orxonox/overlays/hud/HUDTimer.h (copied) (copied from code/branches/gametypes/src/orxonox/overlays/hud/HUDTimer.h)

code/trunk/src/orxonox/OrxonoxPrereqs.h

@@ -138 +138 @@
     class MovableEntity;
     class Sublevel;
+    class ForceField;
 
     class Model;
@@ -162 +163 @@
     class Pawn;
     class SpaceShip;
+    class TeamBaseMatchBase;
+    class Destroyer;
 
     class Item;
@@ -172 +175 @@
     class EventTrigger;
     class PlayerTrigger;
+    class CheckPoint;
 
     class WeaponSystem;
@@ -204 +208 @@
     class Deathmatch;
     class TeamDeathmatch;
+    class Asteroids;
+    class TeamBaseMatch;
+    class UnderAttack;
     class Pong;
 
@@ -236 +243 @@
     class HUDSpeedBar;
     class HUDHealthBar;
+    class HUDTimer;
     class InGameConsole;
     class Notification;

code/trunk/src/orxonox/objects/gametypes/CMakeLists.txt

@@ -3 +3 @@
   Deathmatch.cc
   TeamDeathmatch.cc
+  TeamBaseMatch.cc
   Pong.cc
+  UnderAttack.cc
+  Asteroids.cc
 )

code/trunk/src/orxonox/objects/gametypes/Gametype.cc

@@ -60 +60 @@
         this->numberOfBots_ = 0;
 
+        this->timeLimit_ = 0;
+        this->time_ = 0;
+        this->timerIsActive_ = false;
+
         this->initialStartCountdown_ = 3;
 
@@ -88 +92 @@
         SUPER(Gametype, tick, dt);
 
+        //count timer
+        if (timerIsActive_)
+        {
+            if (this->timeLimit_ == 0)
+                this->time_ += dt;
+            else
+                this->time_ -= dt;
+        }
+
         if (this->gtinfo_.bStartCountdownRunning_ && !this->gtinfo_.bStarted_)
             this->gtinfo_.startCountdown_ -= dt;
@@ -93 +106 @@
         if (!this->gtinfo_.bStarted_)
             this->checkStart();
-        else
+        else if (!this->gtinfo_.bEnded_)
             this->spawnDeadPlayersIfRequested();
 
@@ -111 +124 @@
     {
         this->gtinfo_.bEnded_ = true;
+
+        for (std::map<PlayerInfo*, Player>::iterator it = this->players_.begin(); it != this->players_.end(); ++it)
+        {
+            if (it->first->getControllableEntity())
+            {
+                ControllableEntity* oldentity = it->first->getControllableEntity();
+        
+                ControllableEntity* entity = this->defaultControllableEntity_.fabricate(oldentity->getCreator());
+                if (oldentity->getCamera())
+                {
+                    entity->setPosition(oldentity->getCamera()->getWorldPosition());
+                    entity->setOrientation(oldentity->getCamera()->getWorldOrientation());
+                }
+                else
+                {
+                    entity->setPosition(oldentity->getWorldPosition());
+                    entity->setOrientation(oldentity->getWorldOrientation());
+                }
+
+                it->first->stopControl(oldentity, true);
+                it->first->startControl(entity);
+            }
+            else
+                this->spawnPlayerAsDefaultPawn(it->first);
+        }
     }
 
@@ -267 +305 @@
                 if (!it->first->isReadyToSpawn() || !this->gtinfo_.bStarted_)
                 {
-                    SpawnPoint* spawn = this->getBestSpawnPoint(it->first);
-                    if (spawn)
-                    {
-                        // force spawn at spawnpoint with default pawn
-                        ControllableEntity* entity = this->defaultControllableEntity_.fabricate(spawn);
-                        spawn->spawn(entity);
-                        it->first->startControl(entity);
-                        it->second.state_ = PlayerState::Dead;
-                    }
-                    else
-                    {
-                        COUT(1) << "Error: No SpawnPoints in current Gametype" << std::endl;
-                        abort();
-                    }
+                    this->spawnPlayerAsDefaultPawn(it->first);
+                    it->second.state_ = PlayerState::Dead;
                 }
             }
@@ -358 +384 @@
     }
 
+    void Gametype::spawnPlayerAsDefaultPawn(PlayerInfo* player)
+    {
+        SpawnPoint* spawn = this->getBestSpawnPoint(player);
+        if (spawn)
+        {
+            // force spawn at spawnpoint with default pawn
+            ControllableEntity* entity = this->defaultControllableEntity_.fabricate(spawn);
+            spawn->spawn(entity);
+            player->startControl(entity);
+        }
+        else
+        {
+            COUT(1) << "Error: No SpawnPoints in current Gametype" << std::endl;
+            abort();
+        }
+    }
+
     void Gametype::addBots(unsigned int amount)
     {
@@ -376 +419 @@
         }
     }
+
+    void Gametype::addTime(float t)
+    { 
+        if (this->timeLimit_ == 0)
+          this->time_ -= t;
+        else
+          this->time_ += t;
+    }
+
+    void Gametype::removeTime(float t)
+    { 
+        if (this->timeLimit_ == 0)
+          this->time_ += t;
+        else
+          this->time_ -= t;
+    }
+
+    void Gametype::resetTimer()
+    { 
+        this->resetTimer(timeLimit_);
+    }
+
+    void Gametype::resetTimer(float t)
+    { 
+        this->timeLimit_ = t;
+        this->time_ = t;
+    }
 }

code/trunk/src/orxonox/objects/gametypes/Gametype.h

@@ -128 +128 @@
                 { return this->players_.size(); }
 
+            virtual void addTime(float t);
+            virtual void removeTime(float t);
+
+            inline  void startTimer()
+            { 
+                this->time_ = this->timeLimit_;
+                this->timerIsActive_ = true;
+            }
+
+            inline void stopTimer()
+              { this->timerIsActive_ = false; }
+
+            inline float getTime()
+              { return this->time_; }
+
+            inline bool getTimerIsActive()
+              { return timerIsActive_; }
+
+            inline void setTimeLimit(float t)
+              { this->timeLimit_ = t; }
+
+            virtual void resetTimer();
+            virtual void resetTimer(float t);
+
         protected:
             virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;
@@ -134 +158 @@
             virtual void checkStart();
             virtual void spawnPlayer(PlayerInfo* player);
+            virtual void spawnPlayerAsDefaultPawn(PlayerInfo* player);
             virtual void spawnPlayersIfRequested();
             virtual void spawnDeadPlayersIfRequested();
@@ -141 +166 @@
             bool bAutoStart_;
             bool bForceSpawn_;
+
+            float time_;
+            float timeLimit_;
+            bool timerIsActive_;
 
             float initialStartCountdown_;

code/trunk/src/orxonox/objects/gametypes/TeamBaseMatch.cc

@@ -125 +125 @@
     void TeamBaseMatch::showPoints()
     {
-
-        COUT(0) << "Points standing:" << std::endl << "Team 1: "<< pointsTeam1_ << std::endl << "Team 2: " << pointsTeam2_ << std::endl;
-        if(pointsTeam1_ >=1700) COUT(0) << "Team 1 is near victory!" << std::endl;
-        if(pointsTeam2_ >=1700) COUT(0) << "Team 2 is near victory!" << std::endl;
+        COUT(0) << "Points standing:" << std::endl << "Team 1: "<< pointsTeam1_ << std::endl << "Team 2: " << pointsTeam2_ << std::endl;
+        if(pointsTeam1_ >=1700) COUT(0) << "Team 1 is near victory!" << std::endl;
+        if(pointsTeam2_ >=1700) COUT(0) << "Team 2 is near victory!" << std::endl;
     }
 
@@ -135 +134 @@
     void TeamBaseMatch::winPoints()
     {
-        int amountControlled = 0;
-        int amountControlled2 = 0;
+        int amountControlled = 0;
+        int amountControlled2 = 0;
 
         for (std::set<TeamBaseMatchBase*>::const_iterator it = this->bases_.begin(); it != this->bases_.end(); ++it)
         {
-            if((*it)->getState() == BaseState::controlTeam1)
-            {
-                amountControlled++;
-            }
-            if((*it)->getState() == BaseState::controlTeam2)
-            {
-                amountControlled2++;
-            }
+            if((*it)->getState() == BaseState::controlTeam1)
+            {
+                amountControlled++;
+            }
+            if((*it)->getState() == BaseState::controlTeam2)
+            {
+                amountControlled2++;
+            }
         }
 

code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.cc

@@ -127 +127 @@
             {
                 TeamSpawnPoint* tsp = dynamic_cast<TeamSpawnPoint*>(*it);
-                if (tsp && tsp->getTeamNumber() != desiredTeamNr)
+                if (tsp && (int)tsp->getTeamNumber() != desiredTeamNr)
                 {
                     teamSpawnPoints.erase(it++);
@@ -189 +189 @@
         return false;
     }
+
+    int TeamDeathmatch::getTeam(PlayerInfo* player)
+    {
+        std::map<PlayerInfo*, int>::const_iterator it_player = this->teamnumbers_.find(player);
+        if (it_player != this->teamnumbers_.end())
+            return it_player->second;
+        else
+            return -1;
+    }
 }

code/trunk/src/orxonox/objects/gametypes/TeamDeathmatch.h

@@ -55 +55 @@
             virtual void playerStartsControllingPawn(PlayerInfo* player, Pawn* pawn);
 
+            inline const ColourValue& getTeamColour(int teamnr) const
+                { return this->teamcolours_[teamnr]; }
+
         protected:
             virtual SpawnPoint* getBestSpawnPoint(PlayerInfo* player) const;
             bool pawnsAreInTheSameTeam(Pawn* pawn1, Pawn* pawn2);
+            int getTeam(PlayerInfo* player);
 
             std::map<PlayerInfo*, int> teamnumbers_;

code/trunk/src/orxonox/objects/quest/QuestEffectBeacon.cc

@@ -41 +41 @@
 
 #include "orxonox/objects/infos/PlayerInfo.h"
-#include "orxonox/objects/worldentities/ControllableEntity.h"
+#include "orxonox/objects/worldentities/pawns/Pawn.h"
 #include "orxonox/objects/worldentities/triggers/PlayerTrigger.h"
 #include "QuestEffect.h"
@@ -120 +120 @@
 
         //! Extracting the ControllableEntity form the PlayerTrigger.
-        ControllableEntity* entity = trigger->getTriggeringPlayer();
-
-        if(entity == NULL)
-        {
-            COUT(2) << "The QuestEffectBeacon was triggered by an entity other than a ControllableEntity." << std::endl;
+        Pawn* pawn = trigger->getTriggeringPlayer();
+
+        if(pawn == NULL)
+        {
+            COUT(2) << "The QuestEffectBeacon was triggered by an entity other than a Pawn." << std::endl;
             return false;
         }
         
         //! Extract the PlayerInfo from the ControllableEntity.
-        PlayerInfo* player = entity->getPlayer();
+        PlayerInfo* player = pawn->getPlayer();
         
         if(player == NULL)

code/trunk/src/orxonox/objects/worldentities/CMakeLists.txt

@@ -23 +23 @@
   PongBall.cc
   PongBat.cc
+  ForceField.cc
 )
 

code/trunk/src/orxonox/objects/worldentities/MobileEntity.cc

@@ -166 +166 @@
     }
 
+    void MobileEntity::applyCentralForce(const Vector3& force)
+    {
+        if (this->isDynamic())
+            this->physicalBody_->applyCentralForce(btVector3(force.x * this->getMass(), force.y * this->getMass(), force.z * this->getMass()));
+    }
+
     bool MobileEntity::isCollisionTypeLegal(WorldEntity::CollisionType type) const
     {

code/trunk/src/orxonox/objects/worldentities/MobileEntity.h

@@ -75 +75 @@
                 { return this->angularAcceleration_; }
 
+            void applyCentralForce(const Vector3& force);
+            inline void applyCentralForce(float x, float y, float z)
+                { this->applyCentralForce(Vector3(x, y, z)); }
+
             inline void setRotationRate(Degree rate)
                 { this->setAngularVelocity(this->getAngularVelocity().normalisedCopy() * rate.valueRadians()); }

code/trunk/src/orxonox/objects/worldentities/MovableEntity.cc

@@ -35 +35 @@
 #include "core/Executor.h"
 #include "core/GameMode.h"
+#include "objects/worldentities/pawns/Pawn.h"
 
 namespace orxonox
@@ -67 +68 @@
     {
         SUPER(MovableEntity, XMLPort, xmlelement, mode);
+
+        XMLPortParam(MovableEntity, "enablecollisiondamage", setEnableCollisionDamage, getEnableCollisionDamage, xmlelement, mode).defaultValues(false);
+        XMLPortParam(MovableEntity, "collisiondamage", setCollisionDamage, getCollisionDamage, xmlelement, mode).defaultValues(1);
     }
+
+    bool MovableEntity::collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint)
+    {
+        if (GameMode::isMaster() && enableCollisionDamage_)
+        {
+            Pawn* victim = dynamic_cast<Pawn*>(otherObject);
+            if (victim)
+            {
+                victim->damage(this->collisionDamage_ * victim->getVelocity().dotProduct(this->getVelocity()));
+            }
+        }
+
+        return false;
+    }
+
 
     void MovableEntity::registerVariables()

code/trunk/src/orxonox/objects/worldentities/MovableEntity.h

@@ -46 +46 @@
 
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
+            virtual bool collidesAgainst(WorldEntity* otherObject, btManifoldPoint& contactPoint);
             void registerVariables();
 
@@ -55 +56 @@
             inline void setOrientation(const Quaternion& orientation)
                 { MobileEntity::setOrientation(orientation); this->overwrite_orientation_ = this->getOrientation(); }
+
+            inline void setOwner(Pawn* owner)
+                { this->owner_ = owner; }
+            inline Pawn* getOwner() const
+                { return this->owner_; }
+
+            inline void setCollisionDamage(float c)
+                { this->collisionDamage_ = c; }
+
+            inline float getCollisionDamage()
+                { return this->collisionDamage_; }
+
+            inline void setEnableCollisionDamage(bool c)
+            { 
+                this->enableCollisionDamage_ = c; 
+                this->enableCollisionCallback();
+            } 
+
+            inline bool getEnableCollisionDamage()
+                { return this->enableCollisionDamage_; }
 
         private:
@@ -76 +97 @@
             Timer<MovableEntity> resynchronizeTimer_;
             Timer<MovableEntity>* continuousResynchroTimer_;
+
+            Pawn* owner_;
+            float collisionDamage_;
+            bool enableCollisionDamage_;
     };
 }

code/trunk/src/orxonox/objects/worldentities/SpawnPoint.cc

@@ -95 +95 @@
     void SpawnPoint::spawn(ControllableEntity* entity)
     {
-        entity->setPosition(this->getPosition());
-        entity->setOrientation(this->getOrientation());
+        entity->setPosition(this->getWorldPosition());
+        entity->setOrientation(this->getWorldOrientation());
     }
 }

code/trunk/src/orxonox/objects/worldentities/pawns/CMakeLists.txt

@@ -3 +3 @@
   Pawn.cc
   SpaceShip.cc
+  TeamBaseMatchBase.cc
+  Destroyer.cc
 )

code/trunk/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -198 +198 @@
     void Pawn::death()
     {
+        this->setHealth(1);
         if (this->getGametype() && this->getGametype()->allowPawnDeath(this, this->lastHitOriginator_))
         {
@@ -214 +215 @@
                 this->deatheffect();
         }
-        else
-            this->setHealth(1);
     }
 

code/trunk/src/orxonox/objects/worldentities/triggers/CMakeLists.txt

@@ -4 +4 @@
   EventTrigger.cc
   PlayerTrigger.cc
+  CheckPoint.cc
 )

code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc

@@ -35 +35 @@
 #include "core/XMLPort.h"
 
-#include "orxonox/objects/worldentities/ControllableEntity.h"
+#include "orxonox/objects/worldentities/pawns/Pawn.h"
 
 namespace orxonox
@@ -109 +109 @@
     WEMask.include(Class(WorldEntity));
     this->targetMask_ *= WEMask;
+
+    this->notifyMaskUpdate();
   }
 
@@ -133 +135 @@
         if(this->isForPlayer())
         {
-          ControllableEntity* player = dynamic_cast<ControllableEntity*>(entity);
+          Pawn* player = dynamic_cast<Pawn*>(entity);
           this->setTriggeringPlayer(player);
         }

code/trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.h

@@ -63 +63 @@
     protected:
       virtual bool isTriggered(TriggerMode mode);
+      virtual void notifyMaskUpdate() {}
+
+      ClassTreeMask targetMask_;
 
     private:
-      ClassTreeMask targetMask_;
       std::set<Ogre::Node*> targetSet_;
       float distance_;

code/trunk/src/orxonox/objects/worldentities/triggers/PlayerTrigger.h

@@ -60 +60 @@
         @return Returns a pointer to the ControllableEntity that triggered the PlayerTrigger.
         */
-        inline ControllableEntity* getTriggeringPlayer(void) const
+        inline Pawn* getTriggeringPlayer(void) const
             { return this->player_; }
         
@@ -77 +77 @@
         @param player A pointer to the ControllableEntity that triggered the PlayerTrigger.
         */
-        inline void setTriggeringPlayer(ControllableEntity* player)
+        inline void setTriggeringPlayer(Pawn* player)
            { this->player_ = player; }
 
@@ -88 +88 @@
         
     private:
-        ControllableEntity* player_; //!< The player that triggered the PlayerTrigger.
+        Pawn* player_; //!< The player that triggered the PlayerTrigger.
         bool isForPlayer_; //!< Is true when the PlayerTrigger schould be set to normally be triggered by ControllableEntities.
     

code/trunk/src/orxonox/objects/worldentities/triggers/Trigger.cc

@@ -102 +102 @@
     {
       this->bFirstTick_ = false;
-      this->fireEvent(false);
+      this->triggered(false);
     }
 
@@ -144 +144 @@
       this->bTriggered_ = (newState & 0x1);
       this->bActive_ = newState & 2;
-      this->fireEvent(this->bActive_);
+      this->triggered(this->bActive_);
       this->stateChanges_.pop();
       if (this->stateChanges_.size() != 0)
@@ -160 +160 @@
     else
       this->setBillboardColour(ColourValue(1.0, 0.0, 0.0));
+  }
+
+  void Trigger::triggered(bool bIsTriggered)
+  {
+    this->fireEvent(bIsTriggered);
   }
 

code/trunk/src/orxonox/objects/worldentities/triggers/Trigger.h

@@ -89 +89 @@
         { return this->remainingActivations_; }
 
+      inline void setVisible(bool visibility)
+        { this->debugBillboard_.setVisible(visibility); }
+
       void setDelay(float delay);
       inline float getDelay() const
@@ -101 +104 @@
       inline bool isTriggered() { return this->isTriggered(this->mode_); }
       virtual bool isTriggered(TriggerMode mode);
+      virtual void triggered(bool bIsTriggered);
 
     private:

code/trunk/src/orxonox/overlays/hud/CMakeLists.txt

@@ -5 +5 @@
   HUDSpeedBar.cc
   HUDHealthBar.cc
+  HUDTimer.cc
   ChatOverlay.cc
   GametypeStatus.cc