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

Timestamp:

Jan 21, 2016, 1:59:04 PM (8 years ago)

Author:

muemart

Message:

Fix some clang-tidy warnings.
Also, Serialise.h was doing some C-style casts that ended up being const casts. I moved those const casts as close to the source as possible and changed the loadAndIncrease functions to not do that.

Location:

code/trunk/src/modules/objects

Files:

• ForceField.cc (modified) (2 diffs)
• ForceField.h (modified) (2 diffs)
• SpaceBoundaries.cc (modified) (1 diff)
• triggers/DistanceTrigger.h (modified) (1 diff)
• triggers/EventTrigger.h (modified) (1 diff)

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

@@ -63 +63 @@
         //Standard Values
         this->setDirection(Vector3::ZERO);
-        this->setVelocity(100);
+        this->setFieldVelocity(100);
         this->setDiameter(500);
         this->setMassDiameter(0);   //! We allow point-masses
@@ -88 +88 @@
         SUPER(ForceField, XMLPort, xmlelement, mode);
 
-        XMLPortParam(ForceField, "velocity", setVelocity, getVelocity, xmlelement, mode).defaultValues(100);
+        XMLPortParam(ForceField, "velocity", setFieldVelocity, getFieldVelocity, xmlelement, mode).defaultValues(100);
         XMLPortParam(ForceField, "diameter", setDiameter, getDiameter, xmlelement, mode).defaultValues(500);
         XMLPortParam(ForceField, "massDiameter", setMassDiameter, getMassDiameter, xmlelement, mode).defaultValues(0);

code/trunk/src/modules/objects/ForceField.h

@@ -98 +98 @@
             @param vel The velocity to be set.
             */
-            inline void setVelocity(float vel)
+            inline void setFieldVelocity(float vel)
                 { this->velocity_ = vel; }
             /**
@@ -104 +104 @@
             @return Returns the velocity of the ForceField.
             */
-            inline float getVelocity()
+            inline float getFieldVelocity()
                 { return this->velocity_; }
 

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

@@ -221 +221 @@
                     }
                 }
-                if(/* humanItem &&*/ abs(this->maxDistance_ - distance) < this->showDistance_ )
+                if(/* humanItem &&*/ std::abs(this->maxDistance_ - distance) < this->showDistance_ )
                 {
                     this->displayBoundaries(currentPawn, 1.0f - fabs(this->maxDistance_ - distance) / this->showDistance_); // Show the boundary

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

@@ -97 +97 @@
             virtual ~DistanceTrigger();
 
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode); // Method for creating a DistanceTrigger object through XML.
+            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override; // Method for creating a DistanceTrigger object through XML.
 
             void addTarget(const std::string& targets); // Add some target to the DistanceTrigger.

code/trunk/src/modules/objects/triggers/EventTrigger.h

@@ -73 +73 @@
             virtual ~EventTrigger();
 
-            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode); // Creates an event port.
+            virtual void XMLEventPort(Element& xmlelement, XMLPort::Mode mode) override; // Creates an event port.
 
             /**