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

Timestamp:

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

Author:

dafrick

Message:

Converting tabs to spaces.

Location:

code/branches/bigships/src/orxonox/worldentities

Files:

• MobileEntity.cc (modified) (1 diff)
• MobileEntity.h (modified) (1 diff)
• pawns/SpaceShip.cc (modified) (8 diffs)
• pawns/SpaceShip.h (modified) (3 diffs)

code/branches/bigships/src/orxonox/worldentities/MobileEntity.cc

@@ -143 +143 @@
     {
         if (this->isDynamic())
-                {
+        {
             this->physicalBody_->applyCentralForce(btVector3(acceleration.x * this->getMass(), acceleration.y * this->getMass(), acceleration.z * this->getMass()));
-                }
-
-                // If not bullet-managed (deprecated? SpaceShip doesn't use this anymore for movement)
+        }
+
+        // If not bullet-managed (deprecated? SpaceShip doesn't use this anymore for movement)
         this->linearAcceleration_ = acceleration;
     }
 
-        void MobileEntity::addAcceleration(const Vector3 &acceleration, const Vector3 &relativePosition)
-        {
-                if(this->isDynamic())
-                {
-                        this->physicalBody_->applyForce(this->getMass() * btVector3(acceleration.x, acceleration.y, acceleration.z), btVector3(relativePosition.x, relativePosition.y, relativePosition.z));
-                }
-        }
+    void MobileEntity::addAcceleration(const Vector3 &acceleration, const Vector3 &relativePosition)
+    {
+        if(this->isDynamic())
+        {
+            this->physicalBody_->applyForce(this->getMass() * btVector3(acceleration.x, acceleration.y, acceleration.z), btVector3(relativePosition.x, relativePosition.y, relativePosition.z));
+        }
+    }
 
     void MobileEntity::setAngularAcceleration(const Vector3& acceleration)

code/branches/bigships/src/orxonox/worldentities/MobileEntity.h

@@ -70 +70 @@
                 { return this->linearAcceleration_; }
 
-                        // Added for making N engines work with spaceships
-                        void addAcceleration(const Vector3& acceleration, const Vector3 &relativePosition);
-                        inline void addAcceleration(float x, float y, float z)
-                                { this->addAcceleration(Vector3(x, y, z), Vector3(0,0,0)); }
-                        // Getter function above
+            // Added for making N engines work with spaceships
+            void addAcceleration(const Vector3& acceleration, const Vector3 &relativePosition);
+            inline void addAcceleration(float x, float y, float z)
+                { this->addAcceleration(Vector3(x, y, z), Vector3(0,0,0)); }
+            // Getter function above
 
             void setAngularAcceleration(const Vector3& acceleration);

code/branches/bigships/src/orxonox/worldentities/pawns/SpaceShip.cc

@@ -77 +77 @@
         this->enableCollisionCallback();
 
-                this->engineTicksNotDone = 0;
+        this->engineTicksNotDone = 0;
         this->setConfigValues();
         this->registerVariables();
@@ -87 +87 @@
         {
             this->removeAllEngines();
-                
+        
             if (this->boostBlur_)
                 this->boostBlur_->destroy();
@@ -106 +106 @@
         XMLPortParamVariable(SpaceShip, "boostCooldownDuration", boostCooldownDuration_, xmlelement, mode);
 
-                XMLPortObject(SpaceShip, Engine, "engines", addEngine, getEngine, xmlelement, mode);
+        XMLPortObject(SpaceShip, Engine, "engines", addEngine, getEngine, xmlelement, mode);
     }
 
@@ -123 +123 @@
     {
         SetConfigValue(bInvertYAxis_, false).description("Set this to true for joystick-like mouse behaviour (mouse up = ship down).");
-                
+        
         SetConfigValueExternal(bEnableMotionBlur_, "GraphicsSettings", "enableMotionBlur", true)
             .description("Enable or disable the motion blur effect when moving very fast")
@@ -149 +149 @@
         if (this->hasLocalController())
         {
-                        // Handle mouse look
+            // Handle mouse look
             if (!this->isInMouseLook())
             {
@@ -157 +157 @@
             this->localAngularAcceleration_.setValue(0, 0, 0);
 
-                        // Charge boostPower
+            // Charge boostPower
             if(!this->bBoostCooldown_ && this->boostPower_ < this->initialBoostPower_)
             {
                 this->boostPower_ += this->boostPowerRate_*dt;
             }
-                        // Use boostPower
+            // Use boostPower
             if(this->bBoost_)
             {
@@ -174 +174 @@
             }
 
-                        // Enable Blur depending on settings
-                        if (this->bEnableMotionBlur_ && !this->boostBlur_ && this->hasLocalController() && this->hasHumanController())
-                        {
-                                this->boostBlur_ = new Shader(this->getScene()->getSceneManager());
-                                this->boostBlur_->setCompositorName("Radial Blur");
-                        }
-
-                        if (this->boostBlur_) // && this->maxSpeedFront_ != 0 && this->boostFactor_ != 1)
-                        {
-                                // TODO: this->maxSpeedFront_ gets fastest engine
-                                float blur = this->blurStrength_ * clamp((-this->getLocalVelocity().z - 0.0f /*this->maxSpeedFront_*/) / ((150.0f /*boostFactor_*/ - 1) * 1.5f /*this->maxSpeedFront_*/), 0.0f, 1.0f);
-
-                                // Show and hide blur effect depending on state of booster
-                                if(this->bBoost_)
-                                        this->boostBlur_->setVisible(blur > 0);
-                                else
-                                        this->boostBlur_->setVisible(false);
-
-                                this->boostBlur_->setParameter(0, 0, "sampleStrength", blur);
-                        }
+            // Enable Blur depending on settings
+            if (this->bEnableMotionBlur_ && !this->boostBlur_ && this->hasLocalController() && this->hasHumanController())
+            {
+                this->boostBlur_ = new Shader(this->getScene()->getSceneManager());
+                this->boostBlur_->setCompositorName("Radial Blur");
+            }
+
+            if (this->boostBlur_) // && this->maxSpeedFront_ != 0 && this->boostFactor_ != 1)
+            {
+                // TODO: this->maxSpeedFront_ gets fastest engine
+                float blur = this->blurStrength_ * clamp((-this->getLocalVelocity().z - 0.0f /*this->maxSpeedFront_*/) / ((150.0f /*boostFactor_*/ - 1) * 1.5f /*this->maxSpeedFront_*/), 0.0f, 1.0f);
+
+                // Show and hide blur effect depending on state of booster
+                if(this->bBoost_)
+                    this->boostBlur_->setVisible(blur > 0);
+                else
+                    this->boostBlur_->setVisible(false);
+
+                this->boostBlur_->setParameter(0, 0, "sampleStrength", blur);
+            }
         }
     }
@@ -259 +259 @@
     }
 
-        void SpaceShip::addEngine(orxonox::Engine* engine)
-        {
-                //COUT(0)<<"Adding an Engine: " << engine << endl;
-                this->engineList_.push_back(engine);
-                engine->addToSpaceShip(this);
-                this->resetEngineTicks();
-        }
-        bool SpaceShip::hasEngine(Engine* engine)
-        {
-                for(unsigned int i=0; i<this->engineList_.size(); i++)
-                {
-                        if(this->engineList_[i]==engine)
-                                return true;
-                }
-                return false;
-        }
-        Engine* SpaceShip::getEngine(unsigned int i)
-        {
-                if(this->engineList_.size()>=i)
-                        return 0;
-                else
-                        return this->engineList_[i];
-        }
-        void SpaceShip::removeAllEngines()
-        {
-                for(unsigned int i=0; i<this->engineList_.size(); i++)
-                        this->engineList_[i]->~Engine();
-        }
-
-        void SpaceShip::setSpeedFactor(float factor)
-        {
-                for(unsigned int i=0; i<this->engineList_.size(); i++)
-                        this->engineList_[i]->setSpeedFactor(factor);
-        }
-        float SpaceShip::getSpeedFactor() // Calculate mean SpeedFactor.
-        {
-                float ret = 0; unsigned int i = 0;
-                for(; i<this->engineList_.size(); i++)
-                        ret += this->engineList_[i]->getSpeedFactor();
-                ret /= (float)i;
-                return ret;
-        }
-        float SpaceShip::getMaxSpeedFront()
-        {
-                float ret=0;
-                for(unsigned int i=0; i<this->engineList_.size(); i++)
-                {
-                        if(this->engineList_[i]->getMaxSpeedFront() > ret)
-                                ret = this->engineList_[i]->getMaxSpeedFront();
-                }
-                return ret;
-        }
-        float SpaceShip::getBoostFactor()
-        {
-                float ret = 0; unsigned int i=0;
-                for(; i<this->engineList_.size(); i++)
-                        ret += this->engineList_[i]->getBoostFactor();
-                ret /= (float)i;
-                return ret;
-        }
+    void SpaceShip::addEngine(orxonox::Engine* engine)
+    {
+        //COUT(0)<<"Adding an Engine: " << engine << endl;
+        this->engineList_.push_back(engine);
+        engine->addToSpaceShip(this);
+        this->resetEngineTicks();
+    }
+    bool SpaceShip::hasEngine(Engine* engine)
+    {
+        for(unsigned int i=0; i<this->engineList_.size(); i++)
+        {
+            if(this->engineList_[i]==engine)
+                return true;
+        }
+        return false;
+    }
+    Engine* SpaceShip::getEngine(unsigned int i)
+    {
+        if(this->engineList_.size()>=i)
+            return 0;
+        else
+            return this->engineList_[i];
+    }
+    void SpaceShip::removeAllEngines()
+    {
+        for(unsigned int i=0; i<this->engineList_.size(); i++)
+            this->engineList_[i]->~Engine();
+    }
+
+    void SpaceShip::setSpeedFactor(float factor)
+    {
+        for(unsigned int i=0; i<this->engineList_.size(); i++)
+            this->engineList_[i]->setSpeedFactor(factor);
+    }
+    float SpaceShip::getSpeedFactor() // Calculate mean SpeedFactor.
+    {
+        float ret = 0; unsigned int i = 0;
+        for(; i<this->engineList_.size(); i++)
+            ret += this->engineList_[i]->getSpeedFactor();
+        ret /= (float)i;
+        return ret;
+    }
+    float SpaceShip::getMaxSpeedFront()
+    {
+        float ret=0;
+        for(unsigned int i=0; i<this->engineList_.size(); i++)
+        {
+            if(this->engineList_[i]->getMaxSpeedFront() > ret)
+                ret = this->engineList_[i]->getMaxSpeedFront();
+        }
+        return ret;
+    }
+    float SpaceShip::getBoostFactor()
+    {
+        float ret = 0; unsigned int i=0;
+        for(; i<this->engineList_.size(); i++)
+            ret += this->engineList_[i]->getBoostFactor();
+        ret /= (float)i;
+        return ret;
+    }
 
     std::vector<PickupCarrier*>* SpaceShip::getCarrierChildren(void) const
     {
         std::vector<PickupCarrier*>* list = new std::vector<PickupCarrier*>();
-                for(unsigned int i=0; i<this->engineList_.size(); i++)
-                        list->push_back(this->engineList_[i]);
+        for(unsigned int i=0; i<this->engineList_.size(); i++)
+            list->push_back(this->engineList_[i]);
         return list;
     }
-        
-        void SpaceShip::changedEnableMotionBlur()
+    
+    void SpaceShip::changedEnableMotionBlur()
     {
         if (!this->bEnableMotionBlur_)

code/branches/bigships/src/orxonox/worldentities/pawns/SpaceShip.h

@@ -61 +61 @@
             virtual void boost(bool bBoost); // Starts or stops boosting.
 
-                        void addEngine(Engine* engine);
-                        bool hasEngine(Engine* engine);
-                        Engine* getEngine(unsigned int i); // This one's for XMLPort
-                        inline const std::vector<Engine*>& getEngineList()
-                                { return this->engineList_; }
-                        void removeAllEngines();
+            void addEngine(Engine* engine);
+            bool hasEngine(Engine* engine);
+            Engine* getEngine(unsigned int i); // This one's for XMLPort
+            inline const std::vector<Engine*>& getEngineList()
+                { return this->engineList_; }
+            void removeAllEngines();
 
-                        void setSpeedFactor(float factor);
-                        float getSpeedFactor(); // Gets mean speed factor
-                        float getMaxSpeedFront(); // gets largest speed forward
-                        float getBoostFactor(); // gets mean boost factor
+            void setSpeedFactor(float factor);
+            float getSpeedFactor(); // Gets mean speed factor
+            float getMaxSpeedFront(); // gets largest speed forward
+            float getBoostFactor(); // gets mean boost factor
 
             inline void setSteeringDirection(const Vector3& direction)
@@ -77 +77 @@
             inline const Vector3& getSteeringDirection() const
                 { return this->steering_; }
-                        inline void resetEngineTicks()
-                                { this->engineTicksNotDone = this->engineList_.size(); }
-                        inline void oneEngineTickDone()
-                                { this->engineTicksNotDone--; }
-                        inline const bool hasEngineTicksRemaining()
-                                { return (this->engineTicksNotDone>0); }
+            inline void resetEngineTicks()
+                { this->engineTicksNotDone = this->engineList_.size(); }
+            inline void oneEngineTickDone()
+                { this->engineTicksNotDone--; }
+            inline const bool hasEngineTicksRemaining()
+                { return (this->engineTicksNotDone>0); }
 
             inline bool getBoost() const
@@ -109 +109 @@
             virtual bool isCollisionTypeLegal(WorldEntity::CollisionType type) const;
             
-                        //All things booster
-                        void changedEnableMotionBlur();
+            //All things booster
+            void changedEnableMotionBlur();
             void boostCooledDown(void);
 
-                        Shader* boostBlur_;
+            Shader* boostBlur_;
             float blurStrength_;
             bool bEnableMotionBlur_;
 
-                        std::vector<Engine*> engineList_;
-                        int engineTicksNotDone; // Used for knowing when to reset temporary variables.
+            std::vector<Engine*> engineList_;
+            int engineTicksNotDone; // Used for knowing when to reset temporary variables.
             Timer timer_;
     };