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

Timestamp:

Dec 21, 2013, 11:16:54 PM (11 years ago)

Author:

jo

Message:

presentationHS13 branch merged into trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/objects/ForceField.cc (modified) (5 diffs)
• src/modules/objects/ForceField.h (modified) (6 diffs)

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

@@ -45 +45 @@
     /*static*/ const std::string ForceField::modeSphere_s = "sphere";
     /*static*/ const std::string ForceField::modeInvertedSphere_s = "invertedSphere";
+
+    /*static*/ const std::string ForceField::modeHomogen_s = "homogen";
+
     /*static*/ const std::string ForceField::modeNewtonianGravity_s = "newtonianGravity";
     /*static*/ const float ForceField::gravConstant_ = 6.673e-11;
     /*static*/ const float ForceField::attenFactor_ = 1;
+
 
     /**
@@ -89 +93 @@
         XMLPortParam(ForceField, "length", setLength  , getLength  , xmlelement, mode).defaultValues(2000);
         XMLPortParam(ForceField, "mode", setMode, getMode, xmlelement, mode);
+        XMLPortParam(ForceField, "forcedirection", setForceDirection, getForceDirection, xmlelement, mode).defaultValues(Vector3(0,-400,0));
     }
     
@@ -196 +201 @@
             }
         }
+        else if(this->mode_ == forceFieldMode::homogen)
+        {
+                // 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();
+                    float distance = distanceVector.length();
+                    if (distance < this->radius_ && distance > this->massRadius_)
+                    {
+                        // Add a Acceleration in forceDirection_.
+                        // Vector3(0,0,0) is the direction, where the force should work.
+                        it->addAcceleration(forceDirection_ , Vector3(0,0,0));
+                    }
+                }
+        }
     }
 
@@ -214 +234 @@
         else if(mode == ForceField::modeNewtonianGravity_s)
             this->mode_ = forceFieldMode::newtonianGravity;
+
+        else if(mode == ForceField::modeHomogen_s)
+            this->mode_ = forceFieldMode::homogen;
+
         else
         {
@@ -239 +263 @@
             case forceFieldMode::newtonianGravity:
                 return ForceField::modeNewtonianGravity_s;
+
+            case forceFieldMode::homogen:
+                return ForceField::modeHomogen_s;
+
             default:
                 return ForceField::modeTube_s;

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

@@ +1 @@
+
 /*
  *   ORXONOX - the hottest 3D action shooter ever to exist
@@ -57 +58 @@
             sphere, //!< The ForceField has a spherical shape.
             invertedSphere, //!< The ForceField has a spherical shape but "inverted" behavior.
-            newtonianGravity //!< The ForceField imitates Newtonian gravitation for use in stellar bodies.
+            newtonianGravity, //!< The ForceField imitates Newtonian gravitation for use in stellar bodies.
+            homogen //!< Local homogenous Force field with changeable direction for the Space Station
         };
     }
@@ -66 +68 @@
 
         The following parameters can be set to specify the behavior of the ForceField.
+        - @b forcedirection The direction and the strength of the homogenous force field. Default is 0,-400,0.
         - @b velocity The amount of force the ForceField excerts. Default is 100.
         - @b diameter The diameter of the ForceField. Default is 500.
@@ -147 +150 @@
                 { return this->halfLength_*2; }
 
+            inline void setForceDirection(Vector3 forcedir)
+                { this->forceDirection_ = forcedir; }
+
+            inline Vector3 getForceDirection()
+                { return this->forceDirection_; }
+
+
             void setMode(const std::string& mode); //!< Set the mode of the ForceField.
             const std::string& getMode(void); //!< Get the mode of the ForceField.
@@ -156 +166 @@
             static const std::string modeInvertedSphere_s;
             static const std::string modeNewtonianGravity_s;
+
+            static const std::string modeHomogen_s;
 
             float velocity_; //!< The velocity of the ForceField.
@@ -167 +179 @@
             //! Attenuation factor for Newtonian ForceFields
             static const float attenFactor_;
+            Vector3 forceDirection_;
   };
 }