Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Dec 19, 2016, 8:15:56 AM (8 years ago)
Author:
maxima
Message:

dialog branch merged to presentation

Location:
code/branches/Presentation_HS16
Files:
8 edited
6 copied

Legend:

Unmodified
Added
Removed

  • code/branches/Presentation_HS16

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

    r11052 r11347  
    3131  <NotificationQueueCEGUI
    3232    name="narrative"
    33     targets="simpleNotification"
     33    targets="simpleNotification,dialogue"
    3434    size=3
    3535    displayTime=3.9
    3636    position="0.2, 0, 0.1, 0"
    37     fontSize="23"
     37    fontSize="19"
    3838    fontColor="0.3, 1, 0.2, 0.8"
    3939    alignment="HorzCentred"
    4040    displaySize="0.6, 0, 0, 0"
    4141    />
     42
    4243  <Scene
    4344    ambientlight = "0.8, 0.8, 0.8"
    … …  
    370371
    371372    <DistanceTrigger name="spawndelaytrigger0" position="800,700,600" target="Pawn" distance=10 stayActive="true" delay=2/>
    372     <SimpleNotification message="Press (F3) to see your mission briefing.">
     373    <Dialogue speaker="Speaker" message=" Press (F3) to see your mission briefing." portrait="Orxonox/DialogueHUD_Person">
    373374        <events>
    374375            <trigger>
    … …  
    376377            </trigger>
    377378        </events>
    378     </SimpleNotification>
     379    </Dialogue>
    379380
    380381<!-- Blinking Billboard should be replaced with WAYPOINT -->
    … …  
    409410
    410411    <DistanceTrigger name="flying1" position="800,700,600" target="Pawn" distance=10 stayActive="true" delay=6/>
    411     <SimpleNotification message="Let's fly to the blinking light.">
     412    <Dialogue speaker="Speaker" message="Let's fly to the blinking light." portrait="Orxonox/DialogueHUD_Person">
    412413        <events>
    413414            <trigger>
    … …  
    415416            </trigger>
    416417        </events>
    417     </SimpleNotification>
     418    </Dialogue>
    418419
    419420    <DistanceTrigger name="flying2" position="800,700,600" target="Pawn" distance=10 stayActive="true" delay=10/>
    420     <SimpleNotification message="Use (W) to accelerate and the mouse to steer.">
     421    <Dialogue speaker="Speaker" message="Use (W) to accelerate and the mouse to steer." portrait="Orxonox/DialogueHUD_Person">
    421422        <events>
    422423            <trigger>
    … …  
    424425            </trigger>
    425426        </events>
    426     </SimpleNotification>
     427    </Dialogue>
    427428
    428429<!-- QUEST-Trigger && Message Trigger: navigationend is activated after flying4 was triggered -->
    … …  
    432433
    433434
    434     <SimpleNotification message="Three arrows just appeared.">
     435    <Dialogue speaker="Speaker2" message="Three arrows just appeared." portrait="Orxonox/DialogueHUD_Person2">
    435436        <events>
    436437            <trigger>
    … …  
    438439            </trigger>
    439440        </events>
    440     </SimpleNotification>
     441    </Dialogue>
    441442
    442443    <DistanceTrigger name="flying5" position="-900,640,600" target="Pawn" distance=60 stayActive="true" delay=5/>
    443     <SimpleNotification message="Follow those arrows.">
     444    <Dialogue speaker="Speaker2" message="Follow those arrows." portrait="Orxonox/DialogueHUD_Person2">
    444445        <events>
    445446            <trigger>
    … …  
    447448            </trigger>
    448449        </events>
    449     </SimpleNotification>
     450    </Dialogue>
    450451
    451452<!-------------------------------------- PART ONE : Destroy boxes --------------------------------------->
    … …  
    485486
    486487<!-- @Text: How to shoot-->
    487     <SimpleNotification message="Destroy the four boxes." broadcast="true">
     488    <Dialogue speaker="Speaker" message="Destroy the four boxes." portrait="Orxonox/DialogueHUD_Person" broadcast="true">
    488489        <events>
    489490            <trigger>
    … …  
    491492            </trigger>
    492493        </events>
    493     </SimpleNotification>
    494 
    495     <SimpleNotification message=" 1. Aim the a red cycle." broadcast="true">
     494    </Dialogue>
     495
     496    <SimpleNotification message=" 1. Aim at the red cycle." broadcast="true">
    496497        <events>
    497498            <trigger>

  • code/branches/Presentation_HS16/data/overlays/HUDTemplates3.oxo

    r11277 r11347  
    184184     weaponModeHUDSize      = "0.09, 0.03"
    185185    />
     186
     187    <HUDDialogue
     188     name     = "Dialogue"
     189     position = "0.5, 0.85"
     190     pickpoint = "0.5, 0.5"
     191     font     = "VeraMono"
     192     size = "0.2, 0.2"
     193     textsize = 0.1
     194     colour   = "1.0, 1.0, 0.0, 0.8"
     195     align    = "center"
     196    />
     197
    186198   
    187199    <HUDPickupSystem

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

    r8706 r11347  
    1717    NotificationsPrecompiledHeaders.h
    1818  LINK_LIBRARIES
     19    overlays
    1920    orxonox
    2021  SOURCE_FILES ${NOTIFICATIONS_SRC_FILES}

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

    r11099 r11347  
    126126            virtual const std::string& createNotificationMessage(void)
    127127                { return BLANKSTRING; }
     128           
    128129
    129130    };

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

    r11071 r11347  
    7777            inline const std::string & getMessage(void) const
    7878                { return this->message_; }
    79 
    8079            /**
    8180            @brief Get the sender of the Notification.
    … …  
    9493        private:
    9594            std::string message_; //!< The Notification message.
    96             std::string sender_; //!< The sender of the notification.
     95            std::string sender_;//!< The sender of the notifications.
    9796            NotificationMessageType type_; //!< The type of the notification.
    9897

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

    r7285 r11347  
    22  CommandNotification.cc
    33  SimpleNotification.cc
     4  Dialogue.cc
    45)

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

    r11277 r11347  
    2727  LastTeamStandingInfos.cc
    2828  CountDown.cc
     29  HUDDialogue.cc
    2930)
Note: See TracChangeset for help on using the changeset viewer.