Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 11261 for code


Ignore:
Timestamp:
Oct 31, 2016, 4:11:28 PM (8 years ago)
Author:
dmoritz
Message:

Updated Dialogue Class

Location:
code/branches/Dialog_HS16
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r11247 r11261  
    2424 gametype     = "Mission"
    2525>
    26   <Dialogue message="test">
    27     </Dialogue>
    2826  <templates>
    2927    <Template link=lodtemplate_default />
    … …  
    3331  <NotificationQueueCEGUI
    3432    name="narrative"
    35     targets="simpleNotification"
     33    targets="simpleNotification,dialogue"
    3634    size=3
    3735    displayTime=3.9
    … …  
    4240    displaySize="0.6, 0, 0, 0"
    4341    />
     42
    4443  <Scene
    4544    ambientlight = "0.8, 0.8, 0.8"
    … …  
    372371
    373372    <DistanceTrigger name="spawndelaytrigger0" position="800,700,600" target="Pawn" distance=10 stayActive="true" delay=2/>
    374     <SimpleNotification message="Press (F3) to see your mission briefing.">
     373    <Dialogue message="Press (F3) to see your mission briefing.">
    375374        <events>
    376375            <trigger>
    … …  
    378377            </trigger>
    379378        </events>
    380     </SimpleNotification>
     379    </Dialogue>
    381380
    382381<!-- Blinking Billboard should be replaced with WAYPOINT -->
    … …  
    411410
    412411    <DistanceTrigger name="flying1" position="800,700,600" target="Pawn" distance=10 stayActive="true" delay=6/>
    413     <Dialogue message="Let's fly to the blinking light.">
     412    <SimpleNotification message="Let's fly to the blinking light.">
    414413        <events>
    415414            <trigger>
    … …  
    417416            </trigger>
    418417        </events>
    419     </Dialogue>
     418    </SimpleNotification>
    420419
    421420    <DistanceTrigger name="flying2" position="800,700,600" target="Pawn" distance=10 stayActive="true" delay=10/>
    … …  
    434433
    435434
    436     <SimpleNotification message="Three arrows just appeared.">
     435    <Dialogue message="Three arrows just appeared.">
    437436        <events>
    438437            <trigger>
    … …  
    440439            </trigger>
    441440        </events>
    442     </SimpleNotification>
     441    </Dialogue>
    443442
    444443    <DistanceTrigger name="flying5" position="-900,640,600" target="Pawn" distance=60 stayActive="true" delay=5/>

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

    r11099 r11261  
    126126            virtual const std::string& createNotificationMessage(void)
    127127                { return BLANKSTRING; }
     128            virtual const std::string& createNotificationSpeaker(void)
     129                { return BLANKSTRING; }
    128130
    129131    };

  • code/branches/Dialog_HS16/src/modules/notifications/NotificationManager.h

    r11071 r11261  
    9494        private:
    9595            std::string message_; //!< The Notification message.
    96             std::string sender_; //!< The sender of the notification.
     96            std::string sender_; //!< The sender of the notifications.
    9797            NotificationMessageType type_; //!< The type of the notification.
    9898

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

    r11247 r11261  
    1010        RegisterClass(Dialogue);
    1111
    12         Dialogue::Dialogue(Context* context):BaseObject(context){
     12        Dialogue::Dialogue(Context* context):NotificationDispatcher(context){
    1313                RegisterObject(Dialogue);
     14
     15                this->setSender("dialogue");
     16
     17        this->setSyncMode(ObjectDirection::None);
     18
    1419
    1520        }
    … …  
    2429
    2530        XMLPortParam(Dialogue, "message", setMessage, getMessage, xmlelement, mode);
    26         orxout()<<"blablab";
     31        //XMLPortParam(Dialogue, "speaker", setSpeaker, getSpeaker, xmlelement, mode);
     32       
    2733    }
    2834}

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

    r11247 r11261  
    33#define _Dialogue_H__
    44#include <string>       
    5 #include "core/BaseObject.h"
     5//#include "core/BaseObject.h"
     6
     7#include "notifications/NotificationsPrereqs.h"
     8
     9#include "notifications/NotificationDispatcher.h"
    610
    711namespace orxonox{
    812
    9 class Dialogue: public BaseObject{
     13class _NotificationsExport Dialogue: public NotificationDispatcher{
    1014
    1115        public:
    … …  
    1721            const std::string& getMessage(void)
    1822                { return this->message_; }
    19 
    20             void setMessage(const std::string& message)
    21                 { this->message_ = message; }
     23         //   const std::string& getSpeaker(void)
     24            //  {return this->speaker_;}
    2225
    2326    protected:
    2427        virtual const std::string& createNotificationMessage(void)
    2528                { return this->message_; }
     29       // virtual const std::string& createNotificationSpeaker(void)
     30        //              { return this->speaker_; }
    2631    private:
    2732                std::string message_;
     33        //      std::string speaker_;
     34
     35                void setMessage(const std::string& message)
     36                { this->message_ = message; }
     37           // void setSpeaker(const std::string& speaker)
     38            //  { this->speaker_ = speaker;}
    2839        } ;       
    2940
Note: See TracChangeset for help on using the changeset viewer.