Changeset 11270

Timestamp:

Nov 7, 2016, 3:59:00 PM (8 years ago)

Author:

dmoritz

Message:

Speaker added

Location:

code/branches/Dialog_HS16

Files:

• data/levels/missionOne.oxw (modified) (2 diffs)
• src/modules/notifications/NotificationDispatcher.h (modified) (1 diff)
• src/modules/notifications/NotificationManager.h (modified) (2 diffs)
• src/modules/notifications/dispatchers/Dialogue.cc (modified) (2 diffs)
• src/modules/notifications/dispatchers/Dialogue.h (modified) (1 diff)

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

@@ -32 +32 @@
     name="narrative"
     targets="simpleNotification,dialogue"
-    size=3
+    size=3,1
     displayTime=3.9
     position="0.2, 0, 0.1, 0"
@@ -371 +371 @@
 
     <DistanceTrigger name="spawndelaytrigger0" position="800,700,600" target="Pawn" distance=10 stayActive="true" delay=2/>
-    <Dialogue message="Press (F3) to see your mission briefing.">
+    <Dialogue speaker="ABC: " message=" Press (F3) to see your mission briefing.">
         <events>
             <trigger>

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

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

code/branches/Dialog_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 notifications.
+            std::string sender_;//!< The sender of the notifications.
             NotificationMessageType type_; //!< The type of the notification.
 

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

@@ -16 +16 @@
 
         this->setSyncMode(ObjectDirection::None);
-
-
         }
 
@@ -28 +26 @@
         SUPER(Dialogue, XMLPort, xmlelement, mode);
 
+        XMLPortParam(Dialogue, "speaker", setSpeaker, getSpeaker, xmlelement, mode);
         XMLPortParam(Dialogue, "message", setMessage, getMessage, xmlelement, mode);
-        //XMLPortParam(Dialogue, "speaker", setSpeaker, getSpeaker, xmlelement, mode);
         
     }
+    const std::string& Dialogue::createNotificationMessage(void)
+                {       
+                        dialogue_ = speaker_ + message_;
+                        return this->dialogue_ ;
+                }
 }

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

@@ -21 +21 @@
             const std::string& getMessage(void)
                 { return this->message_; }
-         //   const std::string& getSpeaker(void)
-            //  {return this->speaker_;}
+                const std::string& getSpeaker(void)
+                        {return this->speaker_;}
 
     protected:
-        virtual const std::string& createNotificationMessage(void)
-                { return this->message_; }
-       // virtual const std::string& createNotificationSpeaker(void)
-        //              { return this->speaker_; }
+        virtual const std::string& createNotificationMessage(void);
+                
+        
     private:
                 std::string message_;
-        //      std::string speaker_;
+                std::string speaker_;
+                std::string dialogue_;
 
+                void setSpeaker(const std::string& speaker)
+                { this->speaker_ = speaker;}
                 void setMessage(const std::string& message)
                 { this->message_ = message; }
-           // void setSpeaker(const std::string& speaker)
-            //  { this->speaker_ = speaker;}
+            
         } ;