Changeset 11317 for code/branches

Timestamp:

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

Author:

dmoritz

Message:

Picture added

Location:

code/branches/Dialog_HS16

Files:

• data/levels/missionOne.oxw (modified) (10 diffs)
• data/overlays/HUDTemplates3.oxo (modified) (1 diff)
• src/modules/notifications/CMakeLists.txt (modified) (1 diff)
• src/modules/notifications/dispatchers/CMakeLists.txt (modified) (1 diff)
• src/modules/notifications/dispatchers/Dialogue.cc (modified) (3 diffs)
• src/modules/notifications/dispatchers/Dialogue.h (modified) (3 diffs)
• src/modules/overlays/hud/HUDDialogue.cc (modified) (4 diffs)
• src/modules/overlays/hud/HUDDialogue.h (modified) (3 diffs)

code/branches/Dialog_HS16/data/levels/missionOne.oxw

@@ -35 +35 @@
     displayTime=3.9
     position="0.2, 0, 0.1, 0"
-    fontSize="23"
+    fontSize="19"
     fontColor="0.3, 1, 0.2, 0.8"
     alignment="HorzCentred"
@@ -371 +371 @@
 
     <DistanceTrigger name="spawndelaytrigger0" position="800,700,600" target="Pawn" distance=10 stayActive="true" delay=2/>
-    <Dialogue speaker="ABC: " message=" Press (F3) to see your mission briefing.">
+    <Dialogue speaker="Speaker" message=" Press (F3) to see your mission briefing." portrait="Orxonox/DialogueHUD_Person">
         <events>
             <trigger>
@@ -410 +410 @@
 
     <DistanceTrigger name="flying1" position="800,700,600" target="Pawn" distance=10 stayActive="true" delay=6/>
-    <SimpleNotification message="Let's fly to the blinking light.">
+    <Dialogue speaker="Speaker" message="Let's fly to the blinking light." portrait="Orxonox/DialogueHUD_Person">
         <events>
             <trigger>
@@ -416 +416 @@
             </trigger>
         </events>
-    </SimpleNotification>
+    </Dialogue>
 
     <DistanceTrigger name="flying2" position="800,700,600" target="Pawn" distance=10 stayActive="true" delay=10/>
-    <SimpleNotification message="Use (W) to accelerate and the mouse to steer.">
+    <Dialogue speaker="Speaker" message="Use (W) to accelerate and the mouse to steer." portrait="Orxonox/DialogueHUD_Person">
         <events>
             <trigger>
@@ -425 +425 @@
             </trigger>
         </events>
-    </SimpleNotification>
+    </Dialogue>
 
 <!-- QUEST-Trigger && Message Trigger: navigationend is activated after flying4 was triggered -->
@@ -433 +433 @@
 
 
-    <Dialogue message="Three arrows just appeared.">
+    <Dialogue speaker="Speaker2" message="Three arrows just appeared." portrait="Orxonox/DialogueHUD_Person2">
         <events>
             <trigger>
@@ -442 +442 @@
 
     <DistanceTrigger name="flying5" position="-900,640,600" target="Pawn" distance=60 stayActive="true" delay=5/>
-    <SimpleNotification message="Follow those arrows.">
+    <Dialogue speaker="Speaker2" message="Follow those arrows." portrait="Orxonox/DialogueHUD_Person2">
         <events>
             <trigger>
@@ -448 +448 @@
             </trigger>
         </events>
-    </SimpleNotification>
+    </Dialogue>
 
 <!-------------------------------------- PART ONE : Destroy boxes --------------------------------------->
@@ -486 +486 @@
 
 <!-- @Text: How to shoot-->
-    <SimpleNotification message="Destroy the four boxes." broadcast="true">
+    <Dialogue speaker="Speaker" message="Destroy the four boxes." portrait="Orxonox/DialogueHUD_Person" broadcast="true">
         <events>
             <trigger>
@@ -492 +492 @@
             </trigger>
         </events>
-    </SimpleNotification>
-
-    <SimpleNotification message=" 1. Aim the a red cycle." broadcast="true">
+    </Dialogue>
+
+    <SimpleNotification message=" 1. Aim at the red cycle." broadcast="true">
         <events>
             <trigger>

code/branches/Dialog_HS16/data/overlays/HUDTemplates3.oxo

@@ -188 +188 @@
      name     = "Dialogue"
      position = "0.5, 0.85"
-     font     = "VeraMono"
+     pickpoint = "0.5, 0.5"
+     font     = "VeraMono"
+     size = "0.2, 0.2"
      textsize = 0.1
      colour   = "1.0, 1.0, 0.0, 0.8"

code/branches/Dialog_HS16/src/modules/notifications/CMakeLists.txt

@@ -17 +17 @@
     NotificationsPrecompiledHeaders.h
   LINK_LIBRARIES
+    overlays
     orxonox
   SOURCE_FILES ${NOTIFICATIONS_SRC_FILES}

code/branches/Dialog_HS16/src/modules/notifications/dispatchers/CMakeLists.txt

@@ -3 +3 @@
   SimpleNotification.cc
   Dialogue.cc
-  DialogueManager.cc
 )

code/branches/Dialog_HS16/src/modules/notifications/dispatchers/Dialogue.cc

@@ +1 @@
+
 
 
@@ -5 +6 @@
 #include "core/EventIncludes.h"
 #include "core/XMLPort.h"
+
+#include "overlays/hud/HUDDialogue.h"
+
+#include "NotificationDispatcher.h"
 
 namespace orxonox{
@@ -28 +33 @@
         XMLPortParam(Dialogue, "speaker", setSpeaker, getSpeaker, xmlelement, mode);
         XMLPortParam(Dialogue, "message", setMessage, getMessage, xmlelement, mode);
+        XMLPortParam(Dialogue, "portrait", setPortrait, getPortrait, xmlelement, mode);
         
     }
+     void Dialogue::update()
+   {    
+       for(HUDDialogue* huddialogue : ObjectList<HUDDialogue>())
+                       huddialogue->updateTarget(portrait_);
+    }
+    
     const std::string& Dialogue::createNotificationMessage(void)
                 {       
-                        dialogue_ = speaker_ + message_;
+                        dialogue_ = speaker_ + ": " + message_;
+                    this->update();
                         return this->dialogue_ ;
                 }

code/branches/Dialog_HS16/src/modules/notifications/dispatchers/Dialogue.h

@@ -20 +20 @@
 
             const std::string& getMessage(void)
-                { return this->message_; }
+                        { return this->message_; }
                 const std::string& getSpeaker(void)
                         {return this->speaker_;}
+            const std::string& getPortrait(void)
+                        { return this->portrait_;}
+
     protected:
         virtual const std::string& createNotificationMessage(void);
-                
+        virtual void update(void);
         
     private:
@@ -31 +34 @@
                 std::string speaker_;
                 std::string dialogue_;
+                std::string portrait_;
 
                 void setSpeaker(const std::string& speaker)
@@ -36 +40 @@
                 void setMessage(const std::string& message)
                 { this->message_ = message; }
+            void setPortrait(const std::string& portrait)
+                { this->portrait_ = portrait;}
         } ;       
-
 }
 

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