Changeset 11347

Timestamp:

Dec 19, 2016, 8:15:56 AM (7 years ago)

Author:

maxima

Message:

dialog branch merged to presentation

Location:

code/branches/Presentation_HS16

Files:

• . (modified) (1 prop)
• data/levels/missionOne.oxw (modified) (11 diffs)
• data/overlays/HUDTemplates3.oxo (modified) (1 diff)
• src/modules/notifications/CMakeLists.txt (modified) (1 diff)
• src/modules/notifications/NotificationDispatcher.h (modified) (1 diff)
• src/modules/notifications/NotificationManager.h (modified) (2 diffs)
• src/modules/notifications/dispatchers/CMakeLists.txt (modified) (1 diff)
• src/modules/notifications/dispatchers/Dialogue.cc (copied) (copied from code/branches/Dialog_HS16/src/modules/notifications/dispatchers/Dialogue.cc)
• src/modules/notifications/dispatchers/Dialogue.h (copied) (copied from code/branches/Dialog_HS16/src/modules/notifications/dispatchers/Dialogue.h)
• src/modules/notifications/dispatchers/DialogueManager.cc (copied) (copied from code/branches/Dialog_HS16/src/modules/notifications/dispatchers/DialogueManager.cc)
• src/modules/notifications/dispatchers/DialogueManager.h (copied) (copied from code/branches/Dialog_HS16/src/modules/notifications/dispatchers/DialogueManager.h)
• src/modules/overlays/hud/CMakeLists.txt (modified) (1 diff)
• src/modules/overlays/hud/HUDDialogue.cc (copied) (copied from code/branches/Dialog_HS16/src/modules/overlays/hud/HUDDialogue.cc)
• src/modules/overlays/hud/HUDDialogue.h (copied) (copied from code/branches/Dialog_HS16/src/modules/overlays/hud/HUDDialogue.h)

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

@@ -31 +31 @@
   <NotificationQueueCEGUI
     name="narrative"
-    targets="simpleNotification"
+    targets="simpleNotification,dialogue"
     size=3
     displayTime=3.9
     position="0.2, 0, 0.1, 0"
-    fontSize="23"
+    fontSize="19"
     fontColor="0.3, 1, 0.2, 0.8"
     alignment="HorzCentred"
     displaySize="0.6, 0, 0, 0"
     />
+
   <Scene
     ambientlight = "0.8, 0.8, 0.8"
@@ -370 +371 @@
 
     <DistanceTrigger name="spawndelaytrigger0" position="800,700,600" target="Pawn" distance=10 stayActive="true" delay=2/>
-    <SimpleNotification 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>
@@ -376 +377 @@
             </trigger>
         </events>
-    </SimpleNotification>
+    </Dialogue>
 
 <!-- Blinking Billboard should be replaced with WAYPOINT -->
@@ -409 +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>
@@ -415 +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>
@@ -424 +425 @@
             </trigger>
         </events>
-    </SimpleNotification>
+    </Dialogue>
 
 <!-- QUEST-Trigger && Message Trigger: navigationend is activated after flying4 was triggered -->
@@ -432 +433 @@
 
 
-    <SimpleNotification message="Three arrows just appeared.">
+    <Dialogue speaker="Speaker2" message="Three arrows just appeared." portrait="Orxonox/DialogueHUD_Person2">
         <events>
             <trigger>
@@ -438 +439 @@
             </trigger>
         </events>
-    </SimpleNotification>
+    </Dialogue>
 
     <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>
@@ -447 +448 @@
             </trigger>
         </events>
-    </SimpleNotification>
+    </Dialogue>
 
 <!-------------------------------------- PART ONE : Destroy boxes --------------------------------------->
@@ -485 +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>
@@ -491 +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/Presentation_HS16/data/overlays/HUDTemplates3.oxo

@@ -184 +184 @@
      weaponModeHUDSize      = "0.09, 0.03"
     />
+
+    <HUDDialogue
+     name     = "Dialogue"
+     position = "0.5, 0.85"
+     pickpoint = "0.5, 0.5"
+     font     = "VeraMono"
+     size = "0.2, 0.2"
+     textsize = 0.1
+     colour   = "1.0, 1.0, 0.0, 0.8"
+     align    = "center"
+    />
+
     
     <HUDPickupSystem

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

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

code/branches/Presentation_HS16/src/modules/notifications/NotificationDispatcher.h

@@ -126 +126 @@
             virtual const std::string& createNotificationMessage(void)
                 { return BLANKSTRING; }
+            
 
     };

code/branches/Presentation_HS16/src/modules/notifications/NotificationManager.h

@@ -77 +77 @@
             inline const std::string & getMessage(void) const
                 { return this->message_; }
-
             /**
             @brief Get the sender of the Notification.
@@ -94 +93 @@
         private:
             std::string message_; //!< The Notification message.
-            std::string sender_; //!< The sender of the notification.
+            std::string sender_;//!< The sender of the notifications.
             NotificationMessageType type_; //!< The type of the notification.
 

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

@@ -2 +2 @@
   CommandNotification.cc
   SimpleNotification.cc
+  Dialogue.cc
 )

code/branches/Presentation_HS16/src/modules/overlays/hud/CMakeLists.txt

@@ -27 +27 @@
   LastTeamStandingInfos.cc
   CountDown.cc
+  HUDDialogue.cc
 )