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

Timestamp:

Nov 24, 2008, 1:50:47 AM (15 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/ControllableEntity.h (modified) (3 diffs)

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/ControllableEntity.h

@@ -68 +68 @@
             virtual void altFire() {}
 
+            virtual void boost() {}
             virtual void greet() {}
             virtual void use() {}
@@ -123 +124 @@
                 { return this->cameraPositionTemplate_; }
 
+            inline bool hasLocalController() const
+                { return this->bHasLocalController_; }
+            inline bool hasHumanController() const
+                { return this->bHasHumanController_; }
+
         protected:
-            virtual void startLocalControl();
-            virtual void stopLocalControl();
+            virtual void startLocalHumanControl();
+            virtual void stopLocalHumanControl();
 
             inline void setHudTemplate(const std::string& name)
                 { this->hudtemplate_ = name; }
-
-            inline bool isLocallyControlled() const
-                { return this->bControlled_; }
 
             Vector3 acceleration_;
@@ -154 +157 @@
             Vector3 velocity_;
 
-            bool bControlled_;
+            bool bHasLocalController_;
+            bool bHasHumanController_;
+
             Vector3 server_position_;
             Vector3 client_position_;