Changeset 2254 for code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/SpaceShip.h

Timestamp:

Nov 24, 2008, 1:50:47 AM (16 years ago)

Author:

landauf

Message:

Update your media repository and delete keybindings.ini if you want to use boost (space).

• Added new class "Engine" to control the speed of a SpaceShip (Engine is an Item, MultiStateEngine is a specialized version of Engine)
• Added FadingBillboard, a billboard with the ability to fade in and out smoothly when activated/deactivated.
• Several changes in Backlight, it's now a child of FadingBillboard
• Some changes concerning local control in ControllableEntity
• Fixed a bug in WorldEntity caused by different destruction order of attached objects on server and client
• Added a "MainState" to BaseObject. An object has several states (activity, visibility, …) and one of it can be defined as "MainState" in the XML file. Other objects can change this state without knowing which state it really is (used by MultiStateEngine).

File:

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

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/pawns/SpaceShip.h

@@ -56 +56 @@
 
             virtual void fire();
+            virtual void boost();
 
-            void setMaxSpeed(float value)
-                { this->maxSpeed_ = value; }
-            void setMaxSecondarySpeed(float value)
-                { this->maxSecondarySpeed_ = value; }
             void setMaxRotation(const Degree& value)
                 { this->maxRotation_ = value; }
-            void setTransAcc(float value)
-                { this->translationAcceleration_ = value; }
             void setRotAcc(const Degree& value)
                 { this->rotationAcceleration_ = value; }
@@ -70 +65 @@
                 { this->translationDamping_ = value; }
 
-            inline float getMaxSpeed() const
-                { return this->maxSpeed_; }
-            inline float getMaxSecondarySpeed() const
-                { return this->maxSecondarySpeed_; }
             inline float getMaxRotation() const
                 { return this->maxRotation_.valueDegrees(); }
-            inline float getTransAcc() const
-                { return this->translationAcceleration_; }
             inline float getRotAcc() const
                 { return this->rotationAcceleration_.valueDegrees(); }
@@ -83 +72 @@
                 { return this->translationDamping_; }
 
+            inline void setSteeringDirection(const Vector3& direction)
+                { this->steering_ = direction; }
+            inline const Vector3& getSteeringDirection() const
+                { return this->steering_; }
+
+            inline void setBoost(bool bBoost)
+                { this->bBoost_ = 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_; }
+
         protected:
             bool bInvertYAxis_;
 
-            float maxSpeed_;
-            float maxSecondarySpeed_;
-            float translationAcceleration_;
+            bool bBoost_;
+            Vector3 steering_;
             float translationDamping_;
 
@@ -98 +101 @@
             Degree yawRotation_;
             Degree rollRotation_;
+
+        private:
+            void loadEngineTemplate();
+
+            std::string enginetemplate_;
+            Engine* engine_;
     };
 }