Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 8700


Ignore:
Timestamp:
Jun 6, 2011, 8:15:38 AM (13 years ago)
Author:
dafrick
Message:

Adherence to styleguide.

Location:
code/branches/presentation
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • code/branches/presentation/data/gui/layouts/DockingDialog.layout

    r8643 r8700  
    22
    33<GUILayout >
    4     <Window Type="MenuWidgets/StaticImage" Name="orxonox/DockingBackground" >
     4    <Window Type="MenuWidgets/StaticImage" Name="orxonox/Docking/Background" >
    55        <Property Name="FrameEnabled" Value="False" />
    66        <Property Name="InheritsAlpha" Value="False" />
     
    88        <Property Name="UnifiedAreaRect" Value="{{0,0},{0,0},{1,0},{1,0}}" />
    99        <Property Name="BackgroundEnabled" Value="False" />
    10         <Window Type="MenuWidgets/StaticText" Name="orxonox/DockingTitle" >
     10        <Window Type="MenuWidgets/StaticText" Name="orxonox/Docking/Title" >
    1111            <Property Name="Text" Value="Docking" />
    1212            <Property Name="Alpha" Value="0.8" />
     
    1616            <Property Name="VertFormatting" Value="TopAligned" />
    1717            <Property Name="UnifiedAreaRect" Value="{{0.25,0},{0.2875,0},{0.75,0},{0.7,0}}" />
    18             <Window Type="MenuWidgets/Listbox" Name="orxonox/DockingDocks" >
     18            <Window Type="MenuWidgets/Listbox" Name="orxonox/Docking/Docks" >
    1919                <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
    2020                <Property Name="UnifiedAreaRect" Value="{{0.05,0},{0.15,0},{0.95,0},{0.85,0}}" />
    2121            </Window>
    2222        </Window>
    23         <Window Type="MenuWidgets/Button" Name="orxonox/DockingDockButton" >
     23        <Window Type="MenuWidgets/Button" Name="orxonox/Docking/DockButton" >
    2424            <Property Name="Text" Value="Dock" />
    2525            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
     
    2727            <Event Name="Clicked" Function="DockingDialog.dockButton_clicked"/>
    2828        </Window>
    29         <Window Type="MenuWidgets/Button" Name="orxonox/DockingCancelButton" >
     29        <Window Type="MenuWidgets/Button" Name="orxonox/Docking/CancelButton" >
    3030            <Property Name="Text" Value="Cancel" />
    3131            <Property Name="UnifiedMaxSize" Value="{{1,0},{1,0}}" />
  • code/branches/presentation/data/gui/scripts/DockingDialog.lua

    r8643 r8700  
    99     --button are arranged in a 1x2 matrix
    1010    P:setButton(1, 1, {
    11             ["button"] = winMgr:getWindow("orxonox/DockingDockButton"),
     11            ["button"] = winMgr:getWindow("orxonox/Docking/DockButton"),
    1212            ["callback"]  = P.dockButton_clicked
    1313    })
    1414
    1515    P:setButton(1, 2, {
    16             ["button"] = winMgr:getWindow("orxonox/DockingCancelButton"),
     16            ["button"] = winMgr:getWindow("orxonox/Docking/CancelButton"),
    1717            ["callback"]  = P.cancelButton_clicked
    1818    })
     
    3737    end
    3838
    39     local listbox = CEGUI.toListbox(winMgr:getWindow("orxonox/DockingDocks"))
     39    local listbox = CEGUI.toListbox(winMgr:getWindow("orxonox/Docking/Docks"))
    4040    listbox:resetList()
    4141
     
    5151
    5252function P.dockButton_clicked(e)
    53     local listbox = CEGUI.toListbox(winMgr:getWindow("orxonox/DockingDocks"))
     53    local listbox = CEGUI.toListbox(winMgr:getWindow("orxonox/Docking/Docks"))
    5454    local choice = listbox:getFirstSelectedItem()
    5555    if choice ~= nil then
  • code/branches/presentation/data/levels/presentationFS11.oxw

    r8684 r8700  
    139139    <!-- PARTICLE EFFECT -->
    140140
    141     <ParticleSpawner position="-50,50,-125" source="Orxonox/RingExp" autostart="false" lifetime=500 loop=1 startdelay=7.5>
     141    <ParticleSpawner position="-50,50,-125" source="Orxonox/RingExp" autostart="false" lifetime=500 loop=1 startdelay=2.5>
    142142        <events>
    143143            <spawn>
    144                 <EventListener event=spawntrigger />
     144                <EventListener event=spawndelaytrigger1 />
    145145            </spawn>
    146146        </events>
    147147    </ParticleSpawner>
    148     <ParticleSpawner position="-50,50,-125" source="Orxonox/RingExp2" autostart="false" lifetime=500 loop=1 startdelay=7>
     148    <ParticleSpawner position="-50,50,-125" source="Orxonox/RingExp2" autostart="false" lifetime=500 loop=1 startdelay=2>
    149149        <events>
    150150            <spawn>
    151                 <EventListener event=spawntrigger />
     151                <EventListener event=spawndelaytrigger1 />
    152152            </spawn>
    153153        </events>
    154154    </ParticleSpawner>
    155     <ParticleSpawner position="-50,50,-125" source="Orxonox/RingExp3" autostart="false" lifetime=500 loop=1 startdelay=7>
     155    <ParticleSpawner position="-50,50,-125" source="Orxonox/RingExp3" autostart="false" lifetime=500 loop=1 startdelay=2>
    156156        <events>
    157157            <spawn>
    158                 <EventListener event=spawntrigger />
     158                <EventListener event=spawndelaytrigger1 />
    159159            </spawn>
    160160        </events>
  • code/branches/presentation/src/modules/docking/Dock.cc

    r8667 r8700  
    6363    }
    6464
    65 
    6665    void Dock::XMLPort(Element& xmlelement, XMLPort::Mode mode)
    6766    {
     
    7978        XMLPortEventSink(Dock, BaseObject, "execute", execute, xmlelement, mode);
    8079    }
    81 
    8280
    8381    bool Dock::execute(bool bTriggered, BaseObject* trigger)
     
    109107        {
    110108            // Add player to this Docks candidates
    111             candidates.insert(player);
     109            candidates_.insert(player);
    112110
    113111            // Show docking dialog
     
    117115        {
    118116            // Remove player from candidates list
    119             candidates.erase(player);
    120         }
    121 
    122         return true;
    123     }
    124 
     117            candidates_.erase(player);
     118        }
     119
     120        return true;
     121    }
    125122
    126123    void Dock::cmdDock()
     
    144141    }
    145142
    146 
    147143    bool Dock::dock(PlayerInfo* player)
    148144    {
    149145        // Check if player is a candidate
    150         if(candidates.find(player) == candidates.end())
     146        if(candidates_.find(player) == candidates_.end())
    151147        {
    152148            COUT(2) << "Dock::dock Player is not a candidate!" << std::endl;
     
    154150        }
    155151
    156         candidates.erase(player);
    157         docked.insert(player);
    158 
    159         if (animations.empty())
     152        candidates_.erase(player);
     153        docked_.insert(player);
     154
     155        if (animations_.empty())
    160156            return dockingAnimationFinished(player);
    161157        else
    162             DockingAnimation::invokeAnimation(true, player, animations);
     158            DockingAnimation::invokeAnimation(true, player, animations_);
    163159
    164160        return true;
     
    167163    bool Dock::dockingAnimationFinished(PlayerInfo* player)
    168164    {
    169         if(docked.find(player) == docked.end())
     165        if(docked_.find(player) == docked_.end())
    170166        {
    171167            COUT(2) << "Dock::dockingAnimationFinished Player is not currently docked." << std::endl;
     
    173169        }
    174170
    175         DockingEffect::invokeEffect(true, player, effects);
     171        DockingEffect::invokeEffect(true, player, effects_);
    176172        return true;
    177173    }
     
    180176    {
    181177        // Check if player is docked to this Dock
    182         if(docked.find(player) == docked.end())
     178        if(docked_.find(player) == docked_.end())
    183179        {
    184180            COUT(2) << "Dock::undock Player is not docked to this Dock." << std::endl;
     
    186182        }
    187183
    188         docked.erase(player);
    189         candidates.insert(player);
    190 
    191         DockingEffect::invokeEffect(false, player, effects);
    192 
    193         if (animations.empty())
     184        docked_.erase(player);
     185        candidates_.insert(player);
     186
     187        DockingEffect::invokeEffect(false, player, effects_);
     188
     189        if (animations_.empty())
    194190            return undockingAnimationFinished(player);
    195191        else
    196             DockingAnimation::invokeAnimation(false, player, animations);
     192            DockingAnimation::invokeAnimation(false, player, animations_);
    197193
    198194        return true;
     
    204200    }
    205201
    206 
    207202    unsigned int Dock::getNumberOfActiveDocks()
    208203    {
     
    211206        for(ObjectList<Dock>::iterator it = ObjectList<Dock>::begin(); it != ObjectList<Dock>::end(); ++it)
    212207        {
    213             if(it->candidates.find(player) != it->candidates.end())
     208            if(it->candidates_.find(player) != it->candidates_.end())
    214209                i++;
    215210        }
     
    222217        for(ObjectList<Dock>::iterator it = ObjectList<Dock>::begin(); it != ObjectList<Dock>::end(); ++it)
    223218        {
    224             if(it->candidates.find(player) != it->candidates.end())
     219            if(it->candidates_.find(player) != it->candidates_.end())
    225220            {
    226221                if(index == 0)
     
    232227    }
    233228
    234 
    235229    bool Dock::addEffect(DockingEffect* effect)
    236230    {
    237231        assert(effect);
    238         effects.push_back(effect);
     232        effects_.push_back(effect);
    239233        return true;
    240234    }
     
    242236    const DockingEffect* Dock::getEffect(unsigned int i) const
    243237    {
    244         for (std::list<DockingEffect*>::const_iterator effect = this->effects.begin(); effect != this->effects.end(); ++effect)
     238        for (std::list<DockingEffect*>::const_iterator effect = this->effects_.begin(); effect != this->effects_.end(); ++effect)
    245239        {
    246240            if(i == 0)
     
    255249        assert(animation);
    256250        animation->setParent(this);
    257         animations.push_back(animation);
     251        animations_.push_back(animation);
    258252        return true;
    259253    }
     
    261255    const DockingAnimation* Dock::getAnimation(unsigned int i) const
    262256    {
    263         for (std::list<DockingAnimation*>::const_iterator animation = this->animations.begin(); animation != this->animations.end(); ++animation)
     257        for (std::list<DockingAnimation*>::const_iterator animation = this->animations_.begin(); animation != this->animations_.end(); ++animation)
    264258        {
    265259            if(i == 0)
     
    270264    }
    271265}
    272 
  • code/branches/presentation/src/modules/docking/Dock.h

    r8645 r8700  
    5555        : public StaticEntity
    5656    { // tolua_export
    57     public:
    58         Dock(BaseObject* creator);
    59         virtual ~Dock();
     57        public:
     58            Dock(BaseObject* creator);
     59            virtual ~Dock();
    6060
    61         // Trigger interface
    62         bool execute(bool bTriggered, BaseObject* trigger);
     61            // Trigger interface
     62            bool execute(bool bTriggered, BaseObject* trigger);
    6363
    64         // XML interface
    65         virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    66         virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
     64            // XML interface
     65            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
     66            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode);
    6767
    68         // XML functions
    69         bool addEffect(DockingEffect* effect); //!< Add a DockingEffect to the Dock.
    70         const DockingEffect* getEffect(unsigned int index) const; //!< Get the DockingEffect at a given index.
    71         bool addAnimation(DockingAnimation* animation); //!< Add a DockingAnimation to the Dock.
    72         const DockingAnimation* getAnimation(unsigned int index) const; //!< Get the DockingAnimation at a given index.
     68            // XML functions
     69            bool addEffect(DockingEffect* effect); //!< Add a DockingEffect to the Dock.
     70            const DockingEffect* getEffect(unsigned int index) const; //!< Get the DockingEffect at a given index.
     71            bool addAnimation(DockingAnimation* animation); //!< Add a DockingAnimation to the Dock.
     72            const DockingAnimation* getAnimation(unsigned int index) const; //!< Get the DockingAnimation at a given index.
    7373
    74         // Docking/undocking logic, checks conditions and invokes the DockingAnimations
    75         bool dock(PlayerInfo* player); //!< Returns true if given player docked successfully (player must be a candidate)
    76         bool undock(PlayerInfo* player); //!< Undocks a player (player must be docked)
     74            // Docking/undocking logic, checks conditions and invokes the DockingAnimations
     75            bool dock(PlayerInfo* player); //!< Returns true if given player docked successfully (player must be a candidate)
     76            bool undock(PlayerInfo* player); //!< Undocks a player (player must be docked)
    7777
    78         // Animation logic
    79         bool dockingAnimationFinished(PlayerInfo* player); //!< Called when a docking animation finished
    80         bool undockingAnimationFinished(PlayerInfo* player); //!< Called when a undocking animation finished
     78            // Animation logic
     79            bool dockingAnimationFinished(PlayerInfo* player); //!< Called when a docking animation finished
     80            bool undockingAnimationFinished(PlayerInfo* player); //!< Called when a undocking animation finished
    8181
    82         // LUA interface
    83         void dock() { this->dock(HumanController::getLocalControllerSingleton()->getPlayer()); } // tolua_export
    84         static unsigned int getNumberOfActiveDocks(); // tolua_export
    85         static Dock* getActiveDockAtIndex(unsigned int index); // tolua_export
     82            // LUA interface
     83            // tolua_begin
     84            void dock()
     85                { this->dock(HumanController::getLocalControllerSingleton()->getPlayer()); }
     86            static unsigned int getNumberOfActiveDocks();
     87            static Dock* getActiveDockAtIndex(unsigned int index);
     88            // tolua_end
    8689
    87         // Console commands
    88         static void cmdDock();
    89         static void cmdUndock();
     90            // Console commands
     91            static void cmdDock();
     92            static void cmdUndock();
    9093
    91     private:
    92         std::set<PlayerInfo*> candidates; //!< A set of all players which are allowed to dock using the console command.
    93         std::set<PlayerInfo*> docked; //!< A set of all docked players
     94        private:
     95            std::set<PlayerInfo*> candidates_; //!< A set of all players which are allowed to dock using the console command.
     96            std::set<PlayerInfo*> docked_; //!< A set of all docked players
    9497
    95         std::list<DockingEffect*> effects; //!< The list of DockingEffects to be executed when a player docks.
    96         std::list<DockingAnimation*> animations; //!< The list of DockingAnimations to be executed before a player docks
     98            std::list<DockingEffect*> effects_; //!< The list of DockingEffects to be executed when a player docks.
     99            std::list<DockingAnimation*> animations_; //!< The list of DockingAnimations to be executed before a player docks
    97100    }; // tolua_export
    98101} // tolua_export
  • code/branches/presentation/src/modules/docking/DockingTarget.cc

    r8645 r8700  
    4949    }
    5050
    51 
    5251    void DockingTarget::XMLPort(Element& xmlelement, XMLPort::Mode mode)
    5352    {
    5453        SUPER(DockingTarget, XMLPort, xmlelement, mode);
    55         XMLPortParam(DockingTarget, "name", setName, getName, xmlelement, mode);
    5654
    5755        COUT(4) << "DockingTarget with name '" << this->getName() << "' created.." << std::endl;
    5856    }
    5957
    60 
    61     void DockingTarget::setName(const std::string& str) {
    62         this->name_ = str;
    63     }
    64 
    65     const std::string& DockingTarget::getName() const {
    66         return this->name_;
    67     }
    6858}
    6959
  • code/branches/presentation/src/modules/docking/DockingTarget.h

    r8645 r8700  
    5454    class _DockingExport DockingTarget : public StaticEntity
    5555    {
    56         private:
    57             std::string name_;
    58 
    5956        public:
    6057            DockingTarget(BaseObject* creator);
     
    6360            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
    6461
    65             virtual void setName(const std::string& str);
    66             virtual const std::string& getName() const;
    6762    };
    6863
Note: See TracChangeset for help on using the changeset viewer.