Changeset 8426 for code/branches/bigships/src/orxonox/worldentities/pawns/SpaceShip.h

Timestamp:

May 9, 2011, 2:59:07 PM (13 years ago)

Author:

decryphe

Message:

• Moved handling of blur effect from Engine.cc to SpaceShip.cc.
• Implemented handling of multiple engines per SpaceShip, so that in future it would be possible to turn single engines on/off individually (for example if one gets destroyed on a big ship).
• Updated some pointers accessing the single Engine of a SpaceShip to ask the SpaceShip itself instead for data.

File:

• code/branches/bigships/src/orxonox/worldentities/pawns/SpaceShip.h (modified) (4 diffs)

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

@@ -59 +59 @@
 
             virtual void fire();
-            virtual void boost();
+            virtual void boost(bool bBoost); // Starts or stops boosting.
 
-            void setEngine(Engine* engine);
-            inline Engine* getEngine() const
-                { return this->engine_; }
+                        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
 
             inline void setSteeringDirection(const Vector3& direction)
@@ -69 +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); }
 
-            void setBoost(bool bBoost);
             inline bool getBoost() const
                 { return this->bBoost_; }
-
-            inline void setEngineTemplate(const std::string& temp)
-                { this->enginetemplate_ = temp; this->loadEngineTemplate(); }
-            inline const std::string& getEngineTemplate() const
-                { return this->enginetemplate_; }
-
-            inline void setPermanentBoost(bool bPermanent)
-                { this->bPermanentBoost_ = bPermanent; }
-            inline bool getPermanentBoost() const
-                { return this->bPermanentBoost_; }
 
         protected:
@@ -90 +93 @@
             bool bBoost_;
             bool bBoostCooldown_;
-            bool bPermanentBoost_;
             float boostPower_;
             float initialBoostPower_;
@@ -106 +108 @@
             void registerVariables();
             virtual bool isCollisionTypeLegal(WorldEntity::CollisionType type) const;
-
-            void loadEngineTemplate();
             
+                        //All things booster
+                        void changedEnableMotionBlur();
             void boostCooledDown(void);
 
-            std::string enginetemplate_;
-            Engine* engine_;
+                        Shader* boostBlur_;
+            float blurStrength_;
+            bool bEnableMotionBlur_;
+
+                        std::vector<Engine*> engineList_;
+                        int engineTicksNotDone; // Used for knowing when to reset temporary variables.
             Timer timer_;
     };