Changeset 2369 for code/branches/objecthierarchy2/src/orxonox/objects

Timestamp:

Dec 10, 2008, 3:37:48 AM (16 years ago)

Author:

landauf

Message:

• Added a health bar
• Some changes in CameraManager to handle the case when no camera exists after removing the last one, but this is still somehow buggy (freezes and later crashes reproducible but inexplicable after a few respawns)
• Added PawnManager to handle destruction of Pawns without using delete within tick()

Location:

code/branches/objecthierarchy2/src/orxonox/objects

Files:

• EventTarget.cc (modified) (1 diff)
• gametypes/Gametype.cc (modified) (2 diffs)
• infos/PlayerInfo.cc (modified) (1 diff)
• worldentities/Camera.cc (modified) (5 diffs)
• worldentities/pawns/Pawn.cc (modified) (8 diffs)
• worldentities/pawns/Pawn.h (modified) (2 diffs)

code/branches/objecthierarchy2/src/orxonox/objects/EventTarget.cc

@@ -48 +48 @@
     void EventTarget::changedName()
     {
+        SUPER(EventTarget, changedName);
+
         for (ObjectList<BaseObject>::iterator it = ObjectList<BaseObject>::begin(); it != ObjectList<BaseObject>::end(); ++it)
             if (it->getName() == this->getName())

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

@@ -169 +169 @@
         for (std::map<PlayerInfo*, PlayerState::Enum>::iterator it = this->players_.begin(); it != this->players_.end(); ++it)
         {
-            if (!it->first->getControllableEntity() && (!it->first->isReadyToSpawn() || !this->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 = PlayerState::Dead;
-                }
-                else
-                {
-                    COUT(1) << "Error: No SpawnPoints in current Gametype" << std::endl;
-                    abort();
+            if (!it->first->getControllableEntity())
+            {
+                it->second = PlayerState::Dead;
+
+                if (!it->first->isReadyToSpawn() || !this->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 = PlayerState::Dead;
+                    }
+                    else
+                    {
+                        COUT(1) << "Error: No SpawnPoints in current Gametype" << std::endl;
+                        abort();
+                    }
                 }
             }
@@ -211 +216 @@
                 {
                     bool allplayersready = true;
+                    bool hashumanplayers = false;
                     for (std::map<PlayerInfo*, PlayerState::Enum>::iterator it = this->players_.begin(); it != this->players_.end(); ++it)
                     {
                         if (!it->first->isReadyToSpawn())
                             allplayersready = false;
-                    }
-                    if (allplayersready)
+                        if (it->first->isHumanPlayer())
+                            hashumanplayers = true;
+                    }
+                    if (allplayersready && hashumanplayers)
                     {
                         this->startCountdown_ = this->initialStartCountdown_;

code/branches/objecthierarchy2/src/orxonox/objects/infos/PlayerInfo.cc

@@ -77 +77 @@
     void PlayerInfo::changedName()
     {
+        SUPER(PlayerInfo, changedName);
+
         if (this->isInitialized() && this->getGametype())
             this->getGametype()->playerChangedName(this);

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/Camera.cc

@@ -54 +54 @@
     {
         RegisterObject(Camera);
-
+COUT(0) << this << ": created camera" << std::endl;
         if (!this->getScene() || !this->getScene()->getSceneManager())
             ThrowException(AbortLoading, "Can't create Camera, no scene or no scene manager given.");
@@ -70 +70 @@
         this->configvaluecallback_changedNearClipDistance();
 
-        this->requestFocus(); // ! HACK ! REMOVE THIS !
+//        this->requestFocus(); // ! HACK ! REMOVE THIS !
     }
 
@@ -80 +80 @@
             this->getScene()->getSceneManager()->destroyCamera(this->camera_);
         }
+COUT(0) << this << ": destroyed camera" << std::endl;
     }
 
@@ -122 +123 @@
     void Camera::removeFocus()
     {
+COUT(0) << this << ": remove focus" << std::endl;
         this->bHasFocus_ = false;
     }
@@ -142 +144 @@
         this->bHasFocus_ = true;
         viewport->setCamera(this->camera_);
+COUT(0) << this << ": set focus" << std::endl;
 
         // reactivate all visible compositors

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/Pawn.cc

@@ -33 +33 @@
 #include "core/XMLPort.h"
 #include "util/Math.h"
+#include "PawnManager.h"
 #include "objects/infos/PlayerInfo.h"
 #include "objects/gametypes/Gametype.h"
@@ -45 +46 @@
         RegisterObject(Pawn);
 
-        this->bAlive_ = false;
+        PawnManager::touch();
+
+        this->bAlive_ = true;
 
         this->health_ = 0;
@@ -70 +73 @@
     Pawn::~Pawn()
     {
+        if (this->isInitialized())
+        {
+            for (ObjectList<PawnListener>::iterator it = ObjectList<PawnListener>::begin(); it != ObjectList<PawnListener>::end(); ++it)
+                it->destroyedPawn(this);
+        }
     }
 
@@ -76 +84 @@
         SUPER(Pawn, XMLPort, xmlelement, mode);
 
-        XMLPortParam(Pawn, "health", setHealth, getHealht, xmlelement, mode).defaultValues(100);
+        XMLPortParam(Pawn, "health", setHealth, getHealth, xmlelement, mode).defaultValues(100);
         XMLPortParam(Pawn, "maxhealth", setMaxHealth, getMaxHealth, xmlelement, mode).defaultValues(200);
         XMLPortParam(Pawn, "initialhealth", setInitialHealth, getInitialHealth, xmlelement, mode).defaultValues(100);
@@ -85 +93 @@
         REGISTERDATA(this->bAlive_, direction::toclient);
         REGISTERDATA(this->health_, direction::toclient);
+        REGISTERDATA(this->initialHealth_, direction::toclient);
     }
 
@@ -90 +99 @@
     {
         SUPER(Pawn, tick, dt);
+
+        this->health_ -= 15 * dt * rnd();
 
         if (this->health_ <= 0)
@@ -129 +140 @@
     void Pawn::death()
     {
+        // Set bAlive_ to false and wait for PawnManager to do the destruction
         this->bAlive_ = false;
+
         if (this->getGametype())
             this->getGametype()->pawnKilled(this, this->lastHitOriginator_);
+
+        this->setDestroyWhenPlayerLeft(false);
+
         if (this->getPlayer())
             this->getPlayer()->stopControl(this);
-
-        delete this;
 
         // play death effect
@@ -151 +165 @@
         this->spawn();
     }
+
+    ///////////////////
+    // Pawn Listener //
+    ///////////////////
+    PawnListener::PawnListener()
+    {
+        RegisterRootObject(PawnListener);
+    }
 }

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/Pawn.h

@@ -55 +55 @@
             inline void removeHealth(float health)
                 { this->setHealth(this->health_ - health); }
-            inline float getHealht() const
+            inline float getHealth() const
                 { return this->health_; }
 
@@ -96 +96 @@
             WeaponSystem* weaponSystem_;
     };
+
+    class _OrxonoxExport PawnListener : public OrxonoxClass
+    {
+        friend class Pawn;
+
+        public:
+            PawnListener();
+            virtual ~PawnListener() {}
+
+        protected:
+            virtual void destroyedPawn(Pawn* pawn) = 0;
+    };
 }