Changeset 8682 for code/branches/presentation/src

Timestamp:

May 30, 2011, 10:20:27 AM (13 years ago)

Author:

dafrick

Message:

Hack-ish Hack to just have one HUD at a time.

Location:

code/branches/presentation/src/orxonox

Files:

• infos/PlayerInfo.cc (modified) (3 diffs)
• worldentities/ControllableEntity.cc (modified) (2 diffs)
• worldentities/ControllableEntity.h (modified) (1 diff)

code/branches/presentation/src/orxonox/infos/PlayerInfo.cc

@@ -176 +176 @@
         if (!entity)
             return;
-        
+
+        this->controllableEntity_->destroyHud(); // HACK-ish
         this->previousControllableEntity_.push_back(WeakPtr<ControllableEntity>(this->controllableEntity_));
         this->controllableEntity_ = entity;
@@ -234 +235 @@
 
         this->controllableEntity_->setController(0);
+        this->controllableEntity_->destroyHud(); // HACK-ish
         
 //        this->controllableEntity_ = this->previousControllableEntity_.back();
@@ -245 +247 @@
             this->controller_->setControllableEntity(this->controllableEntity_);
 
+         // HACK-ish
+        if(this->controllableEntity_ != NULL)
+            this->controllableEntity_->createHud();
+
         if ( GameMode::isMaster() )
             entity->removePlayer();

code/branches/presentation/src/orxonox/worldentities/ControllableEntity.cc

@@ -406 +406 @@
         }
 
+        this->createHud();
+    }
+
+    // HACK-ish
+    void ControllableEntity::createHud(void)
+    {
         if (!this->hud_ && GameMode::showsGraphics())
         {
@@ -414 +420 @@
                 this->hud_->setOwner(this);
             }
+        }
+    }
+
+    void ControllableEntity::destroyHud(void)
+    {
+        if (this->hud_ != NULL)
+        {
+            this->hud_->destroy();
+            this->hud_ = NULL;
         }
     }

code/branches/presentation/src/orxonox/worldentities/ControllableEntity.h

@@ -176 +176 @@
             inline void setHudTemplate(const std::string& name)
                 { this->hudtemplate_ = name; }
+            // HACK-ish
+            void createHud(void);
+            void destroyHud(void);
 
             Ogre::SceneNode* cameraPositionRootNode_;