[Orxonox-commit 3999] r8673 - in code/branches/presentation: . data/overlays src/modules/overlays src/modules/overlays/hud src/orxonox/overlays src/orxonox/worldentities/pawns
dafrick at orxonox.net
dafrick at orxonox.net
Sun May 29 23:59:17 CEST 2011
Author: dafrick
Date: 2011-05-29 23:59:17 +0200 (Sun, 29 May 2011)
New Revision: 8673
Added:
code/branches/presentation/src/modules/overlays/hud/HUDBoostBar.cc
code/branches/presentation/src/modules/overlays/hud/HUDBoostBar.h
Modified:
code/branches/presentation/
code/branches/presentation/data/overlays/HUDTemplates3.oxo
code/branches/presentation/src/modules/overlays/OverlaysPrereqs.h
code/branches/presentation/src/modules/overlays/hud/CMakeLists.txt
code/branches/presentation/src/modules/overlays/hud/HUDBar.cc
code/branches/presentation/src/modules/overlays/hud/HUDBar.h
code/branches/presentation/src/orxonox/overlays/OrxonoxOverlay.cc
code/branches/presentation/src/orxonox/overlays/OrxonoxOverlay.h
code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h
Log:
Merging hudimprovements branch into presentation branch.
Property changes on: code/branches/presentation
___________________________________________________________________
Modified: svn:mergeinfo
- /code/branches/ai:6592-7033
/code/branches/bigships:8137-8588
/code/branches/buildsystem:1874-2276,2278-2400
/code/branches/buildsystem2:2506-2658
/code/branches/buildsystem3:2662-2708
/code/branches/ceguilua:1802-1808
/code/branches/chat:6527-6797
/code/branches/chat2:6836-6910
/code/branches/console:5941-6104
/code/branches/consolecommands2:6451-7178
/code/branches/consolecommands3:7178-7283
/code/branches/core3:1572-1739
/code/branches/core4:3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5:5768-5928,6009
/code/branches/data_cleanup:7537-7686
/code/branches/doc:7290-7400
/code/branches/dockingsystem:8101-8192
/code/branches/dockingsystem2:8196-8560
/code/branches/dynamicmatch:6584-7030
/code/branches/fps:6591-7072
/code/branches/gameimmersion:8102-8577
/code/branches/gamestate:6430-6572,6621-6661
/code/branches/gamestates2:6594-6745
/code/branches/gametypes:2826-3031
/code/branches/gcc43:1580
/code/branches/gui:1635-1723,2795-2894
/code/branches/hudelements:6584-6941
/code/branches/ingamemenu:6000-6023
/code/branches/input:1629-1636
/code/branches/ipv6:7293-7458
/code/branches/kicklib:7940-8096,8098-8277
/code/branches/kicklib2:8282-8350
/code/branches/lastmanstanding:7479-7644
/code/branches/lastmanstanding3:7903-8175
/code/branches/libraries:5612-5692
/code/branches/libraries2:5703-5737
/code/branches/lod:6586-6911
/code/branches/lodfinal:2372-2411
/code/branches/mac_osx:7789-8128,8135
/code/branches/map:2801-3086,3089
/code/branches/masterserver:7502-7738
/code/branches/menu:5941-6146,6148,7536-7687
/code/branches/miniprojects:2754-2824
/code/branches/netp2:2835-2988
/code/branches/netp3:2988-3082
/code/branches/netp6:3214-3302
/code/branches/network:2356
/code/branches/network2:6434-6465
/code/branches/network3:7196-7344
/code/branches/network4:7497-7755
/code/branches/network5:7757-7781
/code/branches/network6:7823-8315
/code/branches/network64:2210-2355
/code/branches/notifications:7314-7401
/code/branches/objecthierarchy:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2:2171-2479
/code/branches/ois_update:7506-7788
/code/branches/overlay:2117-2385
/code/branches/particles:2829-3085
/code/branches/particles2:6050-6106,6109
/code/branches/pch:3113-3194
/code/branches/physics:1912-2055,2107-2439
/code/branches/physics_merge:2436-2457
/code/branches/pickup:8145-8555
/code/branches/pickup2:5942-6405
/code/branches/pickup3:6418-6523
/code/branches/pickup4:6594-6710
/code/branches/pickups:1926-2086,2127,2827-2915
/code/branches/pickups2:2107-2497,2915-3071
/code/branches/png2:7262-7263
/code/branches/portals:8087-8455
/code/branches/portals2:8460-8602
/code/branches/ppspickups1:6552-6708
/code/branches/ppspickups2:6527-6532,6554-6709
/code/branches/ppspickups3:6757-6997
/code/branches/ppspickups4:7003-7089
/code/branches/presentation:2369-2652,2654-2660,7736-7786
/code/branches/presentation2:6106-6416,7787-7800
/code/branches/presentation3:6913-7162
/code/branches/questsystem:1894-2088
/code/branches/questsystem2:2107-2259
/code/branches/questsystem5:2776-2905
/code/branches/releasetodo:7614-7647
/code/branches/resource:3327-3366
/code/branches/resource2:3372-5694
/code/branches/rocket:6523-6950
/code/branches/rocket2:6953-6970
/code/branches/script_trigger:1295-1953,1955
/code/branches/skybox2:6559-6989
/code/branches/sound:2829-3010
/code/branches/sound3:5941-6102
/code/branches/spaceboundaries:8085-8457
/code/branches/spaceboundaries2:8460-8613
/code/branches/spacerace:8182-8630
/code/branches/steering:5949-6091,8140-8595
/code/branches/tetris:8100-8563
/code/branches/tutoriallevel:7827-8370
/code/branches/tutoriallevel2:8370-8452
/code/branches/tutoriallevel3:8453-8636
/code/branches/usability:7915-8078
/code/branches/weapon:1925-2094
/code/branches/weapon2:2107-2488
/code/branches/weapons:2897-3051,8143-8591
/code/branches/weaponsystem:2742-2890
+ /code/branches/ai:6592-7033
/code/branches/bigships:8137-8588
/code/branches/buildsystem:1874-2276,2278-2400
/code/branches/buildsystem2:2506-2658
/code/branches/buildsystem3:2662-2708
/code/branches/ceguilua:1802-1808
/code/branches/chat:6527-6797
/code/branches/chat2:6836-6910
/code/branches/console:5941-6104
/code/branches/consolecommands2:6451-7178
/code/branches/consolecommands3:7178-7283
/code/branches/core3:1572-1739
/code/branches/core4:3221-3224,3227,3234-3238,3242,3244-3250,3252-3254,3256,3259-3261,3264-3265,3268-3275,3277-3278,3280,3284-3285,3287,3289-3294,3305,3309-3310
/code/branches/core5:5768-5928,6009
/code/branches/data_cleanup:7537-7686
/code/branches/doc:7290-7400
/code/branches/dockingsystem:8101-8192
/code/branches/dockingsystem2:8196-8560
/code/branches/dynamicmatch:6584-7030
/code/branches/fps:6591-7072
/code/branches/gameimmersion:8102-8577
/code/branches/gamestate:6430-6572,6621-6661
/code/branches/gamestates2:6594-6745
/code/branches/gametypes:2826-3031
/code/branches/gcc43:1580
/code/branches/gui:1635-1723,2795-2894
/code/branches/hudelements:6584-6941
/code/branches/hudimprovements:7920-8672
/code/branches/ingamemenu:6000-6023
/code/branches/input:1629-1636
/code/branches/ipv6:7293-7458
/code/branches/kicklib:7940-8096,8098-8277
/code/branches/kicklib2:8282-8350
/code/branches/lastmanstanding:7479-7644
/code/branches/lastmanstanding3:7903-8175
/code/branches/libraries:5612-5692
/code/branches/libraries2:5703-5737
/code/branches/lod:6586-6911
/code/branches/lodfinal:2372-2411
/code/branches/mac_osx:7789-8128,8135
/code/branches/map:2801-3086,3089
/code/branches/masterserver:7502-7738
/code/branches/menu:5941-6146,6148,7536-7687
/code/branches/miniprojects:2754-2824
/code/branches/netp2:2835-2988
/code/branches/netp3:2988-3082
/code/branches/netp6:3214-3302
/code/branches/network:2356
/code/branches/network2:6434-6465
/code/branches/network3:7196-7344
/code/branches/network4:7497-7755
/code/branches/network5:7757-7781
/code/branches/network6:7823-8315
/code/branches/network64:2210-2355
/code/branches/notifications:7314-7401
/code/branches/objecthierarchy:1911-2085,2100,2110-2169
/code/branches/objecthierarchy2:2171-2479
/code/branches/ois_update:7506-7788
/code/branches/overlay:2117-2385
/code/branches/particles:2829-3085
/code/branches/particles2:6050-6106,6109
/code/branches/pch:3113-3194
/code/branches/physics:1912-2055,2107-2439
/code/branches/physics_merge:2436-2457
/code/branches/pickup:8145-8555
/code/branches/pickup2:5942-6405
/code/branches/pickup3:6418-6523
/code/branches/pickup4:6594-6710
/code/branches/pickups:1926-2086,2127,2827-2915
/code/branches/pickups2:2107-2497,2915-3071
/code/branches/png2:7262-7263
/code/branches/portals:8087-8455
/code/branches/portals2:8460-8602
/code/branches/ppspickups1:6552-6708
/code/branches/ppspickups2:6527-6532,6554-6709
/code/branches/ppspickups3:6757-6997
/code/branches/ppspickups4:7003-7089
/code/branches/presentation:2369-2652,2654-2660,7736-7786
/code/branches/presentation2:6106-6416,7787-7800
/code/branches/presentation3:6913-7162
/code/branches/questsystem:1894-2088
/code/branches/questsystem2:2107-2259
/code/branches/questsystem5:2776-2905
/code/branches/releasetodo:7614-7647
/code/branches/resource:3327-3366
/code/branches/resource2:3372-5694
/code/branches/rocket:6523-6950
/code/branches/rocket2:6953-6970
/code/branches/script_trigger:1295-1953,1955
/code/branches/skybox2:6559-6989
/code/branches/sound:2829-3010
/code/branches/sound3:5941-6102
/code/branches/spaceboundaries:8085-8457
/code/branches/spaceboundaries2:8460-8613
/code/branches/spacerace:8182-8630
/code/branches/steering:5949-6091,8140-8595
/code/branches/tetris:8100-8563
/code/branches/tutoriallevel:7827-8370
/code/branches/tutoriallevel2:8370-8452
/code/branches/tutoriallevel3:8453-8636
/code/branches/usability:7915-8078
/code/branches/weapon:1925-2094
/code/branches/weapon2:2107-2488
/code/branches/weapons:2897-3051,8143-8591
/code/branches/weaponsystem:2742-2890
Modified: code/branches/presentation/data/overlays/HUDTemplates3.oxo
===================================================================
--- code/branches/presentation/data/overlays/HUDTemplates3.oxo 2011-05-29 21:02:17 UTC (rev 8672)
+++ code/branches/presentation/data/overlays/HUDTemplates3.oxo 2011-05-29 21:59:17 UTC (rev 8673)
@@ -34,7 +34,7 @@
name = "HealthBar1"
background = "Orxonox/HealthBarBackground"
size = "0.35, 0.0875"
- position = "0.0 , 0.95 "
+ position = "0.0 , 0.9 "
pickpoint = "0, 1"
bartexture = "healthbar_bar.png"
textfont = "VeraMono"
@@ -55,7 +55,7 @@
name = "SpeedBar1"
background = "Orxonox/BarBackground"
size = "0.35, 0.05"
- position = "0.0 , 1.0 "
+ position = "0.0 , 0.95 "
pickpoint = "0, 1"
correctaspect = false
>
@@ -64,6 +64,19 @@
<BarColour position = 1.0 colour = "0.7,0.2,0.2" />
</HUDSpeedBar>
+ <HUDBoostBar
+ name = "BoostBar1"
+ backgroundtex = "bar1.png"
+ size = "0.35, 0.05"
+ position = "0.0 , 1.0 "
+ pickpoint = "0, 1"
+ correctaspect = false
+ >
+ <BarColour position = 0.0 colour = "0.7,0.2,0.2" />
+ <BarColour position = 0.5 colour = "0.7,0.7,0.2" />
+ <BarColour position = 1.0 colour = "0.2,0.7,0.2" />
+ </HUDBoostBar>
+
<HUDNavigation
name = "Navigation"
correctaspect = true
Modified: code/branches/presentation/src/modules/overlays/OverlaysPrereqs.h
===================================================================
--- code/branches/presentation/src/modules/overlays/OverlaysPrereqs.h 2011-05-29 21:02:17 UTC (rev 8672)
+++ code/branches/presentation/src/modules/overlays/OverlaysPrereqs.h 2011-05-29 21:59:17 UTC (rev 8673)
@@ -88,6 +88,7 @@
class HUDNavigation;
class HUDRadar;
class HUDSpeedBar;
+ class HUDBoostBar;
class HUDTimer;
class KillMessage;
class LastManStandingInfos;
Modified: code/branches/presentation/src/modules/overlays/hud/CMakeLists.txt
===================================================================
--- code/branches/presentation/src/modules/overlays/hud/CMakeLists.txt 2011-05-29 21:02:17 UTC (rev 8672)
+++ code/branches/presentation/src/modules/overlays/hud/CMakeLists.txt 2011-05-29 21:59:17 UTC (rev 8673)
@@ -3,6 +3,7 @@
HUDNavigation.cc
HUDRadar.cc
HUDSpeedBar.cc
+ HUDBoostBar.cc
HUDHealthBar.cc
HUDTimer.cc
ChatOverlay.cc
Modified: code/branches/presentation/src/modules/overlays/hud/HUDBar.cc
===================================================================
--- code/branches/presentation/src/modules/overlays/hud/HUDBar.cc 2011-05-29 21:02:17 UTC (rev 8672)
+++ code/branches/presentation/src/modules/overlays/hud/HUDBar.cc 2011-05-29 21:59:17 UTC (rev 8673)
@@ -25,6 +25,7 @@
* Felix Schulthess
* Fabian 'x3n' Landau
* Reto Grieder
+ * Benjamin Knecht
*
*/
Modified: code/branches/presentation/src/modules/overlays/hud/HUDBar.h
===================================================================
--- code/branches/presentation/src/modules/overlays/hud/HUDBar.h 2011-05-29 21:02:17 UTC (rev 8672)
+++ code/branches/presentation/src/modules/overlays/hud/HUDBar.h 2011-05-29 21:59:17 UTC (rev 8673)
@@ -25,6 +25,7 @@
* Felix Schulthess
* Fabian 'x3n' Landau
* Reto Grieder
+ * Benjamin Knecht
*
*/
Copied: code/branches/presentation/src/modules/overlays/hud/HUDBoostBar.cc (from rev 8672, code/branches/hudimprovements/src/modules/overlays/hud/HUDBoostBar.cc)
===================================================================
--- code/branches/presentation/src/modules/overlays/hud/HUDBoostBar.cc (rev 0)
+++ code/branches/presentation/src/modules/overlays/hud/HUDBoostBar.cc 2011-05-29 21:59:17 UTC (rev 8673)
@@ -0,0 +1,89 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Benjamin Knecht
+ * Co-authors:
+ * ...
+ *
+ */
+
+#include "HUDBoostBar.h"
+
+#include "core/CoreIncludes.h"
+#include "worldentities/pawns/SpaceShip.h"
+#include "items/Engine.h"
+
+namespace orxonox
+{
+ CreateFactory(HUDBoostBar);
+
+ HUDBoostBar::HUDBoostBar(BaseObject* creator)
+ : HUDBar(creator)
+ {
+ RegisterObject(HUDBoostBar);
+
+ this->owner_ = 0;
+ this->flashInterval_ = 0.25f;
+ this->flashDt_ = 0.0f;
+ }
+
+ HUDBoostBar::~HUDBoostBar()
+ {
+ }
+
+ void HUDBoostBar::tick(float dt)
+ {
+ SUPER(HUDBoostBar, tick, dt);
+
+ if (this->owner_)
+ {
+ if (this->owner_->isBoostCoolingDown())
+ {
+ this->setBackgroundColour(ColourValue(0.7f, 0.2f, 0.2f));
+ if (this->flashDt_ <= 0.0f)
+ {
+ this->flashDt_ = this->flashInterval_;
+ this->setVisible(!this->isVisible());
+ }
+ else
+ this->flashDt_ -= dt;
+ }
+ else
+ {
+ this->flashDt_ = 0.0f;
+ this->show();
+ this->setBackgroundColour(ColourValue(0.2f, 0.7f, 0.2f));
+ }
+
+ float value = this->owner_->getBoostPower() / this->owner_->getInitialBoostPower();
+ this->setValue(value);
+ }
+ }
+
+ void HUDBoostBar::changedOwner()
+ {
+ SUPER(HUDBoostBar, changedOwner);
+
+ this->owner_ = orxonox_cast<SpaceShip*>(this->getOwner());
+ }
+}
+
Copied: code/branches/presentation/src/modules/overlays/hud/HUDBoostBar.h (from rev 8672, code/branches/hudimprovements/src/modules/overlays/hud/HUDBoostBar.h)
===================================================================
--- code/branches/presentation/src/modules/overlays/hud/HUDBoostBar.h (rev 0)
+++ code/branches/presentation/src/modules/overlays/hud/HUDBoostBar.h 2011-05-29 21:59:17 UTC (rev 8673)
@@ -0,0 +1,54 @@
+/*
+ * ORXONOX - the hottest 3D action shooter ever to exist
+ * > www.orxonox.net <
+ *
+ *
+ * License notice:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Author:
+ * Benjamin Knecht
+ * Co-authors:
+ * ...
+ *
+ */
+
+#ifndef _HUDBoostBar_H__
+#define _HUDBoostBar_H__
+
+#include "overlays/OverlaysPrereqs.h"
+
+#include "tools/interfaces/Tickable.h"
+#include "HUDBar.h"
+
+namespace orxonox
+{
+ class _OverlaysExport HUDBoostBar : public HUDBar, public Tickable
+ {
+ public:
+ HUDBoostBar(BaseObject* creator);
+ virtual ~HUDBoostBar();
+
+ virtual void tick(float dt);
+ virtual void changedOwner();
+
+ private:
+ SpaceShip* owner_;
+ float flashInterval_;
+ float flashDt_;
+ };
+}
+#endif /* _HUDBoostBar_H__ */
Modified: code/branches/presentation/src/orxonox/overlays/OrxonoxOverlay.cc
===================================================================
--- code/branches/presentation/src/orxonox/overlays/OrxonoxOverlay.cc 2011-05-29 21:02:17 UTC (rev 8672)
+++ code/branches/presentation/src/orxonox/overlays/OrxonoxOverlay.cc 2011-05-29 21:59:17 UTC (rev 8673)
@@ -136,6 +136,7 @@
XMLPortParam(OrxonoxOverlay, "rotation", setRotation, getRotation, xmlelement, mode);
XMLPortParam(OrxonoxOverlay, "correctaspect", setAspectCorrection, getAspectCorrection, xmlelement, mode);
XMLPortParam(OrxonoxOverlay, "background", setBackgroundMaterial, getBackgroundMaterial, xmlelement, mode);
+ XMLPortParam(OrxonoxOverlay, "backgroundtex", setBackgroundTexture, getBackgroundTexture, xmlelement, mode);
}
void OrxonoxOverlay::changedName()
@@ -166,6 +167,34 @@
return BLANKSTRING;
}
+ //! Sets the background texture name and creates a new material if necessary
+ void OrxonoxOverlay::setBackgroundTexture(const std::string& texture)
+ {
+ if (this->background_ && this->background_->getMaterial().isNull() && !texture.empty())
+ {
+ // create new material
+ const std::string& materialname = "generated_material" + getUniqueNumberString();
+ Ogre::MaterialPtr material = static_cast<Ogre::MaterialPtr>(Ogre::MaterialManager::getSingleton().create(materialname, "General"));
+ material->getTechnique(0)->getPass(0)->setSceneBlending(Ogre::SBT_TRANSPARENT_ALPHA);
+ Ogre::TextureUnitState* textureUnitState_ = material->getTechnique(0)->getPass(0)->createTextureUnitState();
+ textureUnitState_->setTextureName(texture);
+ textureUnitState_->setNumMipmaps(0);
+ this->background_->setMaterialName(materialname);
+ }
+ }
+
+ //! Returns the the texture name of the background
+ const std::string& OrxonoxOverlay::getBackgroundTexture() const
+ {
+ if (this->background_)
+ {
+ Ogre::TextureUnitState* tempTx = this->background_->getMaterial()->getTechnique(0)->getPass(0)->getTextureUnitState(0);
+ return tempTx->getTextureName();
+ }
+ else
+ return BLANKSTRING;
+ }
+
//! Called by BaseObject when visibility has changed.
void OrxonoxOverlay::changedVisibility()
{
@@ -405,9 +434,17 @@
}
}
- void OrxonoxOverlay::setBackgroundAlpha(float alpha) {
+ void OrxonoxOverlay::setBackgroundAlpha(float alpha)
+ {
Ogre::MaterialPtr ptr = this->background_->getMaterial();
Ogre::TextureUnitState* tempTx = ptr->getTechnique(0)->getPass(0)->getTextureUnitState(0);
tempTx->setAlphaOperation(Ogre::LBX_MODULATE, Ogre::LBS_MANUAL, Ogre::LBS_CURRENT, alpha);
}
+
+ void OrxonoxOverlay::setBackgroundColour(ColourValue colour)
+ {
+ Ogre::MaterialPtr ptr = this->background_->getMaterial();
+ Ogre::TextureUnitState* tempTx = ptr->getTechnique(0)->getPass(0)->getTextureUnitState(0);
+ tempTx->setColourOperationEx(Ogre::LBX_MODULATE, Ogre::LBS_MANUAL, Ogre::LBS_CURRENT, colour);
+ }
}
Modified: code/branches/presentation/src/orxonox/overlays/OrxonoxOverlay.h
===================================================================
--- code/branches/presentation/src/orxonox/overlays/OrxonoxOverlay.h 2011-05-29 21:02:17 UTC (rev 8672)
+++ code/branches/presentation/src/orxonox/overlays/OrxonoxOverlay.h 2011-05-29 21:59:17 UTC (rev 8673)
@@ -159,8 +159,13 @@
void setBackgroundMaterial(const std::string& material);
const std::string& getBackgroundMaterial() const;
+ void setBackgroundTexture(const std::string& texture);
+ const std::string& getBackgroundTexture() const;
+
void setBackgroundAlpha(float alpha);
+ void setBackgroundColour(ColourValue colour);
+
virtual void changedVisibility();
inline void setOwner(BaseObject* owner)
Modified: code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h
===================================================================
--- code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h 2011-05-29 21:02:17 UTC (rev 8672)
+++ code/branches/presentation/src/orxonox/worldentities/pawns/SpaceShip.h 2011-05-29 21:59:17 UTC (rev 8673)
@@ -87,6 +87,14 @@
inline bool getBoost() const
{ return this->bBoost_; }
+ inline float getBoostPower() const
+ { return this->boostPower_; }
+ inline float getInitialBoostPower() const
+ { return this->initialBoostPower_; }
+
+ inline bool isBoostCoolingDown() const
+ { return bBoostCooldown_; }
+
protected:
virtual std::vector<PickupCarrier*>* getCarrierChildren(void) const;
bool bInvertYAxis_;
More information about the Orxonox-commit
mailing list