Changeset 7674 for code/trunk/src

Timestamp:

Nov 26, 2010, 12:01:53 AM (14 years ago)

Author:

dafrick

Message:

Resolving some stupid bugs and some adding some minor improvements.

Location:

code/trunk/src/modules/objects

Files:

• ForceField.cc (modified) (7 diffs)
• ForceField.h (modified) (3 diffs)

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

@@ -42 +42 @@
     CreateFactory(ForceField);
     
-    /*static*/ const std::string modeStringNormal_s = "tube";
-    /*static*/ const std::string modeStringSphere_s = "sphere";
+    /*static*/ const std::string ForceField::modeTube_s = "tube";
+    /*static*/ const std::string ForceField::modeSphere_s = "sphere";
 
     ForceField::ForceField(BaseObject* creator) : StaticEntity(creator)
@@ -54 +54 @@
         this->diameter_ = 500;
         this->length_ = 5000;
-        this->mode_ = ForceFieldMode::tube;
+        this->mode_ = forceFieldMode::tube;
     }
 
@@ -70 +70 @@
         XMLPortParam(ForceField, "length"  , setLength  , getLength  , xmlelement, mode).defaultValues(2000);
         XMLPortParam(ForceField, "mode", setMode, getMode, xmlelement, mode);
+        COUT(0) << "ForceField created " << this->velocity_ << " " << this->diameter_ << " " << this->radius_ << " " << this->length_ << " " << this->halfLength_ << " " << this->getMode() << std::endl;
     }
 
     void ForceField::tick(float dt)
     {
-        // Iterate over all objects that could possibly be affected by the ForceField.
-        for (ObjectList<MobileEntity>::iterator it = ObjectList<MobileEntity>::begin(); it != ObjectList<MobileEntity>::end(); ++it)
+        if(this->mode_ == forceFieldMode::tube)
         {
-            if(this->mode_ == ForceFieldMode::tube)
+            // Iterate over all objects that could possibly be affected by the ForceField.
+            for (ObjectList<MobileEntity>::iterator it = ObjectList<MobileEntity>::begin(); it != ObjectList<MobileEntity>::end(); ++it)
             {
                 // The direction of the orientation of the force field.
@@ -89 +90 @@
                 // The object is outside of the length of the ForceField.
                 if(distanceVector.length() > this->halfLength_)
-                    return;
+                    continue;
 
                 // The distance of the object form the orientation vector. (Or rather the smallest distance from the orientation vector)
@@ -96 +97 @@
                 // If the object in a tube of radius diameter/2 around the direction of orientation.
                 if(distanceFromDirectionVector >= this->radius_)
-                    return;
+                    continue;
 
                 // Apply a force to the object in the direction of the orientation.
                 // The force is highest when the object is directly on the direction vector, with a linear decrease, finally reaching zero, when distanceFromDirectionVector = radius.
-                it->applyCentralForce(((this->radius_ - distanceFromDirectionVector)/(this->radius_)) * this->velocity_ * direction);
+                it->applyCentralForce((this->radius_ - distanceFromDirectionVector)/this->radius_ * this->velocity_ * direction);
             }
-            else if(this->mode_ == ForceFieldMode::sphere)
+        }
+        else if(this->mode_ == forceFieldMode::sphere)
+        {
+            // Iterate over all objects that could possibly be affected by the ForceField.
+            for (ObjectList<MobileEntity>::iterator it = ObjectList<MobileEntity>::begin(); it != ObjectList<MobileEntity>::end(); ++it)
             {
                 Vector3 distanceVector = it->getWorldPosition() - this->getWorldPosition();
@@ -117 +122 @@
     void ForceField::setMode(const std::string& mode)
     {
-        if(mode == ForceField::modeStringTube_s)
-            this->mode_ = ForceFieldMode::tube;
-        else if(mode == ForceField::modeStringSphere_s)
-            this->mode_ = ForceFieldMode::sphere;
+        if(mode == ForceField::modeTube_s)
+            this->mode_ = forceFieldMode::tube;
+        else if(mode == ForceField::modeSphere_s)
+            this->mode_ = forceFieldMode::sphere;
         else
         {
             COUT(2) << "Wrong mode '" << mode << "' in ForceField. Setting to 'tube'." << std::endl;
-            this->mode_ = ForceFieldMode::tube;
+            this->mode_ = forceFieldMode::tube;
         }
     }
@@ -132 +137 @@
         switch(this->mode_)
         {
-            case ForceFieldMode::tube:
-                return ForceField::modeStringTube_s;
-            case ForceFieldMode::sphere:
-                return ForceField::modeStringSphere_s;
+            case forceFieldMode::tube:
+                return ForceField::modeTube_s;
+            case forceFieldMode::sphere:
+                return ForceField::modeSphere_s;
             default:
-                return ForceField::modeStringTube_s;
+                return ForceField::modeTube_s;
         }
     }

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

@@ -56 +56 @@
     @inGroup Objects
     */
-    namespace ForceFieldMode
+    namespace forceFieldMode
     {
         enum Value {
@@ -116 +116 @@
 
         private:
-            static const std::string modeStringTube_s;
-            static const std::string modeStringSphere_s;
+            static const std::string modeTube_s;
+            static const std::string modeSphere_s;
         
             float velocity_;
@@ -124 +124 @@
             float length_;
             float halfLength_;
-            ForceFieldMode::Value mode_;
+            forceFieldMode::Value mode_;
   };
 }