[Orxonox-commit 457] r3034 - in trunk/src/orxonox: gui objects/worldentities/pawns objects/worldentities/triggers overlays overlays/notifications
landauf at orxonox.net
landauf at orxonox.net
Sat May 23 22:05:58 CEST 2009
Author: landauf
Date: 2009-05-23 22:05:58 +0200 (Sat, 23 May 2009)
New Revision: 3034
Modified:
trunk/src/orxonox/gui/GUIManager.cc
trunk/src/orxonox/objects/worldentities/pawns/Spectator.cc
trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc
trunk/src/orxonox/overlays/OverlayGroup.cc
trunk/src/orxonox/overlays/notifications/Notification.h
trunk/src/orxonox/overlays/notifications/NotificationManager.h
Log:
replaced tabs with spaces
Modified: trunk/src/orxonox/gui/GUIManager.cc
===================================================================
--- trunk/src/orxonox/gui/GUIManager.cc 2009-05-23 19:57:52 UTC (rev 3033)
+++ trunk/src/orxonox/gui/GUIManager.cc 2009-05-23 20:05:58 UTC (rev 3034)
@@ -90,10 +90,10 @@
if (scriptModule_)
{
// destroy our own tolua interfaces
- lua_pushnil(luaState_);
- lua_setglobal(luaState_, "Orxonox");
- lua_pushnil(luaState_);
- lua_setglobal(luaState_, "Core");
+ lua_pushnil(luaState_);
+ lua_setglobal(luaState_, "Orxonox");
+ lua_pushnil(luaState_);
+ lua_setglobal(luaState_, "Core");
delete scriptModule_;
}
Modified: trunk/src/orxonox/objects/worldentities/pawns/Spectator.cc
===================================================================
--- trunk/src/orxonox/objects/worldentities/pawns/Spectator.cc 2009-05-23 19:57:52 UTC (rev 3033)
+++ trunk/src/orxonox/objects/worldentities/pawns/Spectator.cc 2009-05-23 20:05:58 UTC (rev 3034)
@@ -111,7 +111,7 @@
void Spectator::changedFlareVisibility()
{
- if ( this->greetingFlare_ )
+ if (this->greetingFlare_)
this->greetingFlare_->setVisible(this->bGreetingFlareVisible_);
}
Modified: trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc
===================================================================
--- trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc 2009-05-23 19:57:52 UTC (rev 3033)
+++ trunk/src/orxonox/objects/worldentities/triggers/DistanceTrigger.cc 2009-05-23 20:05:58 UTC (rev 3034)
@@ -85,14 +85,14 @@
void DistanceTrigger::addTargets(const std::string& targets)
{
Identifier* targetId = ClassByString(targets);
-
+
//! Checks whether the target is (or is derived from) a ControllableEntity.
Identifier* controllableEntityId = Class(ControllableEntity);
if(targetId->isA(controllableEntityId))
{
this->setForPlayer(true);
}
-
+
if (!targetId)
{
COUT(1) << "Error: \"" << targets << "\" is not a valid class name to include in ClassTreeMask (in " << this->getName() << ", class " << this->getIdentifier()->getName() << ")" << std::endl;
@@ -130,14 +130,14 @@
Vector3 distanceVec = entity->getWorldPosition() - this->getWorldPosition();
if (distanceVec.length() < this->distance_)
{
-
- //! If the target is a player (resp. is a, or is derived from a, ControllableEntity) the triggeringPlayer is set to the target entity.
+
+ // If the target is a player (resp. is a, or is derived from a, ControllableEntity) the triggeringPlayer is set to the target entity.
if(this->isForPlayer())
- {
+ {
Pawn* player = dynamic_cast<Pawn*>(entity);
- this->setTriggeringPlayer(player);
- }
-
+ this->setTriggeringPlayer(player);
+ }
+
return true;
}
}
Modified: trunk/src/orxonox/overlays/OverlayGroup.cc
===================================================================
--- trunk/src/orxonox/overlays/OverlayGroup.cc 2009-05-23 19:57:52 UTC (rev 3033)
+++ trunk/src/orxonox/overlays/OverlayGroup.cc 2009-05-23 20:05:58 UTC (rev 3034)
@@ -112,7 +112,7 @@
element->setOwner(this->owner_);
}
- /**
+ /**
@brief
Removes an element from the map.
@param name
Modified: trunk/src/orxonox/overlays/notifications/Notification.h
===================================================================
--- trunk/src/orxonox/overlays/notifications/Notification.h 2009-05-23 19:57:52 UTC (rev 3033)
+++ trunk/src/orxonox/overlays/notifications/Notification.h 2009-05-23 20:05:58 UTC (rev 3034)
@@ -55,10 +55,10 @@
Notification(BaseObject* creator);
Notification(const std::string & message);
virtual ~Notification();
-
+
bool send(void); //!< Sends the Notification to the Notificationmanager, with sender NotificationManager::NONE;
bool send(const std::string & sender); //!< Sends the Notification to the Notificationmanager.
-
+
/**
@brief Checks whether the Notification was sent.
@return Returns true if the Notification was sent already.
@@ -71,19 +71,19 @@
*/
inline const std::string & getMessage(void) const
{ return this->message_; }
-
+
inline const std::string & getSender(void) const
{ return this->sender_; }
-
+
bool setMessage(const std::string & message); //!< Sets the message of the notification.
-
+
private:
std::string message_; //!< The Notification message.
std::string sender_; //!< The sender of the notification.
bool sent_; //!< Whether Notification has been sent, if so it cannot be changed.
-
+
void initialize(void);
-
+
};
}
Modified: trunk/src/orxonox/overlays/notifications/NotificationManager.h
===================================================================
--- trunk/src/orxonox/overlays/notifications/NotificationManager.h 2009-05-23 19:57:52 UTC (rev 3033)
+++ trunk/src/orxonox/overlays/notifications/NotificationManager.h 2009-05-23 20:05:58 UTC (rev 3034)
@@ -59,17 +59,17 @@
public:
NotificationManager();
virtual ~NotificationManager();
-
+
static const std::string ALL;
static const std::string NONE;
-
+
static NotificationManager & getInstance(); //! Returns a reference to the single instance of the NotificationManager.
bool registerNotification(Notification* notification); //!< Registers a Notification within the NotificationManager.
bool registerQueue(NotificationQueue* queue); //!< Registers a NotificationQueue within the NotificationManager.
-
+
bool getNotifications(NotificationQueue* queue, std::multimap<std::time_t,Notification*>* map, const std::time_t & timeFrameStart, const std::time_t & timeFrameEnd); //!< Returns the Notifications for a specific NotificationQueue in a specified timeframe.
-
+
/**
@brief Fetches the Notifications for a specific NotificationQueue starting at a specified time.
@param queue The NotificationQueue the Notifications are fetched for.
@@ -88,17 +88,17 @@
*/
bool getNotifications(NotificationQueue* queue, std::multimap<std::time_t,Notification*>* map, int timeDelay)
{ return this->getNotifications(queue, map, std::time(0)-timeDelay, std::time(0)); }
-
+
private:
static NotificationManager* singletonRef_s;
int highestIndex_; //!< This variable holds the highest index (resp. key) in notificationLists_s, to secure that no key appears twice.
-
+
std::multimap<std::time_t,Notification*> allNotificationsList_; //!< Container where all notifications are stored (together with their respecive timestamps).
std::map<NotificationQueue*,int> queueList_; //!< Container where all NotificationQueues are stored with a number as identifier.
std::map<int,std::multimap<std::time_t,Notification*>*> notificationLists_; //!< Container where all Notifications, for each identifier (associated with a NotificationQueue), are stored.
-
+
};
}
More information about the Orxonox-commit
mailing list