[Orxonox-commit 2412] r7127 - in code/branches/presentation3/src: libraries/core libraries/network/packet libraries/network/synchronisable libraries/util modules/designtools modules/objects modules/objects/eventsystem modules/objects/triggers modules/overlays/hud modules/pickup modules/pickup/items modules/questsystem modules/questsystem/notifications modules/weapons modules/weapons/projectiles modules/weapons/weaponmodes orxonox orxonox/controllers orxonox/gametypes orxonox/graphics orxonox/infos orxonox/interfaces orxonox/pickup orxonox/worldentities
rgrieder at orxonox.net
rgrieder at orxonox.net
Wed Jun 9 21:32:59 CEST 2010
Author: rgrieder
Date: 2010-06-09 21:32:58 +0200 (Wed, 09 Jun 2010)
New Revision: 7127
Modified:
code/branches/presentation3/src/libraries/core/BaseObject.cc
code/branches/presentation3/src/libraries/core/BaseObject.h
code/branches/presentation3/src/libraries/core/Event.cc
code/branches/presentation3/src/libraries/core/EventIncludes.h
code/branches/presentation3/src/libraries/core/GUIManager.h
code/branches/presentation3/src/libraries/core/OrxonoxClass.h
code/branches/presentation3/src/libraries/core/Super.h
code/branches/presentation3/src/libraries/core/Template.cc
code/branches/presentation3/src/libraries/network/packet/Chat.cc
code/branches/presentation3/src/libraries/network/synchronisable/Synchronisable.h
code/branches/presentation3/src/libraries/util/Serialise.h
code/branches/presentation3/src/modules/designtools/CreateStars.h
code/branches/presentation3/src/modules/designtools/SkyboxGenerator.cc
code/branches/presentation3/src/modules/designtools/SkyboxGenerator.h
code/branches/presentation3/src/modules/objects/Planet.cc
code/branches/presentation3/src/modules/objects/eventsystem/EventListener.cc
code/branches/presentation3/src/modules/objects/triggers/CheckPoint.cc
code/branches/presentation3/src/modules/objects/triggers/DistanceMultiTrigger.cc
code/branches/presentation3/src/modules/objects/triggers/DistanceMultiTrigger.h
code/branches/presentation3/src/modules/objects/triggers/DistanceTrigger.cc
code/branches/presentation3/src/modules/objects/triggers/DistanceTriggerBeacon.cc
code/branches/presentation3/src/modules/objects/triggers/DistanceTriggerBeacon.h
code/branches/presentation3/src/modules/objects/triggers/EventMultiTrigger.cc
code/branches/presentation3/src/modules/objects/triggers/EventMultiTrigger.h
code/branches/presentation3/src/modules/objects/triggers/MultiTrigger.cc
code/branches/presentation3/src/modules/objects/triggers/MultiTrigger.h
code/branches/presentation3/src/modules/objects/triggers/MultiTriggerContainer.cc
code/branches/presentation3/src/modules/objects/triggers/MultiTriggerContainer.h
code/branches/presentation3/src/modules/overlays/hud/GametypeFadingMessage.h
code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.cc
code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.h
code/branches/presentation3/src/modules/overlays/hud/GametypeStatus.cc
code/branches/presentation3/src/modules/overlays/hud/GametypeStatus.h
code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc
code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.h
code/branches/presentation3/src/modules/overlays/hud/HUDRadar.cc
code/branches/presentation3/src/modules/overlays/hud/HUDRadar.h
code/branches/presentation3/src/modules/pickup/DroppedPickup.cc
code/branches/presentation3/src/modules/pickup/DroppedPickup.h
code/branches/presentation3/src/modules/pickup/Pickup.h
code/branches/presentation3/src/modules/pickup/PickupCollection.cc
code/branches/presentation3/src/modules/pickup/PickupCollection.h
code/branches/presentation3/src/modules/pickup/PickupCollectionIdentifier.cc
code/branches/presentation3/src/modules/pickup/PickupCollectionIdentifier.h
code/branches/presentation3/src/modules/pickup/PickupManager.cc
code/branches/presentation3/src/modules/pickup/PickupManager.h
code/branches/presentation3/src/modules/pickup/PickupPrereqs.h
code/branches/presentation3/src/modules/pickup/PickupRepresentation.cc
code/branches/presentation3/src/modules/pickup/PickupRepresentation.h
code/branches/presentation3/src/modules/pickup/PickupSpawner.cc
code/branches/presentation3/src/modules/pickup/PickupSpawner.h
code/branches/presentation3/src/modules/pickup/items/DronePickup.cc
code/branches/presentation3/src/modules/pickup/items/DronePickup.h
code/branches/presentation3/src/modules/pickup/items/HealthPickup.cc
code/branches/presentation3/src/modules/pickup/items/HealthPickup.h
code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.h
code/branches/presentation3/src/modules/pickup/items/MetaPickup.cc
code/branches/presentation3/src/modules/pickup/items/MetaPickup.h
code/branches/presentation3/src/modules/pickup/items/ShieldPickup.cc
code/branches/presentation3/src/modules/pickup/items/SpeedPickup.cc
code/branches/presentation3/src/modules/pickup/items/SpeedPickup.h
code/branches/presentation3/src/modules/questsystem/Quest.h
code/branches/presentation3/src/modules/questsystem/QuestEffectBeacon.cc
code/branches/presentation3/src/modules/questsystem/QuestItem.cc
code/branches/presentation3/src/modules/questsystem/QuestManager.cc
code/branches/presentation3/src/modules/questsystem/QuestNotification.cc
code/branches/presentation3/src/modules/questsystem/notifications/Notification.cc
code/branches/presentation3/src/modules/questsystem/notifications/NotificationManager.cc
code/branches/presentation3/src/modules/questsystem/notifications/NotificationQueue.cc
code/branches/presentation3/src/modules/weapons/RocketController.cc
code/branches/presentation3/src/modules/weapons/RocketController.h
code/branches/presentation3/src/modules/weapons/projectiles/Rocket.cc
code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc
code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h
code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc
code/branches/presentation3/src/orxonox/ChatHistory.cc
code/branches/presentation3/src/orxonox/ChatHistory.h
code/branches/presentation3/src/orxonox/ChatInputHandler.cc
code/branches/presentation3/src/orxonox/ChatInputHandler.h
code/branches/presentation3/src/orxonox/Level.cc
code/branches/presentation3/src/orxonox/MoodManager.cc
code/branches/presentation3/src/orxonox/OrxonoxPrereqs.h
code/branches/presentation3/src/orxonox/Radar.cc
code/branches/presentation3/src/orxonox/controllers/AIController.cc
code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc
code/branches/presentation3/src/orxonox/controllers/ArtificialController.h
code/branches/presentation3/src/orxonox/controllers/DroneController.h
code/branches/presentation3/src/orxonox/gametypes/Gametype.cc
code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.cc
code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.h
code/branches/presentation3/src/orxonox/graphics/Model.cc
code/branches/presentation3/src/orxonox/graphics/Model.h
code/branches/presentation3/src/orxonox/infos/GametypeInfo.cc
code/branches/presentation3/src/orxonox/interfaces/InterfaceCompilation.cc
code/branches/presentation3/src/orxonox/interfaces/PickupCarrier.h
code/branches/presentation3/src/orxonox/interfaces/Pickupable.cc
code/branches/presentation3/src/orxonox/interfaces/Pickupable.h
code/branches/presentation3/src/orxonox/interfaces/RadarViewable.cc
code/branches/presentation3/src/orxonox/interfaces/RadarViewable.h
code/branches/presentation3/src/orxonox/pickup/PickupIdentifier.cc
code/branches/presentation3/src/orxonox/pickup/PickupIdentifier.h
code/branches/presentation3/src/orxonox/worldentities/Drone.h
code/branches/presentation3/src/orxonox/worldentities/WorldEntity.cc
code/branches/presentation3/src/orxonox/worldentities/WorldEntity.h
Log:
Removed excess white space at the end of lines.
Modified: code/branches/presentation3/src/libraries/core/BaseObject.cc
===================================================================
--- code/branches/presentation3/src/libraries/core/BaseObject.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/libraries/core/BaseObject.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -104,7 +104,7 @@
delete it->second;
}
}
-
+
/** @brief Adds an object which listens to the events of this object. */
void BaseObject::registerEventListener(BaseObject* object)
{
@@ -124,7 +124,7 @@
XMLPortParam(BaseObject, "active", setActive, isActive, xmlelement, mode);
XMLPortParam(BaseObject, "mainstate", setMainStateName, getMainStateName, xmlelement, mode);
XMLPortParamTemplate(BaseObject, "template", addTemplate, getSingleTemplate, xmlelement, mode, const std::string&);
-
+
XMLPortObjectTemplate(BaseObject, Template, "templates", addTemplate, getTemplate, xmlelement, mode, Template*);
XMLPortObject(BaseObject, BaseObject, "eventlisteners", addEventListener, getEventListener, xmlelement, mode);
@@ -371,7 +371,7 @@
void BaseObject::processEvent(Event& event)
{
this->registerEventStates();
-
+
COUT(4) << this->getIdentifier()->getName() << " (&" << this << ") processing event. originator: " << event.originator_->getIdentifier()->getName() << " (&" << event.originator_ << "), activate: " << event.activate_ << ", name: " << event.name_ << ", statename: " << event.statename_ << "." << std::endl;
std::map<std::string, EventState*>::const_iterator it = this->eventStates_.find(event.statename_);
Modified: code/branches/presentation3/src/libraries/core/BaseObject.h
===================================================================
--- code/branches/presentation3/src/libraries/core/BaseObject.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/libraries/core/BaseObject.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -153,7 +153,7 @@
inline const SmartPtr<Gametype>& getGametype() const { return this->gametype_; }
inline Gametype* getOldGametype() const { return this->oldGametype_; }
virtual void changedGametype() {}
-
+
inline void setLevel(const SmartPtr<Level>& level)
{
if (level != this->level_)
Modified: code/branches/presentation3/src/libraries/core/Event.cc
===================================================================
--- code/branches/presentation3/src/libraries/core/Event.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/libraries/core/Event.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -59,7 +59,7 @@
this->bProcessingEvent_ = true;
COUT(4) << "Processing event (EventState) : originator: " << event.originator_->getIdentifier()->getName() << " (&" << event.originator_ << "), activate: " << event.activate_ << ", name: " << event.name_ << ", statename: " << event.statename_ << ", object: " << object->getIdentifier()->getName() << " (&" << object << ")" << "." << std::endl;
-
+
// check if the originator is an instance of the requested class
if (event.originator_->isA(this->subclass_))
{
Modified: code/branches/presentation3/src/libraries/core/EventIncludes.h
===================================================================
--- code/branches/presentation3/src/libraries/core/EventIncludes.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/libraries/core/EventIncludes.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -51,7 +51,7 @@
this->addEventState(statename, containername##function); \
} \
XMLPortEventStateIntern(xmlportevent##function, classname, statename, xmlelement, mode)
-
+
#define XMLPortEventSink(classname, subclassname, statename, function, xmlelement, mode) \
orxonox::EventState* containername##function = this->getEventState(statename); \
if (!containername##function) \
Modified: code/branches/presentation3/src/libraries/core/GUIManager.h
===================================================================
--- code/branches/presentation3/src/libraries/core/GUIManager.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/libraries/core/GUIManager.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -102,11 +102,11 @@
static void subscribeEventHelper(CEGUI::Window* window, const std::string& event, const std::string& function); //tolua_export
static GUIManager& getInstance() { return Singleton<GUIManager>::getInstance(); } // tolua_export
-
+
private:
GUIManager(const GUIManager& instance); //!< private and undefined copy c'tor (this is a singleton class)
void executeCode(const std::string& str);
-
+
template <typename FunctionType>
bool protectedCall(FunctionType function);
Modified: code/branches/presentation3/src/libraries/core/OrxonoxClass.h
===================================================================
--- code/branches/presentation3/src/libraries/core/OrxonoxClass.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/libraries/core/OrxonoxClass.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -107,7 +107,7 @@
bool isDirectChildOf(const OrxonoxClass* object);
bool isParentOf(const OrxonoxClass* object);
bool isDirectParentOf(const OrxonoxClass* object);
-
+
virtual void clone(OrxonoxClass*& item) {}
inline unsigned int getReferenceCount() const
@@ -171,9 +171,9 @@
//! 'Fast map' that holds this-pointers of all derived types
std::vector<std::pair<unsigned int, void*> > objectPointers_;
};
-
+
SUPER_FUNCTION(11, OrxonoxClass, clone, false);
-
+
}
#endif /* _OrxonoxClass_H__ */
Modified: code/branches/presentation3/src/libraries/core/Super.h
===================================================================
--- code/branches/presentation3/src/libraries/core/Super.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/libraries/core/Super.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -266,19 +266,19 @@
#define SUPER_changedGametype(classname, functionname, ...) \
SUPER_NOARGS(classname, functionname)
-
+
#define SUPER_changedUsed(classname, functionname, ...) \
SUPER_NOARGS(classname, functionname)
-
+
#define SUPER_clone(classname, functionname, ...) \
SUPER_ARGS(classname, functionname, __VA_ARGS__)
-
+
#define SUPER_changedCarrier(classname, functionname, ...) \
SUPER_NOARGS(classname, functionname)
-
+
#define SUPER_changedPickedUp(classname, functionname, ...) \
SUPER_NOARGS(classname, functionname)
-
+
// (1/3) --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <-- --> HERE <--
@@ -529,7 +529,7 @@
SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(9, changedGametype, false)
()
SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
-
+
SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(10, changedUsed, false)
()
SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
@@ -537,11 +537,11 @@
SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(11, clone, true, OrxonoxClass* item)
(item)
SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
-
+
SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(12, changedCarrier, false)
()
SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
-
+
SUPER_FUNCTION_GLOBAL_DECLARATION_PART1(13, changedPickedUp, false)
()
SUPER_FUNCTION_GLOBAL_DECLARATION_PART2;
Modified: code/branches/presentation3/src/libraries/core/Template.cc
===================================================================
--- code/branches/presentation3/src/libraries/core/Template.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/libraries/core/Template.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -106,7 +106,7 @@
if (temp)
{
this->bLoadDefaults_ = temp->bLoadDefaults_;
-
+
if (!temp->bIsReturningXMLElement_)
{
this->bIsReturningXMLElement_ = true;
Modified: code/branches/presentation3/src/libraries/network/packet/Chat.cc
===================================================================
--- code/branches/presentation3/src/libraries/network/packet/Chat.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/libraries/network/packet/Chat.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -59,8 +59,8 @@
*(unsigned int *)(data_ + _PLAYERID ) = playerID;
*(unsigned int *)(data_ + _MESSAGELENGTH ) = messageLength_;
- /* cast the hell out of the message string, and copy it into the
- * data buffer.
+ /* cast the hell out of the message string, and copy it into the
+ * data buffer.
*/
memcpy( data_+_MESSAGE, static_cast<void*>(const_cast<char*>(message.c_str())), messageLength_ );
}
Modified: code/branches/presentation3/src/libraries/network/synchronisable/Synchronisable.h
===================================================================
--- code/branches/presentation3/src/libraries/network/synchronisable/Synchronisable.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/libraries/network/synchronisable/Synchronisable.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -182,7 +182,7 @@
this->dataSize_ += syncList.back()->getSize(state_);
}
}
-
+
template <class T> void Synchronisable::registerVariable( std::set<T>& variable, uint8_t mode, NetworkCallbackBase *cb, bool bidirectional)
{
SynchronisableVariableBase* sv;
Modified: code/branches/presentation3/src/libraries/util/Serialise.h
===================================================================
--- code/branches/presentation3/src/libraries/util/Serialise.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/libraries/util/Serialise.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -635,17 +635,17 @@
{
return checkEquality( (unsigned char&)((mbool&)variable).getMemory(), mem );
}
-
+
// =========== std::set
-
+
template <class T> inline uint32_t returnSize( const std::set<T>& variable )
{
uint32_t tempsize = sizeof(uint32_t); // for the number of entries
for( typename std::set<T>::iterator it=((std::set<T>*)(&variable))->begin(); it!=((std::set<T>*)(&variable))->end(); ++it)
- tempsize += returnSize( *it );
- return tempsize;
+ tempsize += returnSize( *it );
+ return tempsize;
}
-
+
template <class T> inline void saveAndIncrease( const std::set<T>& variable, uint8_t*& mem )
{
typename std::set<T>::const_iterator it = variable.begin();
@@ -653,7 +653,7 @@
for( ; it!=variable.end(); ++it )
saveAndIncrease( *it, mem );
}
-
+
template <class T> inline void loadAndIncrease( const std::set<T>& variable, uint8_t*& mem )
{
uint32_t nrOfElements = 0;
@@ -674,7 +674,7 @@
}
}
}
-
+
template <class T> inline bool checkEquality( const std::set<T>& variable, uint8_t* mem )
{
uint8_t* temp = mem;
Modified: code/branches/presentation3/src/modules/designtools/CreateStars.h
===================================================================
--- code/branches/presentation3/src/modules/designtools/CreateStars.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/designtools/CreateStars.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -31,7 +31,7 @@
#include <string>
#include "util/Math.h"
#include "core/BaseObject.h"
-
+
namespace orxonox
{
class CreateStars : public BaseObject
@@ -60,11 +60,11 @@
return this->material_;
}
- void setColour(const orxonox::ColourValue& colour) {
+ void setColour(const orxonox::ColourValue& colour) {
this->colour_ = colour;
}
- const ColourValue& getColour() const {
+ const ColourValue& getColour() const {
return this->colour_;
}
@@ -108,7 +108,7 @@
unsigned int getRadius()const {
return this->radius_;
}
-
+
Vector3 PolarToCartesian(float alpha, float beta, float radius);
private:
@@ -118,9 +118,9 @@
std::vector<Billboard*> billboards_;
unsigned int radius_;
float alpha_;
- float colourDiff_;
+ float colourDiff_;
float alphaDiff_;
float radiusDiff_;
-
+
};
}
Modified: code/branches/presentation3/src/modules/designtools/SkyboxGenerator.cc
===================================================================
--- code/branches/presentation3/src/modules/designtools/SkyboxGenerator.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/designtools/SkyboxGenerator.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -45,7 +45,7 @@
#include "graphics/Camera.h"
-
+
namespace orxonox
{
@@ -67,7 +67,7 @@
}
- void SkyboxGenerator::setConfigValues( )
+ void SkyboxGenerator::setConfigValues( )
{
SetConfigValue(skyboxPrefix_, "SkyboxFile_");
}
@@ -82,15 +82,15 @@
this->captionsRemoved_ = true;
return;
}
-
+
ControllableEntity* ce = HumanController::getLocalControllerSingleton()->getControllableEntity();
Camera* camera = ce->getCamera();
assert(ce);
-
+
Ogre::RenderWindow* w = GraphicsManager::getInstance().getRenderWindow();
- switch (iterateOverDirections_)
+ switch (iterateOverDirections_)
{
case 0 :
fovy_ = camera->getOgreCamera()->getFOVy();
@@ -104,29 +104,29 @@
ce->yaw(Degree(90));
iterateOverDirections_++;
break;
-
+
case 2 :
w->writeContentsToFile(skyboxPrefix_+"lf.png");
- ce->yaw(Degree(90));
+ ce->yaw(Degree(90));
iterateOverDirections_++;
break;
case 3 :
w->writeContentsToFile(skyboxPrefix_+"bk.png");
- ce->yaw(Degree(90));
+ ce->yaw(Degree(90));
iterateOverDirections_++;
break;
case 4 :
w->writeContentsToFile(skyboxPrefix_+"rt.png");
- ce->yaw(Degree(90));
- ce->pitch(Degree(90));
+ ce->yaw(Degree(90));
+ ce->pitch(Degree(90));
iterateOverDirections_++;
break;
case 5 :
w->writeContentsToFile(skyboxPrefix_+"up.png");
- ce->pitch(Degree(180));
+ ce->pitch(Degree(180));
iterateOverDirections_++;
break;
@@ -135,7 +135,7 @@
ce->pitch(Degree(90));
iterateOverDirections_++;
break;
-
+
case 7 :
camera->getOgreCamera()->setAspectRatio(aspectRatio_);
camera->getOgreCamera()->setFOVy(fovy_);
@@ -151,7 +151,7 @@
}
}
- void SkyboxGenerator::createSkybox( )
+ void SkyboxGenerator::createSkybox( )
{
SkyboxGenerator::getInstance().takeScreenshot_ = true;
CommandExecutor::execute("pause");
Modified: code/branches/presentation3/src/modules/designtools/SkyboxGenerator.h
===================================================================
--- code/branches/presentation3/src/modules/designtools/SkyboxGenerator.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/designtools/SkyboxGenerator.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -31,14 +31,14 @@
#include "util/Singleton.h"
#include "tools/interfaces/Tickable.h"
#include <OgreMath.h>
-
-
+
+
namespace orxonox
{
class SkyboxGenerator : public virtual OrxonoxClass, public Singleton<SkyboxGenerator>, public Tickable
{
friend class Singleton<SkyboxGenerator>;
-
+
public:
SkyboxGenerator();
virtual ~SkyboxGenerator();
@@ -48,7 +48,7 @@
private:
static SkyboxGenerator* singletonPtr_s;
- std::string skyboxPrefix_;
+ std::string skyboxPrefix_;
bool takeScreenshot_;
int iterateOverDirections_;
float aspectRatio_;
Modified: code/branches/presentation3/src/modules/objects/Planet.cc
===================================================================
--- code/branches/presentation3/src/modules/objects/Planet.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/objects/Planet.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -104,15 +104,15 @@
this->attachOgreObject(this->mesh_.getEntity());
this->mesh_.getEntity()->setCastShadows(this->bCastShadows_);
this->mesh_.setVisible(this->isVisible());
-
+
float scaleFactor = this->getScale();
-
+
#if OGRE_VERSION >= 0x010700
Ogre::Mesh::LodValueList distList;
#else
Ogre::Mesh::LodDistanceList distList;
#endif
-
+
distList.push_back(10.0f*scaleFactor);
distList.push_back(19.0f*scaleFactor);
distList.push_back(27.0f*scaleFactor);
@@ -123,12 +123,12 @@
distList.push_back(52.0f*scaleFactor);
distList.push_back(54.0f*scaleFactor);
distList.push_back(55.0f*scaleFactor);
-
+
float reductionValue = 0.2f;
-
+
this->mesh_.getEntity()->getMesh()->generateLodLevels(distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL, reductionValue);
billboard_.setBillboardSet(this->getScene()->getSceneManager(), this->atmosphere_, Vector3(0,0,0));
-
+
this->attachOgreObject(this->billboard_.getBillboardSet());
this->billboard_.getBillboardSet()->setUseAccurateFacing(true);
this->setCastShadows(true);
Modified: code/branches/presentation3/src/modules/objects/eventsystem/EventListener.cc
===================================================================
--- code/branches/presentation3/src/modules/objects/eventsystem/EventListener.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/objects/eventsystem/EventListener.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -60,7 +60,7 @@
COUT(2) << "Warning: Detected Event loop in EventListener \"" << this->getName() << '"' << std::endl;
return;
}
-
+
COUT(4) << "EventListener, processing event: originator: " << event.originator_->getIdentifier()->getName() << " (&" << event.originator_ << ")" << ", activate: " << event.activate_ << ", name: " << event.name_ << std::endl;
this->bActive_ = true;
Modified: code/branches/presentation3/src/modules/objects/triggers/CheckPoint.cc
===================================================================
--- code/branches/presentation3/src/modules/objects/triggers/CheckPoint.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/objects/triggers/CheckPoint.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -37,7 +37,7 @@
{
CreateFactory(CheckPoint);
- CheckPoint::CheckPoint(BaseObject* creator)
+ CheckPoint::CheckPoint(BaseObject* creator)
: DistanceTrigger(creator)
, RadarViewable(creator, static_cast<WorldEntity*>(this))
{
Modified: code/branches/presentation3/src/modules/objects/triggers/DistanceMultiTrigger.cc
===================================================================
--- code/branches/presentation3/src/modules/objects/triggers/DistanceMultiTrigger.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/objects/triggers/DistanceMultiTrigger.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -39,17 +39,17 @@
namespace orxonox
{
-
+
CreateFactory(DistanceMultiTrigger);
/**
@brief
- Default Constructor. Registers the object and initializes default values.
+ Default Constructor. Registers the object and initializes default values.
*/
DistanceMultiTrigger::DistanceMultiTrigger(BaseObject* creator) : MultiTrigger(creator)
{
RegisterObject(DistanceMultiTrigger);
-
+
this->distance_ = 100.0f;
this->targetName_ = BLANKSTRING;
this->singleTargetMode_ = false;
@@ -97,7 +97,7 @@
this->removeFromRange(key);
continue;
}
-
+
Vector3 distanceVec = entity->getWorldPosition() - this->getWorldPosition();
// If the object is no longer in range.
if (distanceVec.length() > this->distance_)
@@ -153,7 +153,7 @@
// Change the entity to the parent of the DistanceTriggerBeacon (if in single-target-mode), which is the entity to which the beacon is attached.
if(this->singleTargetMode_)
entity = entity->getParent();
-
+
// If no queue has been created, yet.
if(queue == NULL)
queue = new std::queue<MultiTriggerState*>();
@@ -165,8 +165,8 @@
queue->push(state);
}
}
-
+
return queue;
}
-
+
}
Modified: code/branches/presentation3/src/modules/objects/triggers/DistanceMultiTrigger.h
===================================================================
--- code/branches/presentation3/src/modules/objects/triggers/DistanceMultiTrigger.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/objects/triggers/DistanceMultiTrigger.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -55,11 +55,11 @@
*/
class _ObjectsExport DistanceMultiTrigger : public MultiTrigger
{
-
+
public:
DistanceMultiTrigger(BaseObject* creator); //!< Default Constructor. Registers the object and initializes default values.
~DistanceMultiTrigger(); //!< Destructor.
-
+
void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a DistanceMultiTrigger object through XML.
/**
@@ -74,7 +74,7 @@
*/
inline const std::string& getTargetName(void)
{ return this->targetName_; }
-
+
/**
@brief Set the distance at which the DistanceMultiTrigger triggers.
@param distance The distance.
@@ -87,7 +87,7 @@
*/
inline float getDistance() const
{ return this->distance_; }
-
+
protected:
virtual std::queue<MultiTriggerState*>* letTrigger(void); //!< This method is called by the MultiTrigger to get information about new trigger events that need to be looked at.
@@ -105,16 +105,16 @@
*/
inline bool removeFromRange(WorldEntity* entity)
{ WeakPtr<WorldEntity>* weakptr = this->range_.find(entity)->second; bool erased = this->range_.erase(entity) > 0; if(erased) delete weakptr; return erased; }
-
+
private:
float distance_; //!< The distance at which the DistanceMultiTrigger triggers.
std::string targetName_; //!< The target name, used in singleTargetMode.
bool singleTargetMode_; //!< To indicate whe the MultiDistanceTrigger is in single-target-mode.
-
+
std::map<WorldEntity*, WeakPtr<WorldEntity>* > range_; //!< The set of entities that currently are in range of the DistanceMultiTrigger.
-
+
};
-
+
}
#endif // _DistanceMultiTrigger_H__
Modified: code/branches/presentation3/src/modules/objects/triggers/DistanceTrigger.cc
===================================================================
--- code/branches/presentation3/src/modules/objects/triggers/DistanceTrigger.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/objects/triggers/DistanceTrigger.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -135,7 +135,7 @@
else if(entity->getName().compare(this->targetName_) != 0)
continue;
}
-
+
Vector3 distanceVec = entity->getWorldPosition() - this->getWorldPosition();
if (distanceVec.length() < this->distance_)
{
Modified: code/branches/presentation3/src/modules/objects/triggers/DistanceTriggerBeacon.cc
===================================================================
--- code/branches/presentation3/src/modules/objects/triggers/DistanceTriggerBeacon.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/objects/triggers/DistanceTriggerBeacon.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -34,10 +34,10 @@
{
CreateFactory(DistanceTriggerBeacon);
-
+
DistanceTriggerBeacon::DistanceTriggerBeacon(BaseObject* creator) : StaticEntity(creator)
{
RegisterObject(DistanceTriggerBeacon);
}
-
+
}
Modified: code/branches/presentation3/src/modules/objects/triggers/DistanceTriggerBeacon.h
===================================================================
--- code/branches/presentation3/src/modules/objects/triggers/DistanceTriggerBeacon.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/objects/triggers/DistanceTriggerBeacon.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -38,7 +38,7 @@
class _ObjectsExport DistanceTriggerBeacon : public StaticEntity
{
-
+
public:
DistanceTriggerBeacon(BaseObject* creator);
Modified: code/branches/presentation3/src/modules/objects/triggers/EventMultiTrigger.cc
===================================================================
--- code/branches/presentation3/src/modules/objects/triggers/EventMultiTrigger.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/objects/triggers/EventMultiTrigger.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -51,7 +51,7 @@
EventMultiTrigger::~EventMultiTrigger()
{
-
+
}
void EventMultiTrigger::XMLPort(Element& xmlelement, XMLPort::Mode mode)
@@ -60,7 +60,7 @@
this->setBroadcast(true);
}
-
+
void EventMultiTrigger::XMLEventPort(Element& xmlelement, XMLPort::Mode mode)
{
SUPER(EventMultiTrigger, XMLEventPort, xmlelement, mode);
Modified: code/branches/presentation3/src/modules/objects/triggers/EventMultiTrigger.h
===================================================================
--- code/branches/presentation3/src/modules/objects/triggers/EventMultiTrigger.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/objects/triggers/EventMultiTrigger.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -43,7 +43,7 @@
class _ObjectsExport EventMultiTrigger : public MultiTrigger
{
-
+
public:
EventMultiTrigger(BaseObject* creator);
~EventMultiTrigger();
Modified: code/branches/presentation3/src/modules/objects/triggers/MultiTrigger.cc
===================================================================
--- code/branches/presentation3/src/modules/objects/triggers/MultiTrigger.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/objects/triggers/MultiTrigger.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -46,7 +46,7 @@
/*static*/ const std::string MultiTrigger::and_s = "and";
/*static*/ const std::string MultiTrigger::or_s = "or";
/*static*/ const std::string MultiTrigger::xor_s = "xor";
-
+
CreateFactory(MultiTrigger);
/**
@@ -64,7 +64,7 @@
this->delay_ = 0.0f;
this->bSwitch_ = false;
this->bStayActive_ = false;
-
+
this->remainingActivations_ = INF_s;
this->maxNumSimultaniousTriggerers_ = INF_s;
@@ -74,12 +74,12 @@
this->bBroadcast_ = false;
this->parentTrigger_ = NULL;
-
+
this->targetMask_.exclude(Class(BaseObject));
this->setSyncMode(0x0);
}
-
+
/**
@brief
Destructor. Cleans up the state queue.
@@ -94,7 +94,7 @@
delete state;
}
}
-
+
/**
@brief
Method for creating a MultiTrigger object through XML.
@@ -116,11 +116,11 @@
//TODO: Maybe nicer with explicit subgroup, e.g. triggers
XMLPortObject(MultiTrigger, MultiTrigger, "", addTrigger, getTrigger, xmlelement, mode);
-
+
COUT(4) << "MultiTrigger '" << this->getName() << "' (&" << this << ") created." << std::endl;
}
-
+
/**
@brief
A method that is executed each tick.
@@ -130,7 +130,7 @@
void MultiTrigger::tick(float dt)
{
// If this is the first tick.
- //TODO: Determine need for this, else kick it out.
+ //TODO: Determine need for this, else kick it out.
if(this->bFirstTick_)
{
this->bFirstTick_ = false;
@@ -173,7 +173,7 @@
COUT(1) << "BUH" << std::endl;
delete state;
}
-
+
queue->pop();
}
delete queue;
@@ -184,7 +184,7 @@
{
MultiTriggerState* state;
float timeRemaining;
-
+
// Go through all pending states.
for(int size = this->stateQueue_.size(); size >= 1; size--)
{
@@ -211,7 +211,7 @@
{
this->triggered_.erase(state->originator);
}
-
+
bStateChanged = true;
}
@@ -228,7 +228,7 @@
{
bool bFire = true;
-
+
// Add the originator to the objects activating this MultiTrigger.
if(bActive == true)
{
@@ -265,7 +265,7 @@
}
else
this->fire(bActive, state->originator);
-
+
bStateChanged = true;
}
}
@@ -288,7 +288,7 @@
COUT(4) << "MultiTrigger '" << this->getName() << "' (&" << this << ") ran out of activations. Setting it to inactive." << std::endl;
}
}
-
+
// Remove the state from the state queue.
this->stateQueue_.pop_front();
delete state;
@@ -508,10 +508,10 @@
return returnVal;
}
-
+
return true;
}
-
+
/**
@brief
Get whether the MultiTrigger is triggered for a given object.
@@ -546,7 +546,7 @@
COUT(4) << "MultiTrigger '" << this->getName() << "' (&" << this << "): Fired event. status: " << status << "." << std::endl;
return;
}
-
+
MultiTriggerContainer* container = new MultiTriggerContainer(this, this, originator);
this->fireEvent(status, container);
COUT(4) << "MultiTrigger '" << this->getName() << "' (&" << this << "): Fired event. originator: " << originator->getIdentifier()->getName() << " (&" << originator << "), status: " << status << "." << std::endl;
@@ -562,7 +562,7 @@
void MultiTrigger::broadcast(bool status)
{
ClassTreeMask& targetMask = this->getTargetMask();
-
+
for(ClassTreeMaskObjectIterator it = targetMask.begin(); it != targetMask.end(); ++it)
{
BaseObject* object = static_cast<BaseObject*>(*it);
@@ -579,11 +579,11 @@
bool MultiTrigger::addState(MultiTriggerState* state)
{
assert(state);
-
+
// If the originator is no target of this MultiTrigger.
if(!this->isTarget(state->originator))
return false;
-
+
// Add it ot the state queue.
this->stateQueue_.push_back(std::pair<float, MultiTriggerState*>(this->delay_, state));
Modified: code/branches/presentation3/src/modules/objects/triggers/MultiTrigger.h
===================================================================
--- code/branches/presentation3/src/modules/objects/triggers/MultiTrigger.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/objects/triggers/MultiTrigger.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -93,10 +93,10 @@
public:
MultiTrigger(BaseObject* creator); //!< Constructor. Registers the objects and initializes default values.
~MultiTrigger(); //!< Destructor.
-
+
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a MultiTrigger object through XML.
virtual void tick(float dt); //!< A method that is executed each tick.
-
+
bool isActive(BaseObject* triggerer = NULL); //!< Get whether the MultiTrigger is active for a given object.
/**
@@ -214,15 +214,15 @@
{ if(target == NULL) return true; else return targetMask_.isIncluded(target->getIdentifier()); }
void addTargets(const std::string& targets); //!< Add some target to the MultiTrigger.
void removeTargets(const std::string& targets); //!< Remove some target from the MultiTrigger.
-
+
void addTrigger(MultiTrigger* trigger); //!< Adds a MultiTrigger as a sub-trigger to the trigger.
const MultiTrigger* getTrigger(unsigned int index) const; //!< Get the sub-trigger of this MultiTrigger at the given index.
-
+
protected:
virtual std::queue<MultiTriggerState*>* letTrigger(void); //!< This method is called by the MultiTrigger to get information about new trigger events that need to be looked at.
void changeTriggered(BaseObject* originator = NULL); //!< This method can be called by any class inheriting from MultiTrigger to change it's triggered status for a specified originator.
-
+
bool isModeTriggered(BaseObject* triggerer = NULL); //!< Checks whetherx the MultiTrigger is triggered concerning it's sub-triggers.
bool isTriggered(BaseObject* triggerer = NULL); //!< Get whether the MultiTrigger is triggered for a given object.
@@ -235,7 +235,7 @@
*/
inline void addParentTrigger(MultiTrigger* parent)
{ this->parentTrigger_ = parent; }
-
+
/**
@brief Get the target mask used to identify the targets of this MultiTrigger.
@return Returns the target mask.
@@ -247,7 +247,7 @@
*/
//TODO: Check if something mus be done here.
virtual void notifyMaskUpdate(void) {}
-
+
private:
static const int INF_s; //!< Magic number for infinity.
//! Magic strings for the mode.
@@ -256,9 +256,9 @@
static const std::string xor_s;
void subTrigggerActivityChanged(BaseObject* originator); //!< This method is called by any sub-trigger to advertise changes in it's state to it's parent-trigger.
-
+
bool addState(MultiTriggerState* state); //!< Helper method. Adds a state to the state queue, where the state will wait to become active.
-
+
bool checkAnd(BaseObject* triggerer); //!< Checks whether the sub-triggers amount to true for the 'and' mode for a given object.
bool checkOr(BaseObject* triggerer); //!< Checks whether the sub-triggers amount to true for the 'or' mode for a given object.
bool checkXor(BaseObject* triggerer); //!< Checks whether the sub-triggers amount to true for the 'xor' mode for a given object.
@@ -275,7 +275,7 @@
float delay_; //!< The delay that is imposed on all new trigger events.
bool bSwitch_; //!< Bool for the switch-mode, if true the MultiTrigger behaves like a switch.
bool bStayActive_; //!< Bool for the stay-active-mode, if true the MultiTrigger stays active after its last activation.;
-
+
int remainingActivations_; //!< The remaining activations of this MultiTrigger.
int maxNumSimultaniousTriggerers_; //!< The maximum number of objects simultaniously trigggering this MultiTrigger.
@@ -286,14 +286,14 @@
MultiTrigger* parentTrigger_;
std::set<MultiTrigger*> subTriggers_; //!< The sub-triggers of this MultiTrigger.
-
+
std::set<BaseObject*> active_; //!< The set of all objects the MultiTrigger is active for.
std::set<BaseObject*> triggered_; //!< The set of all objects the MultiTrigger is triggered for.
std::deque< std::pair<float, MultiTriggerState*> > stateQueue_; //!< The queue of states waiting to become active.
-
+
ClassTreeMask targetMask_; //!< The target mask, masking all objects that can trigger this MultiTrigger.
-
+
};
}
Modified: code/branches/presentation3/src/modules/objects/triggers/MultiTriggerContainer.cc
===================================================================
--- code/branches/presentation3/src/modules/objects/triggers/MultiTriggerContainer.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/objects/triggers/MultiTriggerContainer.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -39,7 +39,7 @@
{
CreateUnloadableFactory(MultiTriggerContainer);
-
+
/**
@brief
Default constructor. Registers the object and creates an empty container.
@@ -72,7 +72,7 @@
*/
MultiTriggerContainer::~MultiTriggerContainer()
{
-
+
}
Modified: code/branches/presentation3/src/modules/objects/triggers/MultiTriggerContainer.h
===================================================================
--- code/branches/presentation3/src/modules/objects/triggers/MultiTriggerContainer.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/objects/triggers/MultiTriggerContainer.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -49,7 +49,7 @@
*/
class _ObjectsExport MultiTriggerContainer : public BaseObject
{
-
+
public:
MultiTriggerContainer(BaseObject* creator); //!< Default constructor. Registers the object and creates an empty container.
MultiTriggerContainer(BaseObject* creator, MultiTrigger* originator, BaseObject* data); //!< Constructor. Registers the object and sets the input values.
@@ -67,12 +67,12 @@
*/
inline BaseObject* getData(void)
{ return this->data_; }
-
+
private:
MultiTrigger* originator_; //!< The originator.
BaseObject* data_; //!< The data.
};
-
+
}
#endif // _MultiTriggerContainer_H__
Modified: code/branches/presentation3/src/modules/overlays/hud/GametypeFadingMessage.h
===================================================================
--- code/branches/presentation3/src/modules/overlays/hud/GametypeFadingMessage.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/overlays/hud/GametypeFadingMessage.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -45,7 +45,7 @@
virtual void changedOwner();
void fadingmessage(const GametypeInfo* gtinfo, const std::string& message);
-
+
private:
PlayerInfo* owner_;
};
Modified: code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.cc
===================================================================
--- code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -36,8 +36,8 @@
namespace orxonox
{
CreateFactory(GametypeStaticMessage);
-
-
+
+
GametypeStaticMessage::GametypeStaticMessage(BaseObject* creator) : OverlayText(creator)
{
RegisterObject(GametypeStaticMessage);
Modified: code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.h
===================================================================
--- code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/overlays/hud/GametypeStaticMessage.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -48,7 +48,7 @@
virtual void changedOwner();
void staticmessage(const GametypeInfo* gtinfo, const std::string& message, const ColourValue& colour);
-
+
private:
PlayerInfo* owner_;
};
Modified: code/branches/presentation3/src/modules/overlays/hud/GametypeStatus.cc
===================================================================
--- code/branches/presentation3/src/modules/overlays/hud/GametypeStatus.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/overlays/hud/GametypeStatus.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -38,9 +38,9 @@
namespace orxonox
{
- CreateFactory(GametypeStatus);
+ CreateFactory(GametypeStatus);
- /*static*/ bool GametypeStatus::noCaption_s = false;
+ /*static*/ bool GametypeStatus::noCaption_s = false;
SetConsoleCommand(GametypeStatus, setGametypeStatus, true);
GametypeStatus::GametypeStatus(BaseObject* creator) : OverlayText(creator)
@@ -108,5 +108,5 @@
{
GametypeStatus::noCaption_s = !bValue;
}
-
+
}
Modified: code/branches/presentation3/src/modules/overlays/hud/GametypeStatus.h
===================================================================
--- code/branches/presentation3/src/modules/overlays/hud/GametypeStatus.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/overlays/hud/GametypeStatus.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -50,7 +50,7 @@
private:
PlayerInfo* owner_;
static bool noCaption_s;
-
+
};
}
#endif /* _GametypeStatus_H__ */
Modified: code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc
===================================================================
--- code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -401,7 +401,7 @@
void HUDNavigation::changedOwner()
{
-
+
const std::set<RadarViewable*>& respawnObjects = this->getOwner()->getScene()->getRadar()->getRadarObjects();
for ( std::set<RadarViewable*>::const_iterator it = respawnObjects.begin(); it != respawnObjects.end(); ++it )
{
Modified: code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.h
===================================================================
--- code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/overlays/hud/HUDNavigation.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -49,7 +49,7 @@
virtual ~HUDNavigation();
void setConfigValues();
-
+
virtual void XMLPort ( Element& xmlElement, XMLPort::Mode mode );
virtual void tick ( float dt );
@@ -75,7 +75,7 @@
bool wasOutOfView_;
};
-
+
bool showObject( RadarViewable* rv );
// XMLPort accessors
Modified: code/branches/presentation3/src/modules/overlays/hud/HUDRadar.cc
===================================================================
--- code/branches/presentation3/src/modules/overlays/hud/HUDRadar.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/overlays/hud/HUDRadar.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -44,7 +44,7 @@
namespace orxonox
{
- CreateFactory(HUDRadar);
+ CreateFactory(HUDRadar);
HUDRadar::HUDRadar(BaseObject* creator)
: OrxonoxOverlay(creator)
Modified: code/branches/presentation3/src/modules/overlays/hud/HUDRadar.h
===================================================================
--- code/branches/presentation3/src/modules/overlays/hud/HUDRadar.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/overlays/hud/HUDRadar.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -68,7 +68,7 @@
virtual void removeObject(RadarViewable* viewable);
virtual void objectChanged( RadarViewable* rv );
void radarTick(float dt);
-
+
void gatherObjects();
std::map<RadarViewable::Shape, std::string> shapeMaterials_;
Modified: code/branches/presentation3/src/modules/pickup/DroppedPickup.cc
===================================================================
--- code/branches/presentation3/src/modules/pickup/DroppedPickup.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/pickup/DroppedPickup.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -40,9 +40,9 @@
namespace orxonox
{
-
+
CreateFactory(DroppedPickup);
-
+
/**
@brief
Default constructor. Registers object and sets default values.
@@ -50,7 +50,7 @@
DroppedPickup::DroppedPickup(BaseObject* creator) : PickupSpawner(creator)
{
RegisterObject(DroppedPickup);
-
+
}
/**
@@ -66,12 +66,12 @@
The distance at which the PickupSpawner triggers. Default is 10.
*/
DroppedPickup::DroppedPickup(BaseObject* creator, Pickupable* pickup, PickupCarrier* carrier, float triggerDistance) : PickupSpawner(creator, pickup, triggerDistance, 5, 1)
- {
+ {
RegisterObject(DroppedPickup);
this->setPosition(carrier->getCarrierPosition());
this->setActive(false);
-
+
//TODO: Do more elegantly.
this->startRespawnTimer();
}
Modified: code/branches/presentation3/src/modules/pickup/DroppedPickup.h
===================================================================
--- code/branches/presentation3/src/modules/pickup/DroppedPickup.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/pickup/DroppedPickup.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -40,7 +40,7 @@
namespace orxonox
{
-
+
/**
@brief
Special PickupSpawner that is created whe a Pickupable is dropped. It just spawns one pickup, the one that was dropped.
Modified: code/branches/presentation3/src/modules/pickup/Pickup.h
===================================================================
--- code/branches/presentation3/src/modules/pickup/Pickup.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/pickup/Pickup.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -164,7 +164,7 @@
private:
void initialize(void); //!< Initializes the member variables.
-
+
//TODO: Problems, when there are more Timers needed? Solutions?
Timer durationTimer_; //!< Timer at the disposal of each Class implementing Pickup.
Modified: code/branches/presentation3/src/modules/pickup/PickupCollection.cc
===================================================================
--- code/branches/presentation3/src/modules/pickup/PickupCollection.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/pickup/PickupCollection.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -41,7 +41,7 @@
namespace orxonox
{
-
+
CreateFactory(PickupCollection);
/**
@@ -51,10 +51,10 @@
PickupCollection::PickupCollection(BaseObject* creator) : BaseObject(creator)
{
RegisterObject(PickupCollection);
-
+
this->pickupCollectionIdentifier_ = new PickupCollectionIdentifier(this);
}
-
+
/**
@brief
Destructor. Iterates through all Pickupables this PickupCollection consists of and destroys them if they haven't been already.
@@ -68,7 +68,7 @@
(*it).get()->destroy();
}
}
-
+
/**
@brief
Creates an instance of this Class through XML.
@@ -76,12 +76,12 @@
void PickupCollection::XMLPort(Element& xmlelement, XMLPort::Mode mode)
{
SUPER(PickupCollection, XMLPort, xmlelement, mode);
-
+
XMLPortObject(PickupCollection, Pickupable, "pickupables", addPickupable, getPickupable, xmlelement, mode);
-
+
this->initializeIdentifier();
}
-
+
/**
@brief
Initializes the PickupIdentifier for this pickup.
@@ -93,7 +93,7 @@
this->pickupCollectionIdentifier_->addPickup((*it).get()->getPickupIdentifier());
}
}
-
+
/**
@brief
Is called when the pickup has transited from used to unused or the other way around.
@@ -102,14 +102,14 @@
void PickupCollection::changedUsed(void)
{
SUPER(PickupCollection, changedUsed);
-
+
//! Change used for all Pickupables this PickupCollection consists of.
for(std::vector<WeakPtr<Pickupable> >::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
{
(*it).get()->setUsed(this->isUsed());
}
}
-
+
/**
@brief
Is called when the pickup has changed its PickupCarrier.
@@ -118,14 +118,14 @@
void PickupCollection::changedCarrier(void)
{
SUPER(PickupCollection, changedCarrier);
-
+
//! Change the PickupCarrier for all Pickupables this PickupCollection consists of.
for(std::vector<WeakPtr<Pickupable> >::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
{
(*it).get()->setCarrier(this->getCarrier()->getTarget(*it), true);
}
}
-
+
/**
@brief
Is called when the pickup has transited from picked up to dropped or the other way around.
@@ -134,14 +134,14 @@
void PickupCollection::changedPickedUp()
{
SUPER(PickupCollection, changedPickedUp);
-
+
//! Change the pickedUp status for all Pickupables this PickupCollection consists of.
for(std::vector<WeakPtr<Pickupable> >::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
{
(*it).get()->setPickedUp(this->isPickedUp());
}
}
-
+
/**
@brief
Creates a duplicate of the input OrxonoxClass.
@@ -153,9 +153,9 @@
{
if(item == NULL)
item = new PickupCollection(this);
-
+
SUPER(PickupCollection, clone, item);
-
+
PickupCollection* pickup = dynamic_cast<PickupCollection*>(item);
//! Clone all Pickupables this PickupCollection consist of.
for(std::vector<WeakPtr<Pickupable> >::iterator it = this->pickups_.begin(); it != this->pickups_.end(); it++)
@@ -166,7 +166,7 @@
pickup->initializeIdentifier();
}
-
+
/**
@brief
Get whether a given class, represented by the input Identifier, is a target of this PickupCollection.
@@ -182,10 +182,10 @@
if(!carrier->isTarget((*it).get()))
return false;
}
-
+
return true;
}
-
+
/**
@brief
Get the PickupIdentifier of this PickupCollection.
@@ -197,7 +197,7 @@
{
return this->pickupCollectionIdentifier_;
}
-
+
/**
@brief
Add the input Pickupable to list of Pickupables combined by this PickupCollection.
@@ -210,12 +210,12 @@
{
if(pickup == NULL)
return false;
-
+
WeakPtr<Pickupable> ptr = pickup; //!< Create a weak pointer to be able to test in the constructor if the Pointer is still valid.
this->pickups_.push_back(ptr);
return true;
}
-
+
/**
@brief
Get the Pickupable at the given index.
@@ -228,7 +228,7 @@
{
return this->pickups_[index].get();
}
-
+
/**
@brief
Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
@@ -244,5 +244,5 @@
new DroppedPickup(this, this, this->getCarrier());
return true;
}
-
+
}
\ No newline at end of file
Modified: code/branches/presentation3/src/modules/pickup/PickupCollection.h
===================================================================
--- code/branches/presentation3/src/modules/pickup/PickupCollection.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/pickup/PickupCollection.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -52,40 +52,40 @@
*/
class _PickupExport PickupCollection : public Pickupable, public BaseObject
{
-
+
public:
-
+
PickupCollection(BaseObject* creator); //!< Default Constructor.
virtual ~PickupCollection(); //!< Destructor.
-
+
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Creates an instance of this Class through XML.
virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
virtual void changedCarrier(void); //!< Is called when the pickup has changed its PickupCarrier.
virtual void changedPickedUp(void); //!< Is called when the pickup has transited from picked up to dropped or the other way around.
-
+
virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
-
+
virtual bool isTarget(PickupCarrier* carrier) const; //!< Get whether a given class, represented by the input Identifier, is a target of this PickupCollection.
-
+
virtual const PickupIdentifier* getPickupIdentifier(void); //!< Get the PickupIdentifier of this PickupCollection.
-
+
bool addPickupable(Pickupable* pickup); //!< Add the input Pickupable to list of Pickupables combined by this PickupCollection.
const Pickupable* getPickupable(unsigned int index); //!< Get the Pickupable at the given index.
-
+
protected:
void initializeIdentifier(void); //!< Initializes the PickupIdentifier for this pickup.
-
+
virtual bool createSpawner(void); //!< Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
-
+
PickupCollectionIdentifier* pickupCollectionIdentifier_; //!< The PickupCollectionIdentifier of this PickupCollection. Is used to distinguish different PickupCollections amongst themselves.
-
+
private:
-
+
std::vector<WeakPtr<Pickupable> > pickups_; //!< The list of the pointers of all the Pickupables this PickupCollection consists of. They are weak pointers to facilitate testing, whether the pointers are still valid.
-
+
};
-
+
}
#endif /* _PickupCollection_H__ */
\ No newline at end of file
Modified: code/branches/presentation3/src/modules/pickup/PickupCollectionIdentifier.cc
===================================================================
--- code/branches/presentation3/src/modules/pickup/PickupCollectionIdentifier.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/pickup/PickupCollectionIdentifier.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -37,7 +37,7 @@
namespace orxonox
{
-
+
/**
@brief
Constructor. Registers the object.
@@ -46,14 +46,14 @@
{
RegisterObject(PickupCollectionIdentifier);
}
-
+
/**
@brief
Destructor.
*/
PickupCollectionIdentifier::~PickupCollectionIdentifier()
{
-
+
}
/**
@@ -69,32 +69,32 @@
//! Slight un-niceity to cast the PickupIdentifier to a PickupCollectionIdentifier.
PickupIdentifier* temp = const_cast<PickupIdentifier*>(identifier);
const PickupCollectionIdentifier* collectionIdentifier = dynamic_cast<PickupCollectionIdentifier*>(temp);
-
+
//! If the input PickupIdentifier 'identifier' is no PickupCollectionIdentifier then just the two PickupIdentifiers are compared.
if(collectionIdentifier == NULL)
{
return this->PickupIdentifier::compare(identifier);
}
-
+
//! If the number of Pickupables each of the two PickupCollectionIdentifiers contain differ, the one with less is considered smaller.
if(this->identifiers_.size() != collectionIdentifier->identifiers_.size())
return this->identifiers_.size()-collectionIdentifier->identifiers_.size();
-
+
//! Compare the Pickupables of the two PickupCollectionIdentifiers one after the other. the one with the first 'smaller' one is considered smaller.
std::set<const PickupIdentifier*, PickupIdentifierCompare>::const_iterator it2 = collectionIdentifier->identifiers_.begin();
for(std::set<const PickupIdentifier*, PickupIdentifierCompare>::const_iterator it = this->identifiers_.begin(); it != this->identifiers_.end(); it++)
{
-
+
if((*it)->compare(*it2) < 0)
return -1;
if((*it2)->compare(*it) < 0)
return 1;
}
-
+
//! Means they are equal.
return 0;
}
-
+
/**
@brief
Add a Pickupable to the PickupCollectionIdentifier.
@@ -105,6 +105,6 @@
{
this->identifiers_.insert(identifier);
}
-
+
}
Modified: code/branches/presentation3/src/modules/pickup/PickupCollectionIdentifier.h
===================================================================
--- code/branches/presentation3/src/modules/pickup/PickupCollectionIdentifier.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/pickup/PickupCollectionIdentifier.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -53,20 +53,20 @@
*/
class _PickupExport PickupCollectionIdentifier : public PickupIdentifier
{
-
+
public:
PickupCollectionIdentifier(Pickupable* pickup); //!< Constructor.
~PickupCollectionIdentifier(); //!< Destructor.
-
+
virtual int compare(const PickupIdentifier* identifier) const; //!< Compares a PickupCollectionIdentifier with a PickupIdentifier.
-
+
void addPickup(const PickupIdentifier* identifier); //!< Add a Pickupable to the PickupCollectionIdentifier.
-
+
private:
std::set<const PickupIdentifier*, PickupIdentifierCompare> identifiers_; //!< The set of PickupIdentifiers of the Pickupables the PickupCollection with this PickupCollectionIdentifier consists of, ordered by the rule set by PickupIdentifierCompare.
-
+
};
-
+
}
#endif // _PickupCollectionIdentifier_H_
Modified: code/branches/presentation3/src/modules/pickup/PickupManager.cc
===================================================================
--- code/branches/presentation3/src/modules/pickup/PickupManager.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/pickup/PickupManager.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -50,11 +50,11 @@
{
// Register tolua_open function when loading the library
DeclareToluaInterface(Pickup);
-
+
ManageScopedSingleton(PickupManager, ScopeID::Root, false);
-
+
/*static*/ const std::string PickupManager::guiName_s = "PickupInventory";
-
+
/**
@brief
Constructor. Registers the PickupManager and creates the default PickupRepresentation.
@@ -68,10 +68,10 @@
GUIManager::getInstance().loadGUI(PickupManager::guiName_s);
}
this->defaultRepresentation_ = new PickupRepresentation();
-
+
COUT(3) << "PickupManager created." << std::endl;
}
-
+
/**
@brief
Destructor.
@@ -81,12 +81,12 @@
{
if(this->defaultRepresentation_ != NULL)
this->defaultRepresentation_->destroy();
-
+
this->representations_.clear();
-
+
COUT(3) << "PickupManager destroyed." << std::endl;
}
-
+
/**
@brief
Registers a PickupRepresentation together with the PickupIdentifier of the Pickupable the PickupRepresentation represents.
@@ -99,16 +99,16 @@
Returns true if successful and false if not.
*/
bool PickupManager::registerRepresentation(const PickupIdentifier* identifier, PickupRepresentation* representation)
- {
+ {
if(identifier == NULL || representation == NULL || this->representations_.find(identifier) != this->representations_.end()) //!< If the Pickupable already has a Representation registered.
return false;
-
+
this->representations_[identifier] = representation;
-
+
COUT(4) << "PickupRepresentation " << representation << " registered with the PickupManager." << std::endl;
return true;
}
-
+
/**
@brief
Unegisters a PickupRepresentation together with the PickupIdentifier of the Pickupable the PickupRepresentation represents.
@@ -120,20 +120,20 @@
Returns true if successful and false if not.
*/
bool PickupManager::unregisterRepresentation(const PickupIdentifier* identifier, PickupRepresentation* representation)
- {
+ {
if(identifier == NULL || representation == NULL)
return false;
-
+
std::map<const PickupIdentifier*, PickupRepresentation*, PickupIdentifierCompare>::iterator it = this->representations_.find(identifier);
if(it == this->representations_.end()) //!< If the Pickupable is not registered in the first place.
return false;
-
+
this->representations_.erase(it);
-
+
COUT(4) << "PickupRepresentation " << representation << " unregistered with the PickupManager." << std::endl;
return true;
}
-
+
/**
@brief
Get the PickupRepresentation representing the Pickupable with the input PickupIdentifier.
@@ -150,14 +150,14 @@
COUT(4) << "PickupManager::getRepresentation() returned default representation." << std::endl;
return this->defaultRepresentation_;
}
-
+
return it->second;
}
int PickupManager::getNumPickups(void)
{
this->pickupsList_.clear();
-
+
PlayerInfo* player = GUIManager::getInstance().getPlayer(PickupManager::guiName_s);
PickupCarrier* carrier = NULL;
if (player != NULL)
@@ -220,7 +220,7 @@
std::map<Pickupable*, WeakPtr<Pickupable> >::iterator it = this->pickupsList_.find(pickup);
if(pickup == NULL || it == this->pickupsList_.end() || it->second.get() == NULL)
return;
-
+
if(!pickup->isPickedUp())
return;
@@ -228,5 +228,5 @@
if(pickup != NULL && carrier != NULL)
pickup->setUsed(use);
}
-
+
}
Modified: code/branches/presentation3/src/modules/pickup/PickupManager.h
===================================================================
--- code/branches/presentation3/src/modules/pickup/PickupManager.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/pickup/PickupManager.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -59,17 +59,17 @@
: public Singleton<PickupManager>, public OrxonoxClass
{ // tolua_export
friend class Singleton<PickupManager>;
-
+
public:
PickupManager();
virtual ~PickupManager();
-
+
static PickupManager& getInstance() { return Singleton<PickupManager>::getInstance(); } // tolua_export
-
+
bool registerRepresentation(const PickupIdentifier* identifier, PickupRepresentation* representation); //!< Registers a PickupRepresentation together with the PickupIdentifier of the Pickupable the PickupRepresentation represents.
bool unregisterRepresentation(const PickupIdentifier* identifier, PickupRepresentation* representation); //!< Unegisters a PickupRepresentation together with the PickupIdentifier of the Pickupable the PickupRepresentation represents.
PickupRepresentation* getRepresentation(const PickupIdentifier* identifier); //!< Get the PickupRepresentation representing the Pickupable with the input PickupIdentifier.
-
+
// tolua_begin
int getNumPickups(void);
orxonox::Pickupable* popPickup(void) { return (this->pickupsIterator_++)->first; }
@@ -79,11 +79,11 @@
void usePickup(orxonox::Pickupable* pickup, bool use);
bool isValidPickup(orxonox::Pickupable* pickup) { std::map<Pickupable*, WeakPtr<Pickupable> >::iterator it = this->pickupsList_.find(pickup); if(it == this->pickupsList_.end()) return false; return it->second.get() != NULL; }
// tolua_end
-
+
private:
static PickupManager* singletonPtr_s;
static const std::string guiName_s;
-
+
PickupRepresentation* defaultRepresentation_; //!< The default PickupRepresentation.
std::map<const PickupIdentifier*, PickupRepresentation*, PickupIdentifierCompare> representations_; //!< Map linking PickupIdentifiers (representing types if Pickupables) and PickupRepresentations.
@@ -91,9 +91,9 @@
std::map<Pickupable*, WeakPtr<Pickupable> >::iterator pickupsIterator_;
std::vector<PickupCarrier*>* getAllCarriers(PickupCarrier* carrier);
-
+
}; // tolua_export
-
+
} // tolua_export
#endif // _PickupManager_H__
Modified: code/branches/presentation3/src/modules/pickup/PickupPrereqs.h
===================================================================
--- code/branches/presentation3/src/modules/pickup/PickupPrereqs.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/pickup/PickupPrereqs.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -64,7 +64,7 @@
namespace orxonox
{
-
+
class DroppedPickup;
class Pickup;
class PickupCollection;
Modified: code/branches/presentation3/src/modules/pickup/PickupRepresentation.cc
===================================================================
--- code/branches/presentation3/src/modules/pickup/PickupRepresentation.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/pickup/PickupRepresentation.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -40,9 +40,9 @@
namespace orxonox
{
-
+
CreateFactory(PickupRepresentation);
-
+
/**
@brief
Constructor. Registers the object and initializes its member variables.
@@ -51,10 +51,10 @@
PickupRepresentation::PickupRepresentation() : BaseObject(NULL), spawnerRepresentation_(NULL), pickup_(NULL)
{
RegisterObject(PickupRepresentation);
-
+
this->initialize();
}
-
+
/**
@brief
Default Constructor. Registers the object and initializes its member variables.
@@ -62,10 +62,10 @@
PickupRepresentation::PickupRepresentation(BaseObject* creator) : BaseObject(creator), spawnerRepresentation_(NULL), pickup_(NULL)
{
RegisterObject(PickupRepresentation);
-
+
this->initialize();
}
-
+
/**
@brief
Destructor.
@@ -74,11 +74,11 @@
{
if(this->spawnerRepresentation_ != NULL)
this->spawnerRepresentation_->destroy();
-
+
if(this->pickup_ != NULL)
PickupManager::getInstance().unregisterRepresentation(this->pickup_->getPickupIdentifier(), this);
}
-
+
/**
@brief
Initializes the member variables of this PickupRepresentation.
@@ -90,7 +90,7 @@
this->spawnerTemplate_ = "";
this->inventoryRepresentation_ = "Default";
}
-
+
/**
@brief
Method for creating a PickupRepresentation object through XML.
@@ -98,22 +98,22 @@
void PickupRepresentation::XMLPort(Element& xmlelement, XMLPort::Mode mode)
{
SUPER(PickupRepresentation, XMLPort, xmlelement, mode);
-
+
XMLPortParam(PickupRepresentation, "pickupName", setPickupName, getPickupName, xmlelement, mode);
XMLPortParam(PickupRepresentation, "pickupDescription", setPickupDescription, getPickupDescription, xmlelement, mode);
XMLPortParam(PickupRepresentation, "spawnerTemplate", setSpawnerTemplate, getSpawnerTemplate, xmlelement, mode);
XMLPortParam(PickupRepresentation, "inventoryRepresentation", setInventoryRepresentation, getInventoryRepresentation, xmlelement, mode);
XMLPortObject(PickupRepresentation, Pickupable, "pickup", setPickup, getPickup, xmlelement, mode);
XMLPortObject(PickupRepresentation, StaticEntity, "spawner-representation", setSpawnerRepresentation, getSpawnerRepresentationIndex, xmlelement, mode);
-
+
PickupManager::getInstance().registerRepresentation(this->pickup_->getPickupIdentifier(), this); //!< Registers the PickupRepresentation with the PickupManager through the PickupIdentifier of the Pickupable it represents.
-
+
if(this->spawnerRepresentation_ != NULL)
this->spawnerRepresentation_->setVisible(false);
-
+
COUT(4) << "PickupRepresentation created: name: '" << this->name_ << "', description: '" << this->description_ << "', spawnerTemplate: '" << this->spawnerTemplate_ << "'." << std::endl;
}
-
+
/**
@brief
Get a spawnerRepresentation for a specific PickupSpawner.
@@ -135,16 +135,16 @@
}
this->addTemplate(this->spawnerTemplate_);
}
-
+
StaticEntity* representation = this->spawnerRepresentation_;
representation->setVisible(true);
-
+
this->addTemplate(this->spawnerTemplate_);
this->spawnerRepresentation_->setVisible(false);
-
+
return representation;
}
-
+
/**
@brief
Get the default spawnerRepresentation for a specific PickupSpawner.
@@ -170,5 +170,5 @@
representation->attach(sphere);
return representation;
}
-
+
}
Modified: code/branches/presentation3/src/modules/pickup/PickupRepresentation.h
===================================================================
--- code/branches/presentation3/src/modules/pickup/PickupRepresentation.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/pickup/PickupRepresentation.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -55,14 +55,14 @@
class _PickupExport PickupRepresentation // tolua_export
: public BaseObject
{ // tolua_export
-
+
public:
PickupRepresentation(); //!< Constructor
PickupRepresentation(BaseObject* creator); //!< Default constructor.
virtual ~PickupRepresentation(); //!< Destructor.
-
+
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-
+
/**
@brief Set the name of the Pickupable represented by this PickupRepresentation.
@param name The name.
@@ -101,7 +101,7 @@
*/
inline void setPickup(Pickupable* pickup)
{ this->pickup_ = pickup; }
-
+
/**
@brief Get the name of the Pickupable represented by this PickupRepresentation.
@return Returns the name.
@@ -137,23 +137,23 @@
*/
inline const Pickupable* getPickup(unsigned int index)
{ if(index == 0) return this->pickup_; return NULL; }
-
+
StaticEntity* getSpawnerRepresentation(PickupSpawner* spawner); //!< Get a spawnerRepresentation for a specific PickupSpawner.
-
+
private:
void initialize(void); //!< Initializes the member variables of this PickupRepresentation.
StaticEntity* getDefaultSpawnerRepresentation(PickupSpawner* spawner); //!< Get the default spawnerRepresentation for a specific PickupSpawner.
-
+
std::string name_; //!< The name of the Pickupable represented by this PickupRepresentation.
std::string description_; //!< The description of the Pickupable represented by this PickupRepresentation.
std::string spawnerTemplate_; //!< The name of the template of this PickupRepresentation.
StaticEntity* spawnerRepresentation_; //!< The spawnerRepresentation of this PickupRepresentation.
std::string inventoryRepresentation_; //!< The name of an image representing the pickup in the PickupInventory. TODO: Exact format and placement of image?
-
+
Pickupable* pickup_; //!< The Pickupable that is represented by this PickupRepresentation.
-
+
}; // tolua_export
} // tolua_export
-
+
#endif // _PickupRepresentation_H__
Modified: code/branches/presentation3/src/modules/pickup/PickupSpawner.cc
===================================================================
--- code/branches/presentation3/src/modules/pickup/PickupSpawner.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/pickup/PickupSpawner.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -54,7 +54,7 @@
PickupSpawner::PickupSpawner(BaseObject* creator) : StaticEntity(creator), pickup_(NULL)
{
RegisterObject(PickupSpawner);
-
+
this->initialize();
}
@@ -75,15 +75,15 @@
PickupSpawner::PickupSpawner(BaseObject* creator, Pickupable* pickup, float triggerDistance, float respawnTime, int maxSpawnedItems) : StaticEntity(creator), pickup_(NULL)
{
RegisterObject(PickupSpawner);
-
+
this->initialize();
-
+
this->pickup_ = pickup;
this->triggerDistance_ = triggerDistance;
this->respawnTime_ = respawnTime;
this->setMaxSpawnedItems(maxSpawnedItems);
-
+
if(this->pickup_ == NULL)
{
COUT(2) << "A PickupSpawner was created without a valid Pickupable. This won't work." << std::endl;
@@ -131,11 +131,11 @@
SUPER(PickupSpawner, XMLPort, xmlelement, mode);
XMLPortObject(PickupSpawner, Pickupable, "pickup", setPickupable, getPickupable, xmlelement, mode);
-
+
XMLPortParam(PickupSpawner, "triggerDistance", setTriggerDistance, getTriggerDistance, xmlelement, mode);
XMLPortParam(PickupSpawner, "respawnTime", setRespawnTime, getRespawnTime, xmlelement, mode);
XMLPortParam(PickupSpawner, "maxSpawnedItems", setMaxSpawnedItems, getMaxSpawnedItems, xmlelement, mode);
-
+
if(this->pickup_ == NULL)
{
COUT(2) << "A PickupSpawner was created without a valid Pickupable. This won't work." << std::endl;
@@ -149,7 +149,7 @@
this->setActive(true);
}
}
-
+
/**
@brief
Invoked when the activity has changed. Sets visibility of attached objects.
@@ -160,7 +160,7 @@
this->setVisible(this->isActive());
}
-
+
/**
@brief
Tick, checks if any Pawn is close enough to trigger.
@@ -171,12 +171,12 @@
void PickupSpawner::tick(float dt)
{
SUPER(PickupSpawner, tick, dt);
-
+
//! If the PickupSpawner is active.
if (this->isActive())
{
SmartPtr<PickupSpawner> temp = this; // create a smart pointer to keep the PickupSpawner alive until we iterated through all Pawns (in case a Pawn takes the last pickup)
-
+
//! Iterate trough all Pawns.
for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it != ObjectList<Pawn>::end(); ++it)
{
@@ -190,7 +190,7 @@
}
}
}
-
+
/**
@brief
Sets the maximum number of spawned items.
@@ -202,7 +202,7 @@
this->maxSpawnedItems_ = items;
this->spawnsRemaining_ = items;
}
-
+
/**
@brief
Decrements the number of remaining spawns.
@@ -229,7 +229,7 @@
this->destroy();
}
}
-
+
/**
@brief
Starts the respawn timer.
@@ -238,7 +238,7 @@
{
this->respawnTimer_.setTimer(this->respawnTime_, false, createExecutor(createFunctor(&PickupSpawner::respawnTimerCallback, this)));
}
-
+
/**
@brief
Sets a Pickupable for the PickupSpawner to spawn.
@@ -257,10 +257,10 @@
COUT(1) << "In PickupSpawner (&" << this << "): Argument of setPickupable is NULL." << std::endl;
return;
}
-
+
this->pickup_ = pickup;
}
-
+
/**
@brief
Get the Pickupable that is spawned by this PickupSpawner.
@@ -284,23 +284,23 @@
if (this->isActive()) //!< Checks whether PickupSpawner is active.
{
COUT(4) << "PickupSpawner (&" << this << ") triggered and active." << std::endl;
-
+
PickupCarrier* carrier = dynamic_cast<PickupCarrier*>(pawn);
if(carrier == NULL)
{
COUT(1) << "This is bad. Pawn isn't PickupCarrier." << std::endl;
return;
}
-
+
if(!carrier->isTarget(this->pickup_))
{
COUT(4) << "PickupSpawner (&" << this << ") triggered but Pawn wasn't a target of the Pickupable." << std::endl;
return;
}
-
+
PickupCarrier* target = carrier->getTarget(this->pickup_);
Pickupable* pickup = this->getPickup();
-
+
if(target != NULL && pickup != NULL)
{
if(target->pickup(pickup))
@@ -316,7 +316,7 @@
{
if(target == NULL)
COUT(1) << "PickupSpawner (&" << this << "): Pickupable has no target." << std::endl;
-
+
if(pickup == NULL)
{
COUT(1) << "PickupSpawner (&" << this << "): getPickup produced an error, no Pickupable created." << std::endl;
@@ -334,7 +334,7 @@
Creates a new Pickupable.
@return
The Pickupable created.
- */
+ */
Pickupable* PickupSpawner::getPickup(void)
{
if(this->spawnsRemaining_ == 0)
@@ -342,7 +342,7 @@
COUT(1) << "Massive Error: PickupSpawner still alive until having spawned last item." << std::endl;
return NULL;
}
-
+
Pickupable* pickup = this->pickup_->clone();
return pickup;
}
Modified: code/branches/presentation3/src/modules/pickup/PickupSpawner.h
===================================================================
--- code/branches/presentation3/src/modules/pickup/PickupSpawner.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/pickup/PickupSpawner.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -100,19 +100,19 @@
protected:
void decrementSpawnsRemaining(void); //!< Decrements the number of remaining spawns.
-
+
void startRespawnTimer(void);
-
+
virtual Pickupable* getPickup(void); //!< Creates a new Pickupable.
-
+
void setPickupable(Pickupable* pickup); //!< Sets a Pickupable for the PickupSpawner to spawn.
const Pickupable* getPickupable(void); //!< Get the Pickupable that is spawned by this PickupSpawner.
-
+
Pickupable* pickup_; //!< The pickup to be spawned.
private:
void initialize(void);
-
+
void trigger(Pawn* pawn); //!< Method called when a Pawn is close enough.
void respawnTimerCallback(); //!< Method called when the timer runs out.
Modified: code/branches/presentation3/src/modules/pickup/items/DronePickup.cc
===================================================================
--- code/branches/presentation3/src/modules/pickup/items/DronePickup.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/pickup/items/DronePickup.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -48,7 +48,7 @@
{
CreateFactory(DronePickup);
-
+
/**
@brief
Constructor. Registers the object and initializes the member variables.
@@ -56,21 +56,21 @@
DronePickup::DronePickup(BaseObject* creator) : Pickup(creator)
{
RegisterObject(DronePickup);
-
+
this->initialize();
}
-
+
/**
@brief
Destructor.
*/
DronePickup::~DronePickup()
{
-
+
}
-
+
/**
- @brief
+ @brief
Initializes the member variables.
*/
void DronePickup::initialize(void)
@@ -79,7 +79,7 @@
this->setDurationTypeDirect(pickupDurationType::once);
this->droneTemplate_ = "";
}
-
+
/**
@brief
Initializes the PickupIdentifier of this pickup.
@@ -90,7 +90,7 @@
std::string type = "droneTemplate";
this->pickupIdentifier_->addParameter(type, val);
}
-
+
/**
@brief
Method for creating a DronePickup object through XML.
@@ -99,14 +99,14 @@
{
SUPER(DronePickup, XMLPort, xmlelement, mode);
XMLPortParam(DronePickup, "droneTemplate", setDroneTemplate, getDroneTemplate, xmlelement, mode);
-
+
this->initializeIdentifier();
}
-
+
void DronePickup::setDroneTemplate(std::string templatename){
droneTemplate_ = templatename;
- }
-
+ }
+
const std::string& DronePickup::getDroneTemplate() const
{
return droneTemplate_;
@@ -119,11 +119,11 @@
void DronePickup::changedUsed(void)
{
SUPER(DronePickup, changedUsed);
-
+
//! If the pickup is not picked up nothing must be done.
if(!this->isPickedUp())
return;
-
+
//! If the pickup has transited to used.
if(this->isUsed())
{
@@ -131,7 +131,7 @@
Pawn* pawn = this->carrierToPawnHelper();
if(pawn == NULL) //!< If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
this->destroy();
-
+
//Attach to pawn
Drone* drone = new Drone(pawn->getCreator()); // this is neccessary because the projectiles fired need a valid creator for the particlespawner (when colliding against something)
drone->addTemplate(this->getDroneTemplate());
@@ -142,10 +142,10 @@
{
droneController->setOwner(pawn);
}
-
+
Vector3 spawnPosition = pawn->getWorldPosition() + Vector3(30,0,-30);
drone->setPosition(spawnPosition);
-
+
//! The pickup has been used up.
this->setUsed(false);
}
@@ -158,7 +158,7 @@
}
}
}
-
+
/**
@brief
Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
@@ -169,15 +169,15 @@
{
PickupCarrier* carrier = this->getCarrier();
Pawn* pawn = dynamic_cast<Pawn*>(carrier);
-
+
if(pawn == NULL)
{
COUT(1) << "Invalid PickupCarrier in DronePickup." << std::endl;
}
-
+
return pawn;
}
-
+
/**
@brief
Creates a duplicate of the input OrxonoxClass.
@@ -188,12 +188,12 @@
{
if(item == NULL)
item = new DronePickup(this);
-
+
SUPER(DronePickup, clone, item);
-
+
DronePickup* pickup = dynamic_cast<DronePickup*>(item);
pickup->setDroneTemplate(this->getDroneTemplate());
-
+
pickup->initializeIdentifier();
}
}
Modified: code/branches/presentation3/src/modules/pickup/items/DronePickup.h
===================================================================
--- code/branches/presentation3/src/modules/pickup/items/DronePickup.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/pickup/items/DronePickup.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -46,33 +46,33 @@
#include "tools/interfaces/Tickable.h"
namespace orxonox {
-
+
class _PickupExport DronePickup : public Pickup, public Tickable
{
public:
-
+
DronePickup(BaseObject* creator); //!< Constructor.
virtual ~DronePickup(); //!< Destructor.
-
+
virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode); //!< Method for creating a DronePickup object through XML.
-
+
virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
void setDroneTemplate(std::string templatename);
- const std::string& getDroneTemplate() const;
-
+ const std::string& getDroneTemplate() const;
+
protected:
void initializeIdentifier(void); //!< Initializes the PickupIdentifier of this pickup.
-
+
private:
void initialize(void); //!< Initializes the member variables.
std::string droneTemplate_;
Pawn* carrierToPawnHelper(void); //!< Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
-
-
+
+
};
}
Modified: code/branches/presentation3/src/modules/pickup/items/HealthPickup.cc
===================================================================
--- code/branches/presentation3/src/modules/pickup/items/HealthPickup.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/pickup/items/HealthPickup.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -44,13 +44,13 @@
namespace orxonox
{
-
+
/*static*/ const std::string HealthPickup::healthTypeLimited_s = "limited";
/*static*/ const std::string HealthPickup::healthTypeTemporary_s = "temporary";
/*static*/ const std::string HealthPickup::healthTypePermanent_s = "permanent";
-
+
CreateFactory(HealthPickup);
-
+
/**
@brief
Constructor. Registers the object and initializes the member variables.
@@ -58,34 +58,34 @@
HealthPickup::HealthPickup(BaseObject* creator) : Pickup(creator)
{
RegisterObject(HealthPickup);
-
+
this->initialize();
}
-
+
/**
@brief
Destructor.
*/
HealthPickup::~HealthPickup()
{
-
+
}
-
+
/**
- @brief
+ @brief
Initializes the member variables.
*/
void HealthPickup::initialize(void)
- {
+ {
this->health_ = 0;
this->healthRate_ = 0;
this->healthType_ = pickupHealthType::limited;
this->maxHealthSave_ = 0;
this->maxHealthOverwrite_ = 0;
-
+
this->addTarget(ClassIdentifier<Pawn>::getIdentifier());
}
-
+
/**
@brief
Initializes the PickupIdentifier of this pickup.
@@ -97,18 +97,18 @@
std::string type1 = "health";
std::string val1 = stream.str();
this->pickupIdentifier_->addParameter(type1, val1);
-
+
std::string val2 = this->getHealthType();
std::string type2 = "healthType";
this->pickupIdentifier_->addParameter(type2, val2);
-
+
stream.clear();
stream << this->getHealthRate();
std::string val3 = stream.str();
std::string type3 = "healthRate";
this->pickupIdentifier_->addParameter(type3, val3);
}
-
+
/**
@brief
Method for creating a HealthPickup object through XML.
@@ -116,17 +116,17 @@
void HealthPickup::XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode)
{
SUPER(HealthPickup, XMLPort, xmlelement, mode);
-
+
XMLPortParam(HealthPickup, "health", setHealth, getHealth, xmlelement, mode);
XMLPortParam(HealthPickup, "healthRate", setHealthRate, getHealthRate, xmlelement, mode);
XMLPortParam(HealthPickup, "healthType", setHealthType, getHealthType, xmlelement, mode);
-
+
if(!this->isContinuous())
this->healthRate_ = 0.0;
-
+
this->initializeIdentifier();
}
-
+
/**
@brief
Is called every tick.
@@ -137,13 +137,13 @@
void HealthPickup::tick(float dt)
{
SUPER(HealthPickup, tick, dt);
-
+
if(this->isContinuous() && this->isUsed())
{
Pawn* pawn = this->carrierToPawnHelper();
if(pawn == NULL) //!< If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
this->destroy();
-
+
//! Calculate the health that is added this tick.
float health = dt*this->getHealthRate();
if(health > this->getHealth())
@@ -151,7 +151,7 @@
//! Calculate the health the Pawn will have once the health is added.
float fullHealth = pawn->getHealth() + health;
this->setHealth(this->getHealth()-health);
-
+
switch(this->getHealthTypeDirect())
{
case pickupHealthType::permanent:
@@ -172,7 +172,7 @@
default:
COUT(1) << "Invalid healthType in HealthPickup." << std::endl;
}
-
+
//! If all health has been transfered.
if(this->getHealth() == 0)
{
@@ -180,7 +180,7 @@
}
}
}
-
+
/**
@brief
Is called when the pickup has transited from used to unused or the other way around.
@@ -192,7 +192,7 @@
//! If the pickup is not picked up nothing must be done.
if(!this->isPickedUp())
return;
-
+
//! If the pickup has transited to used.
if(this->isUsed())
{
@@ -201,7 +201,7 @@
Pawn* pawn = this->carrierToPawnHelper();
if(pawn == NULL) //!< If the PickupCarrier is no Pawn, then this pickup is useless and therefore is destroyed.
this->destroy();
-
+
float health = 0;
switch(this->getHealthTypeDirect())
{
@@ -225,7 +225,7 @@
default:
COUT(1) << "Invalid healthType in HealthPickup." << std::endl;
}
-
+
//! The pickup has been used up.
this->setUsed(false);
}
@@ -236,14 +236,14 @@
{
PickupCarrier* carrier = this->getCarrier();
Pawn* pawn = dynamic_cast<Pawn*>(carrier);
-
+
if(pawn == NULL)
{
COUT(1) << "Something went horribly wrong in Health Pickup. PickupCarrier is no Pawn." << std::endl;
this->destroy();
return;
}
-
+
if(pawn->getMaxHealth() == this->maxHealthOverwrite_)
{
pawn->setMaxHealth(this->maxHealthSave_);
@@ -251,7 +251,7 @@
this->maxHealthSave_ = 0;
}
}
-
+
//! If either the pickup can only be used once or it is continuous and used up, it is destroyed upon setting it to unused.
if(this->isOnce() || (this->isContinuous() && this->getHealth() == 0))
{
@@ -259,7 +259,7 @@
}
}
}
-
+
/**
@brief
Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
@@ -270,15 +270,15 @@
{
PickupCarrier* carrier = this->getCarrier();
Pawn* pawn = dynamic_cast<Pawn*>(carrier);
-
+
if(pawn == NULL)
{
COUT(1) << "Invalid PickupCarrier in HealthPickup." << std::endl;
}
-
+
return pawn;
}
-
+
/**
@brief
Creates a duplicate of the input OrxonoxClass.
@@ -296,10 +296,10 @@
pickup->setHealth(this->getHealth());
pickup->setHealthRate(this->getHealthRate());
pickup->setHealthTypeDirect(this->getHealthTypeDirect());
-
+
pickup->initializeIdentifier();
}
-
+
/**
@brief
Get the health type of this pickup.
@@ -321,7 +321,7 @@
return BLANKSTRING;
}
}
-
+
/**
@brief
Sets the health.
@@ -340,7 +340,7 @@
this->health_ = 0.0;
}
}
-
+
/**
@brief
Set the rate at which health is transferred if the pickup is continuous.
@@ -355,10 +355,10 @@
}
else
{
- COUT(1) << "Invalid healthSpeed in HealthPickup." << std::endl;
+ COUT(1) << "Invalid healthSpeed in HealthPickup." << std::endl;
}
}
-
+
/**
@brief
Set the type of the HealthPickup.
Modified: code/branches/presentation3/src/modules/pickup/items/HealthPickup.h
===================================================================
--- code/branches/presentation3/src/modules/pickup/items/HealthPickup.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/pickup/items/HealthPickup.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -44,7 +44,7 @@
#include "tools/interfaces/Tickable.h"
namespace orxonox {
-
+
//! Enum for the type of the HealthPickup
namespace pickupHealthType
{
@@ -55,7 +55,7 @@
permanent
};
}
-
+
/**
@brief
A pickup that can do (dependent upon the parameters) lots of different things to the health of a Pawn.
@@ -70,16 +70,16 @@
class _PickupExport HealthPickup : public Pickup, public Tickable
{
public:
-
+
HealthPickup(BaseObject* creator); //!< Constructor.
virtual ~HealthPickup(); //!< Destructor.
-
+
virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode); //!< Method for creating a HealthPickup object through XML.
virtual void tick(float dt); //!< Is called every tick.
-
+
virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
-
+
/**
@brief Get the health that is transfered to the Pawn upon usage of this pickup.
@return Returns the health.
@@ -92,21 +92,21 @@
*/
inline float getHealthRate(void)
{ return this->healthRate_; }
-
+
/**
@brief Get the type of HealthPickup, this pickup is.
- @return Returns the health type as an enum.
+ @return Returns the health type as an enum.
*/
inline pickupHealthType::Value getHealthTypeDirect(void)
{ return this->healthType_; }
const std::string& getHealthType(void); //!< Get the health type of this pickup.
-
+
protected:
void initializeIdentifier(void); //!< Initializes the PickupIdentifier of this pickup.
void setHealth(float health); //!< Sets the health.
void setHealthRate(float speed); //!< Set the rate at which health is transferred if the pickup is continuous.
-
+
/**
@brief Set the health type of this pickup.
@param type The type of this pickup as an enum.
@@ -114,22 +114,22 @@
inline void setHealthTypeDirect(pickupHealthType::Value type)
{ this->healthType_ = type; }
void setHealthType(std::string type); //!< Set the type of the HealthPickup.
-
+
private:
void initialize(void); //!< Initializes the member variables.
Pawn* carrierToPawnHelper(void); //!< Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
-
+
float health_; //!< The health that is transferred to the Pawn.
float healthRate_; //!< The rate at which the health is transferred.
float maxHealthSave_; //!< Helper to remember what the actual maxHealth of the Pawn was before we changed it.
float maxHealthOverwrite_; //!< Helper to remember with which value we overwrote the maxHealh, to detect if someone else changed it as well.
pickupHealthType::Value healthType_; //!< The type of the HealthPickup.
-
+
//! Strings for the health types.
static const std::string healthTypeLimited_s;
static const std::string healthTypeTemporary_s;
static const std::string healthTypePermanent_s;
-
+
};
}
Modified: code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.h
===================================================================
--- code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/pickup/items/InvisiblePickup.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -43,7 +43,7 @@
#include "pickup/Pickup.h"
namespace orxonox {
-
+
/**
@brief
A pickup that makes the Pawn invisible.
@@ -56,13 +56,13 @@
class _PickupExport InvisiblePickup : public Pickup
{
public:
-
+
InvisiblePickup(BaseObject* creator); //!< Constructor.
virtual ~InvisiblePickup(); //!< Destructor.
virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode); //!< Method for creating a HealthPickup object through XML.
virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
-
+
/**
@brief Checks whether the Pawn is invisible.
@return Returns if the Pawn is invisible.
@@ -71,13 +71,13 @@
{ return this->invisible_; }
inline float getDuration()
{ return this->duration_; }
-
+
protected:
bool setInvisible(bool invisibility); //!< Set the Pawn to be invisible or visible again.
void setDuration(float duration);
void initializeIdentifier(void);
virtual void pickupTimerCallback(void); //!< Function that gets called when the timer ends.
-
+
private:
void initialize(void); //!< Initializes the member variables.
Pawn* carrierToPawnHelper(void); //!< Helper to transform the PickupCarrier to a Pawn, and throw an error message if the conversion fails.
Modified: code/branches/presentation3/src/modules/pickup/items/MetaPickup.cc
===================================================================
--- code/branches/presentation3/src/modules/pickup/items/MetaPickup.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/pickup/items/MetaPickup.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -39,14 +39,14 @@
#include "MetaPickup.h"
namespace orxonox {
-
+
CreateFactory(MetaPickup);
-
+
//! Setting the static variables to their values.
/*static*/ const std::string MetaPickup::metaTypeNone_s = "none";
/*static*/ const std::string MetaPickup::metaTypeUse_s = "use";
/*static*/ const std::string MetaPickup::metaTypeDrop_s = "drop";
-
+
/**
@brief
Constructor. Registers and initializes the object.
@@ -54,19 +54,19 @@
MetaPickup::MetaPickup(BaseObject* creator) : Pickup(creator)
{
RegisterObject(MetaPickup);
-
+
this->initialize();
}
-
+
/**
@brief
Destructor.
*/
MetaPickup::~MetaPickup()
{
-
+
}
-
+
/**
@brief
Initializes the object.
@@ -74,12 +74,12 @@
void MetaPickup::initialize(void)
{
this->addTarget(ClassIdentifier<PickupCarrier>::getIdentifier());
-
+
this->setActivationTypeDirect(pickupActivationType::immediate);
this->setDurationTypeDirect(pickupDurationType::once);
this->metaType_ = pickupMetaType::none;
}
-
+
/**
@brief
Helper method to initialize the PickupIdentifier.
@@ -90,7 +90,7 @@
std::string type = "metaType";
this->pickupIdentifier_->addParameter(type, val);
}
-
+
/**
@brief
Method for creating a MetaPickup object through XML.
@@ -98,12 +98,12 @@
void MetaPickup::XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode)
{
SUPER(MetaPickup, XMLPort, xmlelement, mode);
-
+
XMLPortParam(MetaPickup, "metaType", setMetaType, getMetaType, xmlelement, mode);
-
+
this->initializeIdentifier();
}
-
+
/**
@brief
Is called when the pickup has transited from used to unused or the other way around.
@@ -112,7 +112,7 @@
void MetaPickup::changedUsed(void)
{
SUPER(MetaPickup, changedUsed);
-
+
//! If the MetaPickup transited to used.
if(this->isUsed())
{
@@ -143,7 +143,7 @@
this->destroy();
}
}
-
+
/**
@brief
Creates a duplicate of the input OrxonoxClass.
@@ -154,15 +154,15 @@
{
if(item == NULL)
item = new MetaPickup(this);
-
+
SUPER(MetaPickup, clone, item);
-
+
MetaPickup* pickup = dynamic_cast<MetaPickup*>(item);
pickup->setMetaTypeDirect(this->getMetaTypeDirect());
-
+
pickup->initializeIdentifier();
}
-
+
/**
@brief
Get the meta type of this MetaPickup.
@@ -183,7 +183,7 @@
return BLANKSTRING;
}
}
-
+
/**
@brief
Set the meta type of this MetaPickup.
@@ -205,5 +205,5 @@
this->setMetaTypeDirect(pickupMetaType::drop);
}
}
-
+
}
Modified: code/branches/presentation3/src/modules/pickup/items/MetaPickup.h
===================================================================
--- code/branches/presentation3/src/modules/pickup/items/MetaPickup.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/pickup/items/MetaPickup.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -50,7 +50,7 @@
drop
};
}
-
+
/**
@brief
The MetaPickup is a pickup that can, depending on the parameters, either drop all pickups of the PickupCarrier that picks it up, or use all the unused pickups of the PickupCarrier, that picks it up. The parameter to set for this is the metaType and it can be used with the values 'none', 'drop' and 'use'.
@@ -59,16 +59,16 @@
*/
class _PickupExport MetaPickup : public Pickup
{
-
+
public:
MetaPickup(BaseObject* creator); //!< Constructor. Registers and initializes the object.
virtual ~MetaPickup(); //!< Destructor.
-
+
virtual void XMLPort(Element& xmlelement, orxonox::XMLPort::Mode mode); //!< Method for creating a MetaPickup object through XML.
-
+
virtual void changedUsed(void); //!< Is called when the pickup has transited from used to unused or the other way around.
virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
-
+
/**
@brief Returns the meta type of the MetaPickup.
@return Returns an enum with the meta type of the MetaPickup.
@@ -76,10 +76,10 @@
inline pickupMetaType::Value getMetaTypeDirect(void)
{ return this->metaType_; }
const std::string& getMetaType(void); //!< Get the meta type of this MetaPickup.
-
+
protected:
void initializeIdentifier(void); //!< Initializes the PickupIdentifier of this pickup.
-
+
/**
@brief Set the meta type of the MetaPickup.
@param type The meta type as an enum.
@@ -87,18 +87,18 @@
inline void setMetaTypeDirect(pickupMetaType::Value type)
{ this->metaType_ = type; }
void setMetaType(const std::string& type); //!< Set the meta type of this MetaPickup.
-
+
private:
void initialize(void); //!< Initializes the member variables.
-
+
pickupMetaType::Value metaType_; //!< The meta type of the MetaPickup, determines which actions are taken.
-
+
//! Static strings for the meta types.
static const std::string metaTypeNone_s;
static const std::string metaTypeUse_s;
static const std::string metaTypeDrop_s;
-
-
+
+
};
}
Modified: code/branches/presentation3/src/modules/pickup/items/ShieldPickup.cc
===================================================================
--- code/branches/presentation3/src/modules/pickup/items/ShieldPickup.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/pickup/items/ShieldPickup.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -78,14 +78,14 @@
{
PickupCarrier* carrier = this->getCarrier();
Pawn* pawn = dynamic_cast<Pawn*>(carrier);
-
+
if(pawn == NULL)
{
COUT(1) << "Invalid PickupCarrier in ShieldPickup." << std::endl;
}
return pawn;
}
-
+
/**
@brief
Initializes the member variables.
@@ -116,7 +116,7 @@
std::string type2 = "ShieldHealth";
std::string val2 = stream.str();
this->pickupIdentifier_->addParameter(type2, val2);
-
+
stream.clear();
stream << this->getShieldAbsorption();
std::string type3 = "ShieldAbsorption";
@@ -268,7 +268,7 @@
}
void ShieldPickup::pickupTimerCallback(void)
- {
+ {
this->setUsed(false);
}
}
Modified: code/branches/presentation3/src/modules/pickup/items/SpeedPickup.cc
===================================================================
--- code/branches/presentation3/src/modules/pickup/items/SpeedPickup.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/pickup/items/SpeedPickup.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -136,7 +136,7 @@
Engine* engine = this->carrierToEngineHelper();
if(engine == NULL) //!< If the PickupCarrier is no Engine, then this pickup is useless and therefore is destroyed.
this->destroy();
-
+
//! If the pickup has transited to used.
if(this->isUsed())
{
@@ -155,7 +155,7 @@
{
engine->setSpeedAdd(0.0f);
engine->setSpeedMultiply(1.0f);
-
+
if(this->isOnce())
{
if(!this->getTimer()->isActive() && this->getTimer()->getRemainingTime() == this->getDuration())
@@ -185,7 +185,7 @@
{
COUT(1) << "Invalid PickupCarrier in SpeedPickup." << std::endl;
}
-
+
return engine;
}
@@ -268,7 +268,7 @@
}
void SpeedPickup::pickupTimerCallback(void)
- {
+ {
this->setUsed(false);
}
}
Modified: code/branches/presentation3/src/modules/pickup/items/SpeedPickup.h
===================================================================
--- code/branches/presentation3/src/modules/pickup/items/SpeedPickup.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/pickup/items/SpeedPickup.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -77,7 +77,7 @@
protected:
void initializeIdentifier(void); //!< Initializes the PickupIdentifier of this pickup.
-
+
virtual void pickupTimerCallback(void); //!< Function that gets called when timer ends.
void setDuration(float duration);
Modified: code/branches/presentation3/src/modules/questsystem/Quest.h
===================================================================
--- code/branches/presentation3/src/modules/questsystem/Quest.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/questsystem/Quest.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -104,7 +104,7 @@
bool start(PlayerInfo* player); //!< Sets a Quest to active.
virtual bool fail(PlayerInfo* player); //!< Fails the Quest.
virtual bool complete(PlayerInfo* player); //!< Completes the Quest.
-
+
bool addListener(QuestListener* listener); //!< Adds a QuestListener to the list of QuestListeners listening to this Quest.
protected:
Modified: code/branches/presentation3/src/modules/questsystem/QuestEffectBeacon.cc
===================================================================
--- code/branches/presentation3/src/modules/questsystem/QuestEffectBeacon.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/questsystem/QuestEffectBeacon.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -111,12 +111,12 @@
PlayerTrigger* pTrigger = orxonox_cast<PlayerTrigger*>(trigger);
MultiTriggerContainer* mTrigger = orxonox_cast<MultiTriggerContainer*>(trigger);
Pawn* pawn = NULL;
-
+
//! If the trigger is neither a Playertrigger nor a MultiTrigger (i.e. a MultitriggerContainer) we can do anything with it.
if(pTrigger == NULL && mTrigger == NULL)
return false;
-
- // If the trigger is a PlayerTrigger.
+
+ // If the trigger is a PlayerTrigger.
if(pTrigger != NULL)
{
if(!pTrigger->isForPlayer()) //!< The PlayerTrigger is not exclusively for Pawns which means we cannot extract one.
@@ -124,7 +124,7 @@
else
pawn = pTrigger->getTriggeringPlayer();
}
-
+
// If the trigger is a MultiTrigger (i.e. a MultiTriggerContainer)
if(mTrigger != NULL)
{
Modified: code/branches/presentation3/src/modules/questsystem/QuestItem.cc
===================================================================
--- code/branches/presentation3/src/modules/questsystem/QuestItem.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/questsystem/QuestItem.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -41,7 +41,7 @@
{
CreateUnloadableFactory(QuestItem);
-
+
/**
@brief
Constructor. Registers and initializes the object.
@@ -49,7 +49,7 @@
QuestItem::QuestItem(BaseObject* creator) : BaseObject(creator)
{
this->registered_ = false;
-
+
RegisterObject(QuestItem);
}
Modified: code/branches/presentation3/src/modules/questsystem/QuestManager.cc
===================================================================
--- code/branches/presentation3/src/modules/questsystem/QuestManager.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/questsystem/QuestManager.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -73,7 +73,7 @@
*/
QuestManager::~QuestManager()
{
-
+
}
/**
@@ -249,7 +249,7 @@
}
return numQuests;
}
-
+
Quest* QuestManager::getParentQuest(PlayerInfo* player, int index)
{
for(std::map<std::string, Quest*>::iterator it = this->questMap_.begin(); it != this->questMap_.end(); it++)
@@ -271,7 +271,7 @@
}
return numQuests;
}
-
+
Quest* QuestManager::getSubQuest(Quest* quest, PlayerInfo* player, int index)
{
std::list<Quest*> quests = quest->getSubQuestList();
@@ -294,7 +294,7 @@
}
return numHints;
}
-
+
QuestHint* QuestManager::getHints(Quest* quest, PlayerInfo* player, int index)
{
std::list<QuestHint*> hints = quest->getHintsList();
Modified: code/branches/presentation3/src/modules/questsystem/QuestNotification.cc
===================================================================
--- code/branches/presentation3/src/modules/questsystem/QuestNotification.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/questsystem/QuestNotification.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -34,7 +34,7 @@
/*static*/ const std::string QuestNotification::SENDER("questsystem");
CreateUnloadableFactory(QuestNotification);
-
+
/**
@brief
Default Constructor. Creates a useless QuestNotification.
Modified: code/branches/presentation3/src/modules/questsystem/notifications/Notification.cc
===================================================================
--- code/branches/presentation3/src/modules/questsystem/notifications/Notification.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/questsystem/notifications/Notification.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -40,7 +40,7 @@
{
CreateUnloadableFactory(Notification);
-
+
/**
@brief
Default constructor. Initializes the object.
@@ -68,7 +68,7 @@
*/
Notification::~Notification()
{
-
+
}
/**
Modified: code/branches/presentation3/src/modules/questsystem/notifications/NotificationManager.cc
===================================================================
--- code/branches/presentation3/src/modules/questsystem/notifications/NotificationManager.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/questsystem/notifications/NotificationManager.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -65,7 +65,7 @@
*/
NotificationManager::~NotificationManager()
{
-
+
}
/**
@@ -226,7 +226,7 @@
int identifier = this->listenerList_.find(listener)->second;
std::multimap<std::time_t, Notification*>* map = this->notificationLists_.find(identifier)->second;
-
+
// Make sure all Notifications are removed.
std::multimap<std::time_t, Notification*>::iterator it = map->begin();
while(it != map->end())
Modified: code/branches/presentation3/src/modules/questsystem/notifications/NotificationQueue.cc
===================================================================
--- code/branches/presentation3/src/modules/questsystem/notifications/NotificationQueue.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/questsystem/notifications/NotificationQueue.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -56,7 +56,7 @@
NotificationQueue::NotificationQueue(BaseObject* creator) : OverlayGroup(creator)
{
this->registered_ = false;
-
+
RegisterObject(NotificationQueue);
this->initialize();
}
@@ -430,7 +430,7 @@
// Unregister the NotificationQueue with the NotificationManager.
NotificationManager::getInstance().unregisterNotification(container->notification, this);
-
+
this->removeElement(container->overlay);
this->containers_.erase(container);
this->overlays_.erase(container->notification);
Modified: code/branches/presentation3/src/modules/weapons/RocketController.cc
===================================================================
--- code/branches/presentation3/src/modules/weapons/RocketController.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/weapons/RocketController.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -27,7 +27,7 @@
*/
#include "RocketController.h"
-#include "projectiles/SimpleRocket.h"
+#include "projectiles/SimpleRocket.h"
#include "util/Math.h"
#include "weapons/projectiles/SimpleRocket.h"
#include "util/Debug.h"
@@ -65,8 +65,8 @@
this->setTargetPosition();
this->moveToTargetPosition();
}
-
-
+
+
}
@@ -101,7 +101,7 @@
float distance = (target - this->rocket_->getWorldPosition()).length();
- if (distance > 1000 && this->rocket_->getVelocity().squaredLength()<160000)
+ if (distance > 1000 && this->rocket_->getVelocity().squaredLength()<160000)
this->rocket_->setAcceleration(this->rocket_->getOrientation()*Vector3(-20,-20,-20));
if (distance <1000) this->rocket_->setAcceleration(0,0,0);
Modified: code/branches/presentation3/src/modules/weapons/RocketController.h
===================================================================
--- code/branches/presentation3/src/modules/weapons/RocketController.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/weapons/RocketController.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -49,7 +49,7 @@
public:
RocketController(BaseObject* creator);
virtual ~RocketController();
-
+
virtual void tick(float dt);
SimpleRocket* getRocket() const
{ return this->rocket_; };
@@ -63,7 +63,7 @@
SimpleRocket* rocket_; //!<The Rocket it controlls
Vector3 targetPosition_;
WeakPtr<PlayerInfo> player_;
-
+
WeakPtr<WorldEntity> target_;
Modified: code/branches/presentation3/src/modules/weapons/projectiles/Rocket.cc
===================================================================
--- code/branches/presentation3/src/modules/weapons/projectiles/Rocket.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/weapons/projectiles/Rocket.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -166,12 +166,12 @@
this->setVelocity( this->getOrientation()*WorldEntity::FRONT*this->getVelocity().length() );
this->localAngularVelocity_ = 0;
}
-
+
if( GameMode::isMaster() )
{
if( this->bDestroy_ )
this->destroy();
-
+
}
}
Modified: code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc
===================================================================
--- code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -70,7 +70,7 @@
this->fire_ = new ParticleEmitter(this);
this->attach(this->fire_);
-
+
this->fire_->setOrientation(this->getOrientation());
this->fire_->setSource("Orxonox/simplerocketfire");
this->enableCollisionCallback();
@@ -89,7 +89,7 @@
}
-
+
/**
* @brief updates state of rocket, disables fire if no fuel
* @param dt tick-length
@@ -106,18 +106,18 @@
this->setVelocity( this->getOrientation()*WorldEntity::FRONT*this->getVelocity().length() );
this->localAngularVelocity_ = 0;
-
+
if (this->fuel_)
{
- if (this->destroyTimer_.getRemainingTime()< (static_cast<float>(this->FUEL_PERCENTAGE)/100) *this->lifetime_ )
+ if (this->destroyTimer_.getRemainingTime()< (static_cast<float>(this->FUEL_PERCENTAGE)/100) *this->lifetime_ )
this->fuel_=false;
} else
this->disableFire();
- if( this->bDestroy_ )
+ if( this->bDestroy_ )
this->destroy();
}
-
+
}
/**
@@ -126,7 +126,7 @@
*/
void SimpleRocket::disableFire()
{
- this->setAcceleration(0,0,0);
+ this->setAcceleration(0,0,0);
this->fire_->detachFromParent();
}
@@ -136,7 +136,7 @@
*/
SimpleRocket::~SimpleRocket()
{
- if (this->isInitialized())
+ if (this->isInitialized())
{
if( GameMode::isMaster() )
{
Modified: code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h
===================================================================
--- code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/weapons/projectiles/SimpleRocket.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -97,14 +97,14 @@
@param value The amount by which the SimpleRocket is to be rotated.
*/
inline void rotatePitch(float value)
- {
+ {
this->rotatePitch(Vector2(value, 0)); }
/**
@brief Rotates the SimpleRocket around the z-axis by the specifed amount.
@param value The amount by which the SimpleRocket is to be rotated.
*/
inline void rotateRoll(float value)
- {
+ {
this->rotateRoll(Vector2(value, 0)); }
void setOwner(Pawn* owner);
@@ -123,7 +123,7 @@
WeakPtr<Pawn> owner_;
Vector3 localAngularVelocity_;
float damage_;
- bool bDestroy_;
+ bool bDestroy_;
bool fuel_; //!< Bool is true while the rocket "has fuel"
Modified: code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc
===================================================================
--- code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/modules/weapons/weaponmodes/SimpleRocketFire.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -53,7 +53,7 @@
this->speed_ = 500;
this->setMunitionName("TargetSeeking Rockets");
- this->setDefaultSoundWithVolume("sounds/Rocket_launch.ogg",0.4);
+ this->setDefaultSoundWithVolume("sounds/Rocket_launch.ogg",0.4);
// The firing sound of the Rocket is played in Rocket.cc (because of OpenAl sound positioning)
}
Modified: code/branches/presentation3/src/orxonox/ChatHistory.cc
===================================================================
--- code/branches/presentation3/src/orxonox/ChatHistory.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/ChatHistory.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -38,8 +38,8 @@
/* constructor */
#ifndef CHATTEST
- //ChatHistory::ChatHistory( BaseObject* creator ) : BaseObject(creator)
- ChatHistory::ChatHistory()
+ //ChatHistory::ChatHistory( BaseObject* creator ) : BaseObject(creator)
+ ChatHistory::ChatHistory()
#else
ChatHistory::ChatHistory()
#endif
@@ -67,13 +67,13 @@
ChatHistory::~ChatHistory()
{
chat_hist_closelog();
-
+
/* clear list */
this->hist_buffer.clear();
}
/* react to incoming chat */
- void ChatHistory::incomingChat(const std::string& message,
+ void ChatHistory::incomingChat(const std::string& message,
unsigned int senderID)
{
/* --> a) look up the actual name of the sender */
@@ -103,7 +103,7 @@
/* add the line to the log */
this->chat_hist_logline( text );
- }
+ }
/* Synchronize logfile onto the hard drive */ /* MARK MARK */
int ChatHistory::syncLog()
@@ -127,7 +127,7 @@
/* log a line to a logfile */
int ChatHistory::chat_hist_logline( const std::string& toadd )
- {
+ {
/* output the line to the file if logging is enabled */
if( this->hist_log_enabled )
this->hist_logfile << toadd << std::endl;
@@ -137,7 +137,7 @@
/* open logfile */
int ChatHistory::chat_hist_openlog()
{
- /* TODO: find out the name of the file to log to via settings
+ /* TODO: find out the name of the file to log to via settings
* and set the this->hist_logfile_path variable to it
*/
#ifndef CHATTEST
@@ -166,7 +166,7 @@
{
/* see if we've actually got a logfile */
if( this->hist_logfile )
- {
+ {
/* yes, we've got one, add a line that shows we're closing it */
this->chat_hist_logline( "--- Logfile closed ---" );
Modified: code/branches/presentation3/src/orxonox/ChatHistory.h
===================================================================
--- code/branches/presentation3/src/orxonox/ChatHistory.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/ChatHistory.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -33,7 +33,7 @@
#include <cassert>
/* define this if you're unit testing */
-//#define CHATTEST
+//#define CHATTEST
#ifndef CHATTEST
#include <OrxonoxPrereqs.h>
@@ -61,7 +61,7 @@
public Singleton<ChatHistory>
#else
- class ChatHistory
+ class ChatHistory
#endif
{
public:
@@ -74,17 +74,17 @@
#endif
virtual ~ChatHistory();
-
+
//protected:
- /** what to do with incoming chat
- *
- * \param message The incoming message
+ /** what to do with incoming chat
+ *
+ * \param message The incoming message
* \param senderID Identification number of the sender
*/
- virtual void incomingChat(const std::string& message,
+ virtual void incomingChat(const std::string& message,
unsigned int senderID);
-
- /** Synchronize logfile onto the hard drive
+
+ /** Synchronize logfile onto the hard drive
*
* \return 0 for success, other for error
*/
@@ -92,7 +92,7 @@
/** debug-print: output the whole history to stdout */
void debug_printhist();
-
+
private:
/* FIELDS */
/** Vector to store the history in */
Modified: code/branches/presentation3/src/orxonox/ChatInputHandler.cc
===================================================================
--- code/branches/presentation3/src/orxonox/ChatInputHandler.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/ChatInputHandler.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -39,7 +39,7 @@
#include <CEGUIWindowManager.h>
#include <string>
-namespace orxonox
+namespace orxonox
{
/* singleton */
ManageScopedSingleton( ChatInputHandler, ScopeID::Graphics, false );
@@ -47,7 +47,7 @@
/* add commands to console */
SetConsoleCommandAlias( ChatInputHandler, activate_static, "startchat",
true );
- SetConsoleCommandAlias( ChatInputHandler, activate_small_static,
+ SetConsoleCommandAlias( ChatInputHandler, activate_small_static,
"startchat_small", true );
/* constructor */
@@ -110,7 +110,7 @@
CEGUI::Window *history = CEGUI::WindowManager::getSingleton().getWindow( "orxonox/ChatBox/history" );
/* cast it to a listbox */
- lb_history = dynamic_cast<CEGUI::Listbox*>(history);
+ lb_history = dynamic_cast<CEGUI::Listbox*>(history);
/* assert wee */
assert( lb_history );
@@ -139,7 +139,7 @@
red += 0.2, blue += 0.2;
}
- // blues
+ // blues
red = 0.5, green = 0.5, blue = 1;
for( ; i < NumberOfColors; ++i )
{ this->text_colors[ i ] = new CEGUI::colour( red, green, blue );
@@ -170,7 +170,7 @@
this->fullchat = full;
}
- void ChatInputHandler::deactivate()
+ void ChatInputHandler::deactivate()
{
/* stop listening */
InputManager::getInstance().leaveState("chatinput");
@@ -201,7 +201,7 @@
}
/* handle incoming chat */
- void ChatInputHandler::incomingChat(const std::string& message,
+ void ChatInputHandler::incomingChat(const std::string& message,
unsigned int senderID)
{
/* look up the actual name of the sender */
@@ -209,7 +209,7 @@
/* setup player name info */
if (senderID != CLIENTID_UNKNOWN)
- {
+ {
PlayerInfo* player = PlayerManager::getInstance().getClient(senderID);
if (player)
name = player->getName();
@@ -226,29 +226,29 @@
/* now add */
this->lb_history->addItem( dynamic_cast<CEGUI::ListboxItem*>(toadd) );
- this->lb_history->ensureItemIsVisible(
+ this->lb_history->ensureItemIsVisible(
dynamic_cast<CEGUI::ListboxItem*>(toadd) );
/* make sure the history handles it */
this->lb_history->handleUpdatedItemData();
- }
+ }
/* sub for inputchanged */
- void ChatInputHandler::sub_adjust_dispoffset( int maxlen,
- int cursorpos,
+ void ChatInputHandler::sub_adjust_dispoffset( int maxlen,
+ int cursorpos,
int inplen )
{
/* already start offsetting 5 characters before end */
if( cursorpos+5 > maxlen )
- {
+ {
/* always stay 5 characters ahead of end, looks better */
((disp_offset = cursorpos-maxlen+5) >= 0) ? 1 : disp_offset = 0;
/* enforce visibility of cursor */
(disp_offset > cursorpos ) ? disp_offset = 0 : 1;
}
-
+
/* make sure we don't die at substr */
if( inplen <= disp_offset ) disp_offset = 0;
}
@@ -259,7 +259,7 @@
/* update the cursor and the window */
std::string raw = this->inpbuf->get();
int cursorpos = this->inpbuf->getCursorPosition();
-
+
/* get string before cursor */
std::string left = raw.substr( 0, cursorpos );
@@ -267,21 +267,21 @@
std::string right = "";
if( raw.length() >= left.length()+1 )
right = raw.substr( cursorpos );
-
+
/* set the text */
std::string assembled = "$ " + left + "|" + right;
if( this->fullchat )
- {
+ {
/* adjust curser position - magic number 5 for font width */
- sub_adjust_dispoffset( (this->input->getUnclippedInnerRect().getWidth()/6),
+ sub_adjust_dispoffset( (this->input->getUnclippedInnerRect().getWidth()/6),
cursorpos, assembled.length() );
this->input->setProperty( "Text", assembled.substr( disp_offset ) );
}
else
{
/* adjust curser position - magic number 5 for font width */
- sub_adjust_dispoffset( (this->inputonly->getUnclippedInnerRect().getWidth()/6),
+ sub_adjust_dispoffset( (this->inputonly->getUnclippedInnerRect().getWidth()/6),
cursorpos, assembled.length() );
this->inputonly->setProperty( "Text", assembled.substr( disp_offset) );
}
@@ -322,10 +322,10 @@
void ChatInputHandler::cursorRight()
{ this->inpbuf->increaseCursor(); }
-
+
void ChatInputHandler::cursorLeft()
{ this->inpbuf->decreaseCursor(); }
-
+
void ChatInputHandler::cursorEnd()
{ this->inpbuf->setCursorToEnd(); }
Modified: code/branches/presentation3/src/orxonox/ChatInputHandler.h
===================================================================
--- code/branches/presentation3/src/orxonox/ChatInputHandler.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/ChatInputHandler.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -61,7 +61,7 @@
{ // tolua_export
private:
/** Input buffer, to be used to catch input from the
- * keyboard
+ * keyboard
*/
InputBuffer *inpbuf;
int disp_offset, width;
@@ -125,13 +125,13 @@
* Deal with incoming chat (which means in our case: Add it to the
* history window of the full chat window)
*/
- void incomingChat( const std::string& message,
+ void incomingChat( const std::string& message,
unsigned int senderID );
/** \param full true means show full chat window with history,
false means show only an input line
- *
- * Show the chat window and redirect the game's keyboard input
+ *
+ * Show the chat window and redirect the game's keyboard input
* into it.
*/
void activate( bool full );
Modified: code/branches/presentation3/src/orxonox/Level.cc
===================================================================
--- code/branches/presentation3/src/orxonox/Level.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/Level.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -48,7 +48,7 @@
{
RegisterObject(Level);
-
+
this->registerVariables();
this->xmlfilename_ = this->getFilename();
this->xmlfile_ = 0;
@@ -72,7 +72,7 @@
XMLPortParam(Level, "description", setDescription, getDescription, xmlelement, mode);
XMLPortParam(Level, "gametype", setGametypeString, getGametypeString, xmlelement, mode).defaultValues("Gametype");
-
+
XMLPortObject(Level, MeshLodInformation, "lodinformation", addLodInfo, getLodInfo, xmlelement, mode);
XMLPortObjectExtended(Level, BaseObject, "", addObject, getObject, xmlelement, mode, true, false);
}
@@ -98,7 +98,7 @@
Loader::open(this->xmlfile_);
}
-
+
void Level::networkCallbackTemplatesChanged()
{
for( std::set<std::string>::iterator it = this->networkTemplateNames_.begin(); it!=this->networkTemplateNames_.end(); ++it )
@@ -150,7 +150,7 @@
}
return 0;
}
-
+
void Level::addLodInfo(MeshLodInformation* lodInformation)
{
std::string meshName = lodInformation->getMeshName();
@@ -164,7 +164,7 @@
{
if(this->lodInformation_.find(meshName)!=this->lodInformation_.end())
return this->lodInformation_.find(meshName)->second;
-
+
return 0;
}
Modified: code/branches/presentation3/src/orxonox/MoodManager.cc
===================================================================
--- code/branches/presentation3/src/orxonox/MoodManager.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/MoodManager.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -44,7 +44,7 @@
{
RegisterRootObject(MoodManager);
this->setConfigValues();
-
+
// Checking for the existence of the folder for the default mood
/* Note: Currently Resource::exists(path) will always return false when the path field points to a folder.
MoodManager::checkMoodValidity() performs the same check. Please help.
Modified: code/branches/presentation3/src/orxonox/OrxonoxPrereqs.h
===================================================================
--- code/branches/presentation3/src/orxonox/OrxonoxPrereqs.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/OrxonoxPrereqs.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -136,7 +136,7 @@
class Map;
class OrxonoxOverlay;
class OverlayGroup;
-
+
// pickup
class PickupIdentifier;
Modified: code/branches/presentation3/src/orxonox/Radar.cc
===================================================================
--- code/branches/presentation3/src/orxonox/Radar.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/Radar.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -86,7 +86,7 @@
(*itListener)->addObject(rv);
}
}
-
+
void Radar::removeRadarObject(RadarViewable* rv)
{
assert( this->radarObjects_.find(rv) != this->radarObjects_.end() );
@@ -202,7 +202,7 @@
COUT(3) << i++ << ": " << (*it)->getRVWorldPosition() << std::endl;
}
}
-
+
void Radar::radarObjectChanged(RadarViewable* rv)
{
for (ObjectList<RadarListener>::iterator itListener = ObjectList<RadarListener>::begin(); itListener; ++itListener)
Modified: code/branches/presentation3/src/orxonox/controllers/AIController.cc
===================================================================
--- code/branches/presentation3/src/orxonox/controllers/AIController.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/controllers/AIController.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -111,7 +111,7 @@
// stop shooting
random = rnd(maxrand);
if (random < 25 && (this->bShooting_))
- this->bShooting_ = false;
+ this->bShooting_ = false;
}
@@ -126,7 +126,7 @@
this->commandSlaves();
- if (this->specificMasterAction_ != NONE)
+ if (this->specificMasterAction_ != NONE)
this->specificMasterActionHold();
else {
@@ -148,7 +148,7 @@
// lose master status (only if less than 4 slaves in formation)
random = rnd(maxrand);
- if(random < 15/(this->slaves_.size()+1) && this->slaves_.size() < 4 )
+ if(random < 15/(this->slaves_.size()+1) && this->slaves_.size() < 4 )
this->loseMasterState();
// look out for outher masters if formation is small
Modified: code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc
===================================================================
--- code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/controllers/ArtificialController.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -90,7 +90,7 @@
if (this->isInitialized())
{
this->removeFromFormation();
-
+
for (ObjectList<ArtificialController>::iterator it = ObjectList<ArtificialController>::begin(); it; ++it)
{
if (*it != this)
@@ -100,7 +100,7 @@
COUT(1) << "error: " << this << " is still master in " << (*it) << std::endl;
it->myMaster_ = 0;
}
-
+
while (true)
{
std::vector<ArtificialController*>::iterator it2 = std::find(it->slaves_.begin(), it->slaves_.end(), this);
@@ -138,12 +138,12 @@
for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it; ++it)
{
Controller* controller = 0;
-
+
if (it->getController())
controller = it->getController();
else if (it->getXMLController())
controller = it->getXMLController();
-
+
if (!controller)
continue;
@@ -161,7 +161,7 @@
}
/**
- @brief Get all masters to do a "specific master action"
+ @brief Get all masters to do a "specific master action"
@param action which action to perform (integer, so it can be called with a console command (tmp solution))
*/
void ArtificialController::masteraction(const int action)
@@ -169,12 +169,12 @@
for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it; ++it)
{
Controller* controller = 0;
-
+
if (it->getController())
controller = it->getController();
else if (it->getXMLController())
controller = it->getXMLController();
-
+
if (!controller)
continue;
@@ -203,12 +203,12 @@
for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it; ++it)
{
Controller* controller = 0;
-
+
if (it->getController())
controller = it->getController();
else if (it->getXMLController())
controller = it->getXMLController();
-
+
if (!controller)
continue;
@@ -251,12 +251,12 @@
for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it; ++it)
{
Controller* controller = 0;
-
+
if (it->getController())
controller = it->getController();
else if (it->getXMLController())
controller = it->getXMLController();
-
+
if (!controller)
continue;
@@ -279,12 +279,12 @@
for (ObjectList<Pawn>::iterator it = ObjectList<Pawn>::begin(); it; ++it)
{
Controller* controller = 0;
-
+
if (it->getController())
controller = it->getController();
else if (it->getXMLController())
controller = it->getXMLController();
-
+
if (!controller)
continue;
@@ -302,7 +302,7 @@
*/
void ArtificialController::changedControllableEntity()
{
- if (!this->getControllableEntity())
+ if (!this->getControllableEntity())
this->removeFromFormation();
}
@@ -399,7 +399,7 @@
if (it != this->myMaster_->slaves_.end())
this->myMaster_->slaves_.erase(it);
}
-
+
this->myMaster_ = 0;
this->state_ = FREE;
}
@@ -422,12 +422,12 @@
//has it an ArtificialController?
Controller* controller = 0;
-
+
if (it->getController())
controller = it->getController();
else if (it->getXMLController())
controller = it->getXMLController();
-
+
if (!controller)
continue;
@@ -475,7 +475,7 @@
/**
@brief Commands the slaves of a master into a formation. Sufficiently fast not to be called within tick. Initiated by a master.
*/
- void ArtificialController::commandSlaves()
+ void ArtificialController::commandSlaves()
{
if(this->state_ != MASTER) return;
@@ -488,7 +488,7 @@
dest += 4*orient*WorldEntity::BACK;
this->slaves_.front()->setTargetPosition(dest);
}
- else
+ else
{
dest += 1.0f*orient*WorldEntity::BACK;
Vector3 pos = Vector3::ZERO;
@@ -591,7 +591,7 @@
*/
bool ArtificialController::forcedFree()
{
- if(this->freedomCount_ > 0)
+ if(this->freedomCount_ > 0)
{
this->freedomCount_--;
return true;
@@ -605,7 +605,7 @@
{
if(this->state_ != MASTER) return;
- if (specificMasterActionHoldCount_ == 0)
+ if (specificMasterActionHoldCount_ == 0)
{
this->specificMasterAction_ = NONE;
this->searchNewTarget();
@@ -676,7 +676,7 @@
this->setTarget(pawn);
if (!always)
this->specificMasterActionHoldCount_ = secondsToFollow;
- else
+ else
this->specificMasterActionHoldCount_ = INT_MAX; //for now...
}
@@ -697,7 +697,7 @@
continue;
currentHumanController = orxonox_cast<NewHumanController*>(it->getController());
- if(currentHumanController)
+ if(currentHumanController)
{
if (!ArtificialController::sameTeam(this->getControllableEntity(), *it, this->getGametype())) continue;
humanPawn = *it;
Modified: code/branches/presentation3/src/orxonox/controllers/ArtificialController.h
===================================================================
--- code/branches/presentation3/src/orxonox/controllers/ArtificialController.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/controllers/ArtificialController.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -63,7 +63,7 @@
{ this->maxFormationSize_ = size; }
inline int getFormationSize() const
{ return this->maxFormationSize_; }
-
+
inline void setPassive(bool passive)
{ this->passive_ = passive; }
inline bool getPassive() const
Modified: code/branches/presentation3/src/orxonox/controllers/DroneController.h
===================================================================
--- code/branches/presentation3/src/orxonox/controllers/DroneController.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/controllers/DroneController.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -51,7 +51,7 @@
public:
DroneController(BaseObject* creator);
virtual ~DroneController();
-
+
virtual void tick(float dt); //!< The controlling happens here. This method defines what the controller has to do each tick.
void setOwner(Pawn* owner);
Modified: code/branches/presentation3/src/orxonox/gametypes/Gametype.cc
===================================================================
--- code/branches/presentation3/src/orxonox/gametypes/Gametype.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/gametypes/Gametype.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -329,7 +329,7 @@
{
if (index == randomspawn)
return (*it);
-
+
++index;
}
Modified: code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.cc
===================================================================
--- code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -39,7 +39,7 @@
{
CreateFactory(MeshLodInformation);
- MeshLodInformation::MeshLodInformation(BaseObject* creator)
+ MeshLodInformation::MeshLodInformation(BaseObject* creator)
: BaseObject(creator), lodLevel_(5), bEnabled_(true), numLevels_(10), reductionRate_(0.15)
{
RegisterObject(MeshLodInformation);
@@ -58,12 +58,12 @@
XMLPortParam(MeshLodInformation, "numLevels", setNumLevels, getNumLevels, xmlelement, mode);
XMLPortParam(MeshLodInformation, "reductionRate", setReductionRate, getReductionRate, xmlelement, mode);
}
-
+
std::string MeshLodInformation::getMeshName()
{
return MeshLodInformation::getMeshSource();
}
-
+
void MeshLodInformation::setLodLevel(float lodLevel)
{
if(lodLevel>=0)
@@ -72,7 +72,7 @@
float MeshLodInformation::getLodLevel()
{
return lodLevel_;
- }
+ }
void MeshLodInformation::setMeshSource(std::string meshSource)
{
meshSource_ = meshSource;
@@ -81,5 +81,5 @@
{
return meshSource_;
}
-
+
}
Modified: code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.h
===================================================================
--- code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/graphics/MeshLodInformation.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -42,13 +42,13 @@
public:
MeshLodInformation(BaseObject* creator);
virtual ~MeshLodInformation();
-
+
float getLodLevel();
std::string getMeshName();
bool getEnabled(){ return this->bEnabled_; }
unsigned int getNumLevels(){ return this->numLevels_; }
float getReductionRate(){ return this->reductionRate_; }
-
+
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
private:
Modified: code/branches/presentation3/src/orxonox/graphics/Model.cc
===================================================================
--- code/branches/presentation3/src/orxonox/graphics/Model.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/graphics/Model.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -41,7 +41,7 @@
{
CreateFactory(Model);
- Model::Model(BaseObject* creator) :
+ Model::Model(BaseObject* creator) :
StaticEntity(creator), bCastShadows_(true), lodLevel_(5), bLodEnabled_(true), numLodLevels_(10), lodReductionRate_(.15)
{
RegisterObject(Model);
@@ -58,9 +58,9 @@
void Model::XMLPort(Element& xmlelement, XMLPort::Mode mode)
{
SUPER(Model, XMLPort, xmlelement, mode);
-
+
XMLPortParam(Model, "lodLevel", setLodLevel, getLodLevel, xmlelement, mode);
-
+
XMLPortParam(Model, "mesh", setMeshSource, getMeshSource, xmlelement, mode);
XMLPortParam(Model, "shadow", setCastShadows, getCastShadows, xmlelement, mode).defaultValues(true);
}
@@ -80,14 +80,14 @@
scaleFactor = scale3d.z;
return scaleFactor;
}
-
+
void Model::changedMesh()
{
if (GameMode::showsGraphics())
{
if (this->mesh_.getEntity())
this->detachOgreObject(this->mesh_.getEntity());
-
+
this->mesh_.setMeshSource(this->getScene()->getSceneManager(), this->meshSrc_);
if (this->mesh_.getEntity())
@@ -95,15 +95,15 @@
this->attachOgreObject(this->mesh_.getEntity());
this->mesh_.getEntity()->setCastShadows(this->bCastShadows_);
this->mesh_.setVisible(this->isVisible());
-
-
+
+
//LOD
if( this->mesh_.getEntity()->getMesh()->getNumLodLevels()==1 )
{
Level* level = this->getLevel();
-
+
assert( level != 0 );
-
+
MeshLodInformation* lodInfo = level->getLodInfo(this->meshSrc_);
if( lodInfo )
{
@@ -121,16 +121,16 @@
{
float volume = this->mesh_.getEntity()->getBoundingBox().volume();
// float scaleFactor = 1;
-
+
// BaseObject* creatorPtr = this;
- //
+ //
// while(creatorPtr!=NULL&&orxonox_cast<WorldEntity*>(creatorPtr))
// {
// scaleFactor *= getBiggestScale(((WorldEntity*) creatorPtr)->getScale3D());
// creatorPtr = creatorPtr->getCreator();
// }
// COUT(0) << "name: " << this->meshSrc_ << "scaleFactor: " << scaleFactor << ", volume: " << volume << endl;
-
+
COUT(4) << "Setting lodLevel for " << this->meshSrc_<< " with lodLevel_: " << this->lodLevel_ <<" and volume: "<< volume << ":" << std::endl;
#if OGRE_VERSION >= 0x010700
@@ -143,7 +143,7 @@
{
// float factor = scaleFactor*5/lodLevel_;
float factor = pow(volume, 2.0f / 3.0f) * 15.0f / lodLevel_;
-
+
COUT(4) << "LodLevel set with factor: " << factor << endl;
distList.push_back(70.0f*factor);
@@ -159,7 +159,7 @@
while(distList.size()>this->numLodLevels_)
distList.pop_back();
-
+
//Generiert LOD-Levels
this->mesh_.getEntity()->getMesh()->generateLodLevels(distList, Ogre::ProgressiveMesh::VRQ_PROPORTIONAL, this->lodReductionRate_);
}
@@ -170,7 +170,7 @@
what = ">5";
else
what = "<0";
-
+
COUT(4)<<"LodLevel not set because lodLevel("<<lodLevel_<<") was "<<what<<"." << endl;
}
}
Modified: code/branches/presentation3/src/orxonox/graphics/Model.h
===================================================================
--- code/branches/presentation3/src/orxonox/graphics/Model.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/graphics/Model.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -60,11 +60,11 @@
{ this->bCastShadows_ = bCastShadows; this->changedShadows(); }
inline bool getCastShadows() const
{ return this->bCastShadows_; }
-
+
protected:
void changedMesh();
void changedShadows();
-
+
//LoD
inline void setLodLevel(float lodLevel)
{ this->lodLevel_ = lodLevel; }
@@ -75,13 +75,13 @@
std::string meshSrc_;
Mesh mesh_;
bool bCastShadows_;
-
+
//LoD
float lodLevel_;
bool bLodEnabled_;
unsigned int numLodLevels_;
float lodReductionRate_;
-
+
};
}
Modified: code/branches/presentation3/src/orxonox/infos/GametypeInfo.cc
===================================================================
--- code/branches/presentation3/src/orxonox/infos/GametypeInfo.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/infos/GametypeInfo.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -156,7 +156,7 @@
for (ObjectList<GametypeMessageListener>::iterator it = ObjectList<GametypeMessageListener>::begin(); it != ObjectList<GametypeMessageListener>::end(); ++it)
it->staticmessage(this, message, colour);
}
-
+
void GametypeInfo::dispatchFadingMessage(const std::string& message)
{
for (ObjectList<GametypeMessageListener>::iterator it = ObjectList<GametypeMessageListener>::begin(); it != ObjectList<GametypeMessageListener>::end(); ++it)
Modified: code/branches/presentation3/src/orxonox/interfaces/InterfaceCompilation.cc
===================================================================
--- code/branches/presentation3/src/orxonox/interfaces/InterfaceCompilation.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/interfaces/InterfaceCompilation.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -51,17 +51,17 @@
{
RegisterRootObject(GametypeMessageListener);
}
-
+
//----------------------------
// PickupCarrier
//----------------------------
PickupCarrier::PickupCarrier()
{
RegisterRootObject(PickupCarrier);
-
+
this->setCarrierName("PickupCarrier");
}
-
+
PickupCarrier::~PickupCarrier()
{
std::set<Pickupable*>::iterator it = this->pickups_.begin();
@@ -84,7 +84,7 @@
this->player_ = NULL;
this->isForPlayer_ = true;
}
-
+
//----------------------------
// RadarListener
//----------------------------
Modified: code/branches/presentation3/src/orxonox/interfaces/PickupCarrier.h
===================================================================
--- code/branches/presentation3/src/orxonox/interfaces/PickupCarrier.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/interfaces/PickupCarrier.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -67,7 +67,7 @@
//! So that the different Pickupables have full access to their PickupCarrier.
friend class Pickupable;
friend class PickupManager;
- //! Friends.
+ //! Friends.
friend class Pickup;
friend class HealthPickup;
friend class InvisiblePickup;
@@ -169,14 +169,14 @@
@return Returns the position as a Vector3.
*/
virtual const Vector3& getCarrierPosition(void) = 0;
-
+
/**
@brief Get the name of this PickupCarrier.
@return Returns the name as a string.
*/
const std::string& getCarrierName(void) { return this->carrierName_; } // tolua_export
-
- protected:
+
+ protected:
/**
@brief Get all direct children of this PickupSpawner.
This method needs to be implemented by any direct derivative class of PickupCarrier.
@@ -197,7 +197,7 @@
*/
std::set<Pickupable*>& getPickups(void)
{ return this->pickups_; }
-
+
/**
@brief Set the name of this PickupCarrier.
The name needs to be set in the constructor of every class inheriting from PickupCarrier, by calling setCarrierName().
@@ -205,11 +205,11 @@
*/
void setCarrierName(const std::string& name)
{ this->carrierName_ = name; }
-
+
private:
std::set<Pickupable*> pickups_; //!< The list of Pickupables carried by this PickupCarrier.
std::string carrierName_; //!< The name of the PickupCarrier, as displayed in the PickupInventory.
-
+
/**
@brief Get the number of carrier children this PickupCarrier has.
@return Returns the number of carrier children.
@@ -221,7 +221,7 @@
delete list;
return size;
}
-
+
/**
@brief Get the index-th child of this PickupCarrier.
@param index The index of the child to return.
@@ -236,14 +236,14 @@
delete list;
return carrier;
}
-
+
/**
@brief Get the number of Pickupables this PickupCarrier carries.
@return returns the number of pickups.
*/
unsigned int getNumPickups(void)
{ return this->pickups_.size(); }
-
+
/**
@brief Get the index-th Pickupable of this PickupCarrier.
@param index The index of the Pickupable to return.
@@ -258,7 +258,7 @@
return NULL;
return *it;
}
-
+
};
}
Modified: code/branches/presentation3/src/orxonox/interfaces/Pickupable.cc
===================================================================
--- code/branches/presentation3/src/orxonox/interfaces/Pickupable.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/interfaces/Pickupable.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -45,39 +45,39 @@
namespace orxonox
{
-
+
/**
@brief
Constructor. Registers the objects and initializes its member variables.
*/
Pickupable::Pickupable() : pickupIdentifier_(NULL), used_(false), pickedUp_(false)
- {
+ {
RegisterRootObject(Pickupable);
-
+
this->carrier_ = NULL;
-
+
this->pickupIdentifier_ = new PickupIdentifier(this);
}
-
+
/**
@brief
- Destructor.
+ Destructor.
*/
Pickupable::~Pickupable()
{
if(this->isUsed())
this->setUsed(false);
-
+
if(this->isPickedUp() && this->getCarrier() != NULL)
{
this->getCarrier()->drop(this, false);
this->setCarrier(NULL);
}
-
+
if(this->pickupIdentifier_ != NULL)
this->pickupIdentifier_->destroy();
}
-
+
/**
@brief
Sets the Pickupable to used or unused, depending on the input.
@@ -90,16 +90,16 @@
{
if(this->used_ == used)
return false;
-
+
COUT(4) << "Pickupable (&" << this << ") set to used " << used << "." << std::endl;
-
+
this->used_ = used;
this->changedUsed();
GUIManager::getInstance().getLuaState()->doString("PickupInventory.update()");
return true;
}
-
+
/**
@brief
Get whether the given PickupCarrier is a target of this Pickupable.
@@ -114,7 +114,7 @@
return false;
return this->isTarget(carrier->getIdentifier());
}
-
+
/**
@brief
Get whether the given Identififer is a target of this Pickupable.
@@ -133,7 +133,7 @@
}
return false;
}
-
+
/**
@brief
Add a PickupCarrier as target of this Pickupable.
@@ -146,7 +146,7 @@
{
return this->addTarget(target->getIdentifier());
}
-
+
/**
@brief
Add a class, representetd by the input Identifier, as target of this Pickupable.
@@ -159,14 +159,14 @@
{
if(this->isTarget(target)) //!< If the input target is already present in the list of targets.
return false;
-
+
COUT(4) << "Target " << target->getName() << " added to Pickupable (&" << this << ")." << std::endl;
this->targets_.push_back(target);
return true;
}
-
+
/**
- @brief
+ @brief
Sets the Pickupable to picked up.
This method will be called by the PickupCarrier picking the Pickupable up.
@param carrier
@@ -178,13 +178,13 @@
{
if(this->isPickedUp()) //!< If the Pickupable is already picked up.
return false;
-
+
COUT(4) << "Pickupable (&" << this << ") got picked up by a PickupCarrier (&" << carrier << ")." << std::endl;
this->setCarrier(carrier);
this->setPickedUp(true);
return true;
}
-
+
/**
@brief
Helper method to set the Pickupable to either picked up or not picked up.
@@ -197,15 +197,15 @@
{
if(this->pickedUp_ == pickedUp)
return false;
-
+
COUT(4) << "Pickupable (&" << this << ") set to pickedUp " << pickedUp << "." << std::endl;
-
+
this->pickedUp_ = pickedUp;
this->changedPickedUp();
GUIManager::getInstance().getLuaState()->doString("PickupInventory.update()");
return true;
}
-
+
/**
@brief
Sets the carrier of the Pickupable.
@@ -216,18 +216,18 @@
{
if(this->carrier_ == carrier)
return false;
-
+
COUT(4) << "Pickupable (&" << this << ") changed Carrier (& " << carrier << ")." << std::endl;
-
+
this->carrier_ = carrier;
this->changedCarrier();
if(tell && carrier != NULL)
this->carrier_->pickups_.insert(this);
return true;
}
-
+
/**
- @brief
+ @brief
Sets the Pickupable to not picked up or dropped.
This method will be called by the PickupCarrier dropping the Pickupable.
@return
@@ -237,23 +237,23 @@
{
if(!this->isPickedUp()) //!< If the Pickupable is not picked up.
return false;
-
+
COUT(4) << "Pickupable (&" << this << ") got dropped up by a PickupCarrier (&" << this->getCarrier() << ")." << std::endl;
this->setUsed(false);
this->setPickedUp(false);
-
+
bool created = this->createSpawner();
-
+
this->setCarrier(NULL);
-
+
if(!created)
{
this->destroy();
}
-
+
return true;
}
-
+
/**
@brief
Creates a duplicate of the Pickupable.
@@ -264,13 +264,13 @@
{
OrxonoxClass* item = NULL;
this->clone(item);
-
+
Pickupable* pickup = dynamic_cast<Pickupable*>(item);
-
+
COUT(4) << "Pickupable (&" << this << ") cloned. Clone is new Pickupable (&" << pickup << ")." << std::endl;
return pickup;
}
-
+
/**
@brief
Creates a duplicate of the input OrxonoxClass.
@@ -298,5 +298,5 @@
PickupCarrier* carrier = static_cast<PickupCarrier*>(pawn);
return carrier->pickup(this);
}
-
+
}
Modified: code/branches/presentation3/src/orxonox/interfaces/Pickupable.h
===================================================================
--- code/branches/presentation3/src/orxonox/interfaces/Pickupable.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/interfaces/Pickupable.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -44,7 +44,7 @@
namespace orxonox // tolua_export
{ // tolua_export
-
+
/**
@brief
An Interface (or more precisely an abstract class) to model and represent different (all kinds of) pickups.
@@ -56,10 +56,10 @@
{ // tolua_export
protected:
Pickupable(); //!< Default constructor.
-
+
public:
virtual ~Pickupable(); //!< Default destructor.
-
+
/**
@brief Get whether the pickup is currently in use or not.
@return Returns true if the pickup is currently in use.
@@ -70,7 +70,7 @@
Any Class overwriting this method must call its SUPER function by adding SUPER(Classname, changedUsed); to their changdeUsed method.
*/
virtual void changedUsed(void) {}
-
+
/**
@brief Get the carrier of the pickup.
@return Returns a pointer to the carrier of the pickup.
@@ -82,7 +82,7 @@
Any Class overwriting this method must call its SUPER function by adding SUPER(Classname, changedCarrier); to their changedCarrier method.
*/
virtual void changedCarrier(void) {}
-
+
/**
@brief Returns whether the Pickupable is currently picked up.
@return Returns true if the Pickupable is currently picked up, false if not.
@@ -93,35 +93,35 @@
Any Class overwriting this method must call its SUPER function by adding SUPER(Classname, changedPickedUp); to their changedPickedUp method.
*/
virtual void changedPickedUp(void) {}
-
+
bool pickedUp(PickupCarrier* carrier); //!< Sets the Pickupable to picked up.
bool dropped(void); //!< Sets the Pickupable to not picked up or dropped.
-
+
virtual bool isTarget(PickupCarrier* carrier) const; //!< Get whether the given PickupCarrier is a target of this pickup.
bool isTarget(const Identifier* identifier) const; //!< Get whether a given class, represented by the input Identifier, is a target of this Pickupable.
bool addTarget(PickupCarrier* target); //!< Add a PickupCarrier as target of this pickup.
bool addTarget(Identifier* identifier); //!< Add a class, representetd by the input Identifier, as target of this pickup.
-
+
Pickupable* clone(void); //!< Creates a duplicate of the Pickupable.
virtual void clone(OrxonoxClass*& item); //!< Creates a duplicate of the input OrxonoxClass.
-
+
/**
@brief Get the PickupIdentifier of this Pickupable.
@return Returns a pointer to the PickupIdentifier of this Pickupable.
*/
virtual const PickupIdentifier* getPickupIdentifier(void)
{ return this->pickupIdentifier_; }
-
+
bool setUsed(bool used); //!< Sets the Pickupable to used or unused, depending on the input.
bool setPickedUp(bool pickedUp); //!< Helper method to set the Pickupable to either picked up or not picked up.
bool setCarrier(PickupCarrier* carrier, bool tell = false); //!< Sets the carrier of the pickup.
-
+
protected:
/**
@brief Helper method to initialize the PickupIdentifier.
*/
void initializeIdentifier(void) {}
-
+
/**
@brief Facilitates the creation of a PickupSpawner upon dropping of the Pickupable.
This method must be implemented by any class directly inheriting from Pickupable. It is most easily done by just creating a new DroppedPickup, e.g.:
@@ -130,14 +130,14 @@
@return Returns true if a spawner was created, false if not.
*/
virtual bool createSpawner(void) = 0;
-
+
PickupIdentifier* pickupIdentifier_; //!< The PickupIdentifier of this Pickupable.
-
+
private:
-
+
bool used_; //!< Whether the pickup is currently in use or not.
bool pickedUp_; //!< Whether the pickup is currently picked up or not.
-
+
PickupCarrier* carrier_; //!< The carrier of the pickup.
std::list<Identifier*> targets_; //!< The possible targets of this pickup.
@@ -146,7 +146,7 @@
virtual bool reward(PlayerInfo* player); //!< Method to transcribe a Pickupable as a Rewardable to the player.
}; // tolua_export
-
+
SUPER_FUNCTION(10, Pickupable, changedUsed, false);
SUPER_FUNCTION(12, Pickupable, changedCarrier, false);
SUPER_FUNCTION(13, Pickupable, changedPickedUp, false);
Modified: code/branches/presentation3/src/orxonox/interfaces/RadarViewable.cc
===================================================================
--- code/branches/presentation3/src/orxonox/interfaces/RadarViewable.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/interfaces/RadarViewable.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -64,7 +64,7 @@
RadarViewable::~RadarViewable()
{
-
+
if( this->bInitialized_ )
{
if( GameMode::showsGraphics() )
@@ -108,7 +108,7 @@
assert(0);
}
}
-
+
void RadarViewable::settingsChanged()
{
if( GameMode::showsGraphics() )
Modified: code/branches/presentation3/src/orxonox/interfaces/RadarViewable.h
===================================================================
--- code/branches/presentation3/src/orxonox/interfaces/RadarViewable.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/interfaces/RadarViewable.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -87,7 +87,7 @@
// { return this->radarObjectDescription_; }
inline void setRadarVisibility(bool b)
- {
+ {
if(b!=this->bVisibility_)
{
this->bVisibility_ = b;
Modified: code/branches/presentation3/src/orxonox/pickup/PickupIdentifier.cc
===================================================================
--- code/branches/presentation3/src/orxonox/pickup/PickupIdentifier.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/pickup/PickupIdentifier.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -38,7 +38,7 @@
namespace orxonox
{
-
+
/**
@brief
Constructor. Registers the object and initializes member variables.
@@ -46,18 +46,18 @@
PickupIdentifier::PickupIdentifier(Pickupable* pickup)
{
RegisterRootObject(PickupIdentifier);
-
+
if(pickup == NULL)
COUT(1) << "Error, PickupIdentifier was created without a valid Pickupable." << std::endl;
-
+
this->pickup_ = pickup;
}
-
+
PickupIdentifier::~PickupIdentifier()
{
}
-
+
/**
@brief
Compares two PickupIdentifiers and returns 0 if a == b, <0 if a < b and >0 if a > b for a.compare(b).
@@ -73,29 +73,29 @@
return 1;
COUT(1) << "Error in PickupIdentifier::compare: Input Identifier is NULL." << std::endl;
}
-
+
if(identifier->pickup_ == NULL && this->pickup_ == NULL)
{
return 0;
COUT(1) << "Error in PickupIdentifier::compare: Pickup stored by Identifier is NULL." << std::endl;
}
-
+
if(identifier->pickup_ == NULL)
{
return 1;
COUT(1) << "Error in PickupIdentifier::compare: Pickup stored by Identifier is NULL." << std::endl;
}
-
+
if(this->pickup_ == NULL)
{
return -1;
COUT(1) << "Error in PickupIdentifier::compare: Pickup stored by Identifier is NULL." << std::endl;
}
-
+
//! If the classIdentifiers are not the same (meaning the PickupIdentifiers identify different classes), the obviously the two Pickupables identified by the PickupIdentifiers cannot be the same. An ordering is established through the alphabetical ordering of the respective classnames.
if(!identifier->pickup_->getIdentifier()->isExactlyA(this->pickup_->getIdentifier()))
return this->pickup_->getIdentifier()->getName().compare(identifier->pickup_->getIdentifier()->getName());
-
+
//! If the class is the same for both PickupIdentifiers we go on to check the parameters of the class.
//! If the two have a different number of parameters then obviusly something is very wrong.
if(!(this->parameters_.size() == identifier->parameters_.size()))
@@ -103,7 +103,7 @@
COUT(1) << "Something went wrong in PickupIdentifier!" << std::endl;
return this->parameters_.size()-identifier->parameters_.size();
}
-
+
//! We iterate through all parameters and compar their values (which are strings). The first parameter is the most significant. The ordering is once again established by the alphabetical comparison of the two value strings.
for(std::map<std::string, std::string>::const_iterator it = this->parameters_.begin(); it != this->parameters_.end(); it++)
{
@@ -116,10 +116,10 @@
if(identifier->parameters_.find(it->first)->second != it->second)
return it->second.compare(identifier->parameters_.find(it->first)->second);
}
-
+
return 0;
}
-
+
/**
@brief
Add a parameter to the PickupIdentifier.
@@ -133,16 +133,16 @@
bool PickupIdentifier::addParameter(std::string & name, std::string & value)
{
COUT(4) << "PickupIdentifier " << name << ", " << value << std::endl;
-
+
if(!(this->parameters_.find(name) == this->parameters_.end()))
{
COUT(4) << "Request for adding a parameter that already exists for the PickupIdentififer was denied. name: '" << name << "', value: '" << value << "'."<< std::endl;
return false;
}
-
+
this->parameters_[name] = value;
-
+
return true;
}
-
+
}
Modified: code/branches/presentation3/src/orxonox/pickup/PickupIdentifier.h
===================================================================
--- code/branches/presentation3/src/orxonox/pickup/PickupIdentifier.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/pickup/PickupIdentifier.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -40,11 +40,11 @@
#include <string>
#include "core/Identifier.h"
-#include "core/OrxonoxClass.h"
+#include "core/OrxonoxClass.h"
namespace orxonox
{
-
+
/**
@brief
The purpose of the PickupIdentifier class is to identify different types of pickups allthough they are of the same class.
@@ -56,21 +56,21 @@
*/
class _OrxonoxExport PickupIdentifier : virtual public OrxonoxClass
{
-
+
public:
PickupIdentifier(Pickupable* pickup); //!< Constructor.
~PickupIdentifier(); //!< Destructor.
-
+
virtual int compare(const PickupIdentifier* identifier) const; //!< Compares two PickupIdentifiers and returns 0 if a == b, <0 if a < b and >0 if a > b for a.compare(b).
-
+
bool addParameter(std::string & name, std::string & value); //!< Add a parameter to the PickupIdentifier.
-
+
private:
Pickupable* pickup_; //!< The Pickupable the PickupIdentififer is for.
std::map<std::string, std::string> parameters_; //!< The parameters identifying the type of the pickup beyond the class.
-
+
};
-
+
/**
@brief
Struct that overloads the compare operation between two PickupIdentifier pointers.
@@ -80,7 +80,7 @@
bool operator() (const PickupIdentifier* lhs, const PickupIdentifier* rhs) const
{ return lhs->compare(rhs) < 0; }
};
-
+
}
#endif // _PickupIdentifier_H__
Modified: code/branches/presentation3/src/orxonox/worldentities/Drone.h
===================================================================
--- code/branches/presentation3/src/orxonox/worldentities/Drone.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/worldentities/Drone.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -52,7 +52,7 @@
virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); //!< Method for creating a Drone through XML.
virtual void tick(float dt); //!< Defines which actions the Drone has to take in each tick.
-
+
virtual void moveFrontBack(const Vector2& value);
virtual void moveRightLeft(const Vector2& value);
virtual void moveUpDown(const Vector2& value);
@@ -60,7 +60,7 @@
virtual void rotateYaw(const Vector2& value);
virtual void rotatePitch(const Vector2& value);
virtual void rotateRoll(const Vector2& value);
-
+
/**
@brief Moves the Drone in the Front/Back-direction by the specifed amount.
@param value The amount by which the drone is to be moved.
@@ -79,7 +79,7 @@
*/
inline void moveUpDown(float value)
{ this->moveUpDown(Vector2(value, 0)); }
-
+
/**
@brief Rotates the Drone around the y-axis by the specifed amount.
@param value The amount by which the drone is to be rotated.
@@ -98,17 +98,17 @@
*/
inline void rotateRoll(float value)
{ this->rotateRoll(Vector2(value, 0)); }
-
+
/**
@brief Sets the primary thrust to the input amount.
@param thrust The amount of thrust.
*/
inline void setPrimaryThrust( float thrust )
- { this->primaryThrust_=thrust; }
+ { this->primaryThrust_=thrust; }
inline void setAuxilaryThrust( float thrust )
- { this->auxilaryThrust_=thrust; }
+ { this->auxilaryThrust_=thrust; }
inline void setRotationThrust( float thrust )
- { this->rotationThrust_=thrust; }
+ { this->rotationThrust_=thrust; }
inline void setMaxDistanceToOwner( float distance)
{ this->maxDistanceToOwner_=distance; }
inline void setMinDistanceToOwner( float distance)
@@ -116,7 +116,7 @@
inline void setMaxShootingRange( float distance)
{ this->maxShootingRange_=distance; }
-
+
/**
@brief Gets the primary thrust to the input amount.
@return The amount of thrust.
@@ -133,13 +133,13 @@
{ return this->minDistanceToOwner_; }
inline float getMaxShootingRange()
{ return this->maxShootingRange_; }
-
+
private:
DroneController *myController_; //!< The controller of the Drone.
-
+
btVector3 localLinearAcceleration_; //!< The linear acceleration that is used to move the Drone the next tick.
btVector3 localAngularAcceleration_; //!< The linear angular acceleration that is used to move the Drone the next tick.
- float primaryThrust_; //!< The amount of primary thrust. This is just used, when moving forward.
+ float primaryThrust_; //!< The amount of primary thrust. This is just used, when moving forward.
float auxilaryThrust_; //!< The amount of auxilary thrust. Used for all other movements (except for rotations).
float rotationThrust_; //!< The amount of rotation thrust. Used for rotations only.
float maxDistanceToOwner_; //Maximum Distance to owner
Modified: code/branches/presentation3/src/orxonox/worldentities/WorldEntity.cc
===================================================================
--- code/branches/presentation3/src/orxonox/worldentities/WorldEntity.cc 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/worldentities/WorldEntity.cc 2010-06-09 19:32:58 UTC (rev 7127)
@@ -80,7 +80,7 @@
this->node_->setPosition(Vector3::ZERO);
this->node_->setOrientation(Quaternion::IDENTITY);
-
+
// Activity and visibility memory.
this->bActiveMem_ = true;
this->bVisibleMem_ = true;
@@ -204,7 +204,7 @@
// Attach to parent if necessary
registerVariable(this->parentID_, VariableDirection::ToClient, new NetworkCallback<WorldEntity>(this, &WorldEntity::networkcallback_parentChanged));
}
-
+
/**
@brief
When the activity is changed, it is changed for all attached objects as well.
@@ -212,7 +212,7 @@
void WorldEntity::changedActivity(void)
{
SUPER(WorldEntity, changedActivity);
-
+
for (std::set<WorldEntity*>::const_iterator it = this->getAttachedObjects().begin(); it != this->getAttachedObjects().end(); it++)
{
if(!this->isActive())
@@ -226,7 +226,7 @@
}
}
}
-
+
/**
@brief
When the visibility is changed, it is changed for all attached objects as well.
@@ -234,7 +234,7 @@
void WorldEntity::changedVisibility(void)
{
SUPER(WorldEntity, changedVisibility);
-
+
for (std::set<WorldEntity*>::const_iterator it = this->getAttachedObjects().begin(); it != this->getAttachedObjects().end(); it++)
{
if(!this->isVisible())
Modified: code/branches/presentation3/src/orxonox/worldentities/WorldEntity.h
===================================================================
--- code/branches/presentation3/src/orxonox/worldentities/WorldEntity.h 2010-06-09 19:16:43 UTC (rev 7126)
+++ code/branches/presentation3/src/orxonox/worldentities/WorldEntity.h 2010-06-09 19:32:58 UTC (rev 7127)
@@ -104,7 +104,7 @@
static const Vector3 RIGHT;
static const Vector3 DOWN;
static const Vector3 UP;
-
+
virtual void changedActivity(void);
virtual void changedVisibility(void);
@@ -233,7 +233,7 @@
unsigned int parentID_;
std::set<WorldEntity*> children_;
bool bDeleteWithParent_;
-
+
bool bActiveMem_;
bool bVisibleMem_;
More information about the Orxonox-commit
mailing list