Changeset 6417 for code/trunk/src/modules/objects

Timestamp:

Dec 25, 2009, 10:23:58 PM (15 years ago)

Author:

rgrieder

Message:

Merged presentation2 branch back to trunk.
Major new features:

• Actual GUI with settings, etc.
• Improved space ship steering (human interaction)
• Rocket fire and more particle effects
• Advanced sound framework

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/objects/Attacher.cc (modified) (2 diffs)
• src/modules/objects/collisionshapes/BoxCollisionShape.cc (modified) (1 diff)
• src/modules/objects/collisionshapes/ConeCollisionShape.cc (modified) (1 diff)
• src/modules/objects/collisionshapes/PlaneCollisionShape.cc (modified) (1 diff)
• src/modules/objects/eventsystem/EventFilter.cc (modified) (1 diff)
• src/modules/objects/eventsystem/EventListener.cc (modified) (3 diffs)
• src/modules/objects/eventsystem/EventTarget.cc (modified) (4 diffs)
• src/modules/objects/eventsystem/EventTarget.h (modified) (2 diffs)
• src/modules/objects/triggers/DistanceTrigger.cc (modified) (1 diff)
• src/modules/objects/triggers/Trigger.cc (modified) (1 diff)

code/trunk/src/modules/objects/Attacher.cc

@@ -98 +98 @@
         this->target_ = 0;
 
-        if (this->targetname_ == "")
+        if (this->targetname_.empty())
             return;
 
@@ -113 +113 @@
     void Attacher::loadedNewXMLName(BaseObject* object)
     {
-        if (this->target_ || this->targetname_ == "")
+        if (this->target_ || this->targetname_.empty())
             return;
 

code/trunk/src/modules/objects/collisionshapes/BoxCollisionShape.cc

@@ -66 +66 @@
         XMLPortParam(BoxCollisionShape, "halfExtents",  setHalfExtents,  getHalfExtents,  xmlelement, mode);
         XMLPortParamLoadOnly(BoxCollisionShape, "width",  setWidth,  xmlelement, mode);
-        XMLPortParamLoadOnly(BoxCollisionShape, "height", setHeight, xmlelement, mode);    
-        XMLPortParamLoadOnly(BoxCollisionShape, "length", setLength, xmlelement, mode);    
+        XMLPortParamLoadOnly(BoxCollisionShape, "height", setHeight, xmlelement, mode);
+        XMLPortParamLoadOnly(BoxCollisionShape, "length", setLength, xmlelement, mode);
     }
 

code/trunk/src/modules/objects/collisionshapes/ConeCollisionShape.cc

@@ -66 +66 @@
 
         XMLPortParam(ConeCollisionShape, "radius", setRadius, getRadius, xmlelement, mode);
-        XMLPortParam(ConeCollisionShape, "height", setHeight, getHeight, xmlelement, mode);    
+        XMLPortParam(ConeCollisionShape, "height", setHeight, getHeight, xmlelement, mode);
     }
 

code/trunk/src/modules/objects/collisionshapes/PlaneCollisionShape.cc

@@ -67 +67 @@
 
         XMLPortParam(PlaneCollisionShape, "normal", setNormal, getNormal, xmlelement, mode);
-        XMLPortParam(PlaneCollisionShape, "offset", setOffset, getOffset, xmlelement, mode);    
+        XMLPortParam(PlaneCollisionShape, "offset", setOffset, getOffset, xmlelement, mode);
     }
 

code/trunk/src/modules/objects/eventsystem/EventFilter.cc

@@ -62 +62 @@
         if (this->bActive_)
         {
-            COUT(2) << "Warning: Detected Event loop in EventFilter \"" << this->getName() << "\"" << std::endl;
+            COUT(2) << "Warning: Detected Event loop in EventFilter \"" << this->getName() << '"' << std::endl;
             return;
         }

code/trunk/src/modules/objects/eventsystem/EventListener.cc

@@ -58 +58 @@
         if (this->bActive_)
         {
-            COUT(2) << "Warning: Detected Event loop in EventListener \"" << this->getName() << "\"" << std::endl;
+            COUT(2) << "Warning: Detected Event loop in EventListener \"" << this->getName() << '"' << std::endl;
             return;
         }
@@ -71 +71 @@
         this->eventName_ = eventname;
 
-        if (this->eventName_ == "")
+        if (this->eventName_.empty())
             return;
 
@@ -81 +81 @@
     void EventListener::loadedNewXMLName(BaseObject* object)
     {
-        if (this->eventName_ == "")
+        if (this->eventName_.empty())
             return;
 

code/trunk/src/modules/objects/eventsystem/EventTarget.cc

@@ -45 +45 @@
     {
     }
-    
+
     void EventTarget::XMLPort(Element& xmlelement, XMLPort::Mode mode)
     {
@@ -60 +60 @@
         if (this->bActive_)
         {
-            COUT(2) << "Warning: Detected Event loop in EventTarget \"" << this->getName() << "\"" << std::endl;
+            COUT(2) << "Warning: Detected Event loop in EventTarget \"" << this->getName() << '"' << std::endl;
             return;
         }
@@ -72 +72 @@
     {
         this->target_ = name;
-        
+
         for (ObjectList<BaseObject>::iterator it = ObjectList<BaseObject>::begin(); it != ObjectList<BaseObject>::end(); ++it)
             if (it->getName() == this->target_)
@@ -80 +80 @@
     void EventTarget::loadedNewXMLName(BaseObject* object)
     {
-        if (this->target_ == "")
+        if (this->target_.empty())
             return;
 

code/trunk/src/modules/objects/eventsystem/EventTarget.h

@@ -42 +42 @@
             EventTarget(BaseObject* creator);
             virtual ~EventTarget();
-            
+
             virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode);
-            
+
             virtual void processEvent(Event& event);
 
@@ -54 +54 @@
             virtual void loadedNewXMLName(BaseObject* object);
             void addEventTarget(BaseObject* object);
-            
+
             std::string target_;
             bool bActive_;

code/trunk/src/modules/objects/triggers/DistanceTrigger.cc

@@ -92 +92 @@
     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;
+        COUT(1) << "Error: \"" << targets << "\" is not a valid class name to include in ClassTreeMask (in " << this->getName() << ", class " << this->getIdentifier()->getName() << ')' << std::endl;
         return;
     }

code/trunk/src/modules/objects/triggers/Trigger.cc

@@ -280 +280 @@
   {
     if (this->mode_ == TriggerMode::EventTriggerAND)
-      return std::string("and");
+      return "and";
     else if (this->mode_ == TriggerMode::EventTriggerOR)
-      return std::string("or");
+      return "or";
     else if (this->mode_ == TriggerMode::EventTriggerXOR)
-      return std::string("xor");
+      return "xor";
     else
-      return std::string("and");
+      return "and";
   }