Changeset 11317 for code/branches/Dialog_HS16/src/modules/overlays

Timestamp:

Dec 5, 2016, 3:59:27 PM (8 years ago)

Author:

dmoritz

Message:

Picture added

Location:

code/branches/Dialog_HS16/src/modules/overlays/hud

Files:

• HUDDialogue.cc (modified) (4 diffs)
• HUDDialogue.h (modified) (3 diffs)

code/branches/Dialog_HS16/src/modules/overlays/hud/HUDDialogue.cc

@@ -1 @@
-
-
-
 
 
@@ -13 +10 @@
 #include <OgreTextAreaOverlayElement.h>
 #include <OgrePanelOverlayElement.h>
+#include "core/CoreIncludes.h"
 
 namespace orxonox
@@ -23 +21 @@
     {
         RegisterObject(HUDDialogue);
-
-        overlayElementIcon_ = static_cast<Ogre::PanelOverlayElement* >(Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", "Dialogue" + getUniqueNumberString()));
+        }     
+    void HUDDialogue::updateTarget(std::string portrait)
+    {
+        overlayElementIcon_ = static_cast<Ogre::PanelOverlayElement* >(Ogre::OverlayManager::getSingleton().createOverlayElement("Panel", "Dialogue" + getUniqueNumberString()));
         overlayElementIcon_->setPosition(0.0f,0.0f);
         overlayElementIcon_->setDimensions(1.0f,1.0f);
-        this->background_->addChild(overlayElementIcon_);
+        this->background_->addChild(overlayElementIcon_);     
 
-        overlayElementIcon_->setMaterialName("Orxonox/DialogueHUD_Person");
-
-           }     
-
-        void HUDDialogue::tick(float dt)
+        overlayElementIcon_->setMaterialName(portrait);
+        this->setVisible(true);
+        portraitTimer.setTimer(2.9f,false,createExecutor(createFunctor(&HUDDialogue::invisible, this)));
+    }
+    void HUDDialogue::invisible()
     {
-        SUPER(HUDDialogue, tick, dt);
-
-
+        this->setVisible(false);
+        Ogre::OverlayManager::getSingleton().destroyOverlayElement(this->overlayElementIcon_);
     }
-
          HUDDialogue::~HUDDialogue()
          {
@@ -45 +43 @@
 
          }
-
-         void HUDDialogue::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-         {
-                SUPER(HUDDialogue, XMLPort, xmlelement, mode);
-         }
-
 }

code/branches/Dialog_HS16/src/modules/overlays/hud/HUDDialogue.h

@@ -1 @@
-
-
-
 
 
@@ -13 +10 @@
 
 #include "util/OgreForwardRefs.h"
-#include "tools/interfaces/Tickable.h"
 #include "overlays/OrxonoxOverlay.h"
+#include "tools/Timer.h"
 
 namespace orxonox
 {
-        class _OverlaysExport HUDDialogue : public OrxonoxOverlay, public Tickable
+        class _OverlaysExport HUDDialogue : public OrxonoxOverlay
     {
         public:
@@ -24 +21 @@
             virtual ~HUDDialogue();
 
-            virtual void tick(float dt) override;
+            virtual void updateTarget(std::string portrait);
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
-
-
+            virtual void invisible();
 
       private:
                         Ogre::PanelOverlayElement* overlayElementIcon_;
+
+                        Timer portraitTimer;
     };
 }
-
 #endif