Changeset 8588 for code/branches/bigships/src/orxonox/items/Engine.cc

Timestamp:

May 26, 2011, 12:04:42 AM (13 years ago)

Author:

dafrick

Message:

Converting tabs to spaces.

File:

• code/branches/bigships/src/orxonox/items/Engine.cc (modified) (5 diffs)

code/branches/bigships/src/orxonox/items/Engine.cc

@@ -47 +47 @@
         this->ship_ = 0;
         this->shipID_ = OBJECTID_UNKNOWN;
-                this->relativePosition_ = Vector3(0,0,0);
+        this->relativePosition_ = Vector3(0,0,0);
 
         this->boostFactor_ = 1.5;
@@ -72 +72 @@
     Engine::~Engine()
     {
-        if (this->isInitialized() && this->ship_)
-        {
-            //this->ship_->setEngine(0);
-
-            //if (this->boostBlur_)
-            //    this->boostBlur_->destroy();
-        }
+
     }
 
@@ -98 +92 @@
         XMLPortParam(Engine, "accelerationupdown",    setAccelerationUpDown,    setAccelerationUpDown,    xmlelement, mode);
 
-                XMLPortParam(Engine, "position", setRelativePosition, getRelativePosition, xmlelement, mode);
-                XMLPortParam(Engine, "template", setEngineTemplate, getEngineTemplate, xmlelement, mode);
+        XMLPortParam(Engine, "position", setRelativePosition, getRelativePosition, xmlelement, mode);
+        XMLPortParam(Engine, "template", setEngineTemplate, getEngineTemplate, xmlelement, mode);
     }
 
@@ -199 +193 @@
         }
 
-                // NOTE: Bullet always uses global coordinates.
+        // NOTE: Bullet always uses global coordinates.
         this->ship_->addAcceleration(this->ship_->getOrientation() * (acceleration*this->getSpeedMultiply()+Vector3(0,0,-this->getSpeedAdd())), this->ship_->getOrientation() * this->relativePosition_);
 
-
-                // Hack to reset a temporary variable "direction"
-                this->ship_->oneEngineTickDone();
-                if(!this->ship_->hasEngineTicksRemaining())
-                {
-                        this->ship_->setSteeringDirection(Vector3::ZERO);
-                        this->ship_->resetEngineTicks();
-                }
+        // Hack to reset a temporary variable "direction"
+        this->ship_->oneEngineTickDone();
+        if(!this->ship_->hasEngineTicksRemaining())
+        {
+            this->ship_->setSteeringDirection(Vector3::ZERO);
+            this->ship_->resetEngineTicks();
+        }
     }
 
@@ -247 +240 @@
     }
 
-        void Engine::loadEngineTemplate()
-        {
-                if(!this->engineTemplate_.empty())
-                {
-                        COUT(4)<<"Loading an engine template: "<<this->engineTemplate_<<"\n";
-                        Template *temp = Template::getTemplate(this->engineTemplate_);
-                        if(temp)
-                        {
-                                this->addTemplate(temp);
-                        }
-                }
-        }
+    void Engine::loadEngineTemplate()
+    {
+        if(!this->engineTemplate_.empty())
+        {
+            COUT(4)<<"Loading an engine template: "<<this->engineTemplate_<<"\n";
+            Template *temp = Template::getTemplate(this->engineTemplate_);
+            if(temp)
+            {
+                this->addTemplate(temp);
+            }
+        }
+    }
 }