Changeset 8588 for code/branches/bigships/src/orxonox/items

Timestamp:

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

Author:

dafrick

Message:

Converting tabs to spaces.

Location:

code/branches/bigships/src/orxonox/items

Files:

• Engine.cc (modified) (5 diffs)
• Engine.h (modified) (4 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);
+            }
+        }
+    }
 }

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

@@ -55 +55 @@
                 { return this->ship_; }
 
-                        inline void setRelativePosition(const Vector3 &position)
-                                { this->relativePosition_ = position; }
-                        inline Vector3& getRelativePosition()
-                                { return this->relativePosition_; }
+            inline void setRelativePosition(const Vector3 &position)
+                { this->relativePosition_ = position; }
+            inline Vector3& getRelativePosition()
+                { return this->relativePosition_; }
 
             inline void setBoostFactor(float factor)
@@ -124 +124 @@
                 { this->speedMultiply_=speedMultiply; }
 
-                        
+            
             inline void setEngineTemplate(const std::string& temp)
                 { this->engineTemplate_ = temp; this->loadEngineTemplate(); }
@@ -134 +134 @@
                 { return new std::vector<PickupCarrier*>(); }
             virtual PickupCarrier* getCarrierParent(void) const;
-                        
+            
             void loadEngineTemplate();
 
@@ -141 +141 @@
             void networkcallback_shipID();
 
-                        std::string engineTemplate_;
+            std::string engineTemplate_;
 
             SpaceShip* ship_;
             unsigned int shipID_;
-                        Vector3 relativePosition_;
+            Vector3 relativePosition_;
 
             float boostFactor_;