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

Timestamp:

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

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

@@ -31 +31 @@
 
 #include "OrxonoxPrereqs.h"
-#include "Billboard.h"
-#include "objects/Tickable.h"
-#include "tools/Timer.h"
+#include "FadingBillboard.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport Backlight : public Billboard, public Tickable
+    class _OrxonoxExport Backlight : public FadingBillboard
     {
         public:
@@ -47 +45 @@
 
             virtual void tick(float dt);
-            virtual void changedActivity();
             virtual void changedVisibility();
 
@@ -59 +56 @@
             inline float getLifetime() const
                 { return this->lifetime_; }
-
-            inline void setTurnOffTime(float turnofftime)
-                { this->turnofftime_ = turnofftime; }
-            inline float getTurnOffTime() const
-                { return this->turnofftime_; }
 
             inline void setLength(float length)
@@ -83 +75 @@
 
         private:
-            void stopturnoff();
+            virtual void startturnonoff();
+            virtual void stopturnonoff();
+            virtual void poststopturnonoff();
             virtual void changedColour();
             void update_width();
@@ -96 +90 @@
             float length_;
             float lifetime_;
-            float turnofftime_;
-            bool bTurningOff_;
             size_t maxelements_;
             std::string trailmaterial_;
             char tickcount_;
-            Timer<Backlight> turnofftimer_;
     };
 }