Changeset 2207 for code/branches/objecthierarchy2

Timestamp:

Nov 14, 2008, 1:47:33 AM (16 years ago)

Author:

landauf

Message:

fixed Backlight initialization with a workaround, but there are still strange crashes.

Location:

code/branches/objecthierarchy2/src/orxonox/objects/worldentities

Files:

• Backlight.cc (modified) (10 diffs)
• Backlight.h (modified) (4 diffs)
• Billboard.cc (modified) (1 diff)
• WorldEntity.cc (modified) (1 diff)
• WorldEntity.h (modified) (1 diff)

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

@@ -35 +35 @@
 #include "core/Core.h"
 #include "core/CoreIncludes.h"
+#include "core/Executor.h"
 #include "core/XMLPort.h"
 #include "objects/Scene.h"
@@ -51 +52 @@
         this->width_ = 0;
         this->length_ = 1.0f;
-        this->lifetime_ = 1.0f;
+        this->lifetime_ = 0.001f;
+        this->turnofftime_ = 0.5f;
+        this->bTurningOff_ = false;
         this->maxelements_ = 1;
+
+        this->tickcount_ = 0;
 
         if (Core::showsGraphics())
@@ -61 +66 @@
 
             this->ribbonTrail_ = this->getScene()->getSceneManager()->createRibbonTrail(this->getNode()->getName());
+            this->ribbonTrail_->addNode(this->getNode());
             this->ribbonTrailNode_ = this->getScene()->getRootSceneNode()->createChildSceneNode();
             this->ribbonTrailNode_->attachObject(this->ribbonTrail_);
-            this->ribbonTrail_->addNode(this->getNode());
-
-            this->ribbonTrail_->setMaxChainElements(this->maxelements_);
-            this->ribbonTrail_->setTrailLength(this->length_);
-            this->ribbonTrail_->setInitialWidth(0, this->width_);
+            this->ribbonTrail_->setInitialWidth(0, 0);
         }
 
@@ -97 +99 @@
         XMLPortParam(Backlight, "elements",      setMaxElements,   getMaxElements,   xmlelement, mode).defaultValues(10);
         XMLPortParam(Backlight, "lifetime",      setLifetime,      getLifetime,      xmlelement, mode).defaultValues(1.0f);
+        XMLPortParam(Backlight, "turnofftime",   setTurnOffTime,   getTurnOffTime,   xmlelement, mode).defaultValues(0.5f);
         XMLPortParam(Backlight, "trailmaterial", setTrailMaterial, getTrailMaterial, xmlelement, mode);
     }
@@ -113 +116 @@
         Billboard::changedColour();
 
-        if (this->ribbonTrail_ && this->isActive())
+        if (this->ribbonTrail_ && this->isActive() && this->tickcount_ >= 2)
             this->ribbonTrail_->setInitialColour(0, this->getColour());
     }
@@ -119 +122 @@
     void Backlight::update_width()
     {
-        if (this->ribbonTrail_)
+        if (this->ribbonTrail_ && this->tickcount_ >= 2)
             this->ribbonTrail_->setInitialWidth(0, this->width_);
         this->update_lifetime();
@@ -126 +129 @@
     void Backlight::update_lifetime()
     {
-        if (this->ribbonTrail_)
+        if (this->ribbonTrail_ && this->tickcount_ >= 2)
         {
             this->ribbonTrail_->setWidthChange(0, this->width_ / this->lifetime_/* * Backlight::timeFactor_s*/);
@@ -135 +138 @@
     void Backlight::update_length()
     {
-//        if (this->ribbonTrail_)
-//            this->ribbonTrail_->setTrailLength(this->length_);
+        if (this->ribbonTrail_ && this->tickcount_ >= 2)
+            this->ribbonTrail_->setTrailLength(this->length_);
     }
 
     void Backlight::update_maxelements()
     {
-        if (this->ribbonTrail_)
+        if (this->ribbonTrail_ && this->tickcount_ >= 2)
             this->ribbonTrail_->setMaxChainElements(this->maxelements_);
     }
@@ -147 +150 @@
     void Backlight::update_trailmaterial()
     {
-        if (this->ribbonTrail_)
+        if (this->ribbonTrail_ && this->tickcount_ >= 2)
             this->ribbonTrail_->setMaterialName(this->trailmaterial_);
     }
@@ -168 +171 @@
                 this->ribbonTrail_->setInitialColour(0, this->getColour());
             else
-                this->ribbonTrail_->setInitialColour(0, 0, 0, 0, 0);
-        }
-    }
-
-    void Backlight::notifyAttached()
-    {
-        Billboard::notifyAttached();
-
-//        if (this->ribbonTrail_)
-//            this->ribbonTrail_->clearChain(0);
-
-//        if (this->ribbonTrail_)
-//            this->ribbonTrail_->setTrailLength(this->length_);
+            {
+                this->bTurningOff_ = true;
+                this->turnofftimer_.setTimer(this->turnofftime_, false, this, createExecutor(createFunctor(&Backlight::stopturnoff)));
+            }
+        }
+    }
+
+    void Backlight::stopturnoff()
+    {
+        this->bTurningOff_ = false;
     }
 
     void Backlight::tick(float dt)
     {
-        if (this->ribbonTrail_)
-            this->ribbonTrail_->setTrailLength(this->length_);
+        if (this->tickcount_ < 2)
+        {
+            ++this->tickcount_;
+            if (this->tickcount_ == 2)
+            {
+                this->changedColour();
+                this->update_width();
+                this->update_lifetime();
+                this->update_length();
+                this->update_maxelements();
+                this->update_trailmaterial();
+            }
+        }
+
+        if (this->bTurningOff_ && this->ribbonTrail_)
+        {
+            this->ribbonTrail_->setInitialColour(0, this->ribbonTrail_->getInitialColour(0) - this->getColour() / this->turnofftime_ * dt);
+        }
     }
 

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

@@ -33 +33 @@
 #include "Billboard.h"
 #include "objects/Tickable.h"
+#include "tools/Timer.h"
 
 namespace orxonox
@@ -59 +60 @@
                 { return this->lifetime_; }
 
+            inline void setTurnOffTime(float turnofftime)
+                { this->turnofftime_ = turnofftime; }
+            inline float getTurnOffTime() const
+                { return this->turnofftime_; }
+
             inline void setLength(float length)
                 { this->length_ = length; this->update_length(); }
@@ -74 +80 @@
                 { return this->trailmaterial_; }
 
-        protected:
-            virtual void notifyAttached();
-
         private:
+            void stopturnoff();
             virtual void changedColour();
             void update_width();
@@ -90 +94 @@
             float length_;
             float lifetime_;
+            float turnofftime_;
+            bool bTurningOff_;
             size_t maxelements_;
             std::string trailmaterial_;
+            char tickcount_;
+            Timer<Backlight> turnofftimer_;
     };
 

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/Billboard.cc

@@ -73 +73 @@
     void Billboard::changedMaterial()
     {
+        if (this->material_ == "")
+            return;
+
         if (!this->billboard_.getBillboardSet())
         {

code/branches/objecthierarchy2/src/orxonox/objects/worldentities/WorldEntity.cc

@@ -131 +131 @@
         object->parent_ = this;
         object->parentID_ = this->getObjectID();
-
-        object->notifyAttached();
     }
 

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

@@ -139 +139 @@
 
         protected:
-            virtual void notifyAttached() {}
-
             Ogre::SceneNode* node_;