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

Timestamp:

Jan 3, 2014, 1:50:22 PM (10 years ago)

Author:

landauf

Message:

replaced tabs with spaces. no changes in code

Location:

code/trunk/src/modules/objects

Files:

• ForceField.cc (modified) (1 diff)
• Turret.cc (modified) (2 diffs)

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

@@ -203 +203 @@
         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));
-                    }
-                }
+            // 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));
+                }
+            }
         }
     }

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

@@ -57 +57 @@
     void Turret::rotatePitch(const Vector2& value)
     {
-        orxout()<< "Turret rotate Pitch"<< endl;
+        orxout()<< "Turret rotate Pitch"<< endl;
 
-        const Quaternion& orient = this->getOrientation();
-        Radian pitch = orient.getPitch();
+        const Quaternion& orient = this->getOrientation();
+        Radian pitch = orient.getPitch();
 
-        if((value.x > 0 && pitch < Radian(180)) || (value.x < 0 && pitch > Radian(0)))
-                SpaceShip::rotatePitch(value);
+        if((value.x > 0 && pitch < Radian(180)) || (value.x < 0 && pitch > Radian(0)))
+            SpaceShip::rotatePitch(value);
     }
 
@@ -69 +69 @@
     void Turret::setAlertnessRadius(float value)
     {
-        this->controller_->setAlertnessRadius(value);
+        this->controller_->setAlertnessRadius(value);
     }
     float Turret::getAlertnessRadius()
     {
-        return this->controller_->getAlertnessRadius();
+        return this->controller_->getAlertnessRadius();
     }