Changeset 2063 for code/branches/objecthierarchy/src/orxonox

Timestamp:

Oct 29, 2008, 6:39:31 PM (16 years ago)

Author:

landauf

Message:

added events but not yet connected with triggers

Location:

code/branches/objecthierarchy/src/orxonox/objects/worldentities

Files:

• BlinkingBillboard.cc (modified) (3 diffs)
• BlinkingBillboard.h (modified) (2 diffs)

code/branches/objecthierarchy/src/orxonox/objects/worldentities/BlinkingBillboard.cc

@@ -43 +43 @@
         this->amplitude_ = 1.0f;
         this->frequency_ = 1.0f;
-        this->phase_ = 0.0f;
+        this->phase_ = 0;
         this->time_ = 0;
 
@@ -59 +59 @@
         XMLPortParam(BlinkingBillboard, "amplitude", setAmplitude, getAmplitude, xmlelement, mode).defaultValues(1.0f);
         XMLPortParam(BlinkingBillboard, "frequency", setFrequency, getFrequency, xmlelement, mode).defaultValues(1.0f);
-        XMLPortParam(BlinkingBillboard, "phase",     setPhase,     getPhase,     xmlelement, mode).defaultValues(0.0f);
+        XMLPortParam(BlinkingBillboard, "phase",     setPhase,     getPhase,     xmlelement, mode).defaultValues(Degree(0));
     }
 
@@ -72 +72 @@
     {
         this->time_ += dt;
-        this->setScale(this->amplitude_ * sin((6.2831853 + this->phase_) * this->frequency_ * this->time_));
+        this->setScale(this->amplitude_ * sin((6.2831853 * this->time_ + this->phase_.valueRadians()) * this->frequency_));
     }
 }

code/branches/objecthierarchy/src/orxonox/objects/worldentities/BlinkingBillboard.h

@@ -57 +57 @@
                 { return this->frequency_; }
 
-            inline void setPhase(float phase)
+            inline void setPhase(const Degree& phase)
                 { this->phase_ = phase; }
-            inline float getPhase() const
+            inline const Degree& getPhase() const
                 { return this->phase_; }
 
@@ -65 +65 @@
             float amplitude_;
             float frequency_;
-            float phase_;
+            Degree phase_;
             long double time_;
     };