Changeset 10445 in orxonox.OLD for trunk/src

Timestamp:

Jan 28, 2007, 3:24:45 PM (18 years ago)

Author:

patrick

Message:

merged blinki back to trunk

Location:

trunk/src/world_entities/effects

Files:

• blink.cc (modified) (5 diffs)
• blink.h (modified) (3 diffs)

trunk/src/world_entities/effects/blink.cc

@@ -35 +35 @@
   if(root)
     this->loadParams(root);
+
+  // calculation of the symbolTime
+  this->symbolTime = this->period / this->blinkSequence.length();
 }
 
@@ -60 +63 @@
   this->bBoard = new Billboard;
   this->bBoard->setVisibiliy(true);
-  this->bBoard->setTexture("maps/star_alpha.png");
+  this->bBoard->setTexture("textures/light/blink.png");
 
   /// Standard values
@@ -68 +71 @@
   // 10x10 pxl if not defined in xml
   this->size = 10;
-  // default angular rate
-  this->omega = 10;
+  // default period
+  this->period = 1;
+  // default blink sequence
+  this->blinkSequence = "00011234567889998876543211";
 
-  // random start angle, blinkies shouldn't blink synchronous
-  this->angle = (float)rand()/(float)RAND_MAX * 2 * M_PI;
+  // start values of non-loadable variables
+  this->blinkStr = 0;
+  this->timer = 0;
+  this->seqCounter = 0;
 }
 
@@ -87 +94 @@
   LoadParam(root, "size", this, Blink, setSize);
   LoadParam(root, "color", this, Blink, setColor);
-  LoadParam(root, "omega", this, Blink, setOmega);
+  LoadParam(root, "period", this, Blink, setPeriod);
+  LoadParam(root, "sequence", this, Blink, loadBlinkSequence);
 }
 
@@ -97 +105 @@
 void Blink::tick(float dt)
 {
-  this->angle += dt * this->omega;
+  timer += dt;
 
-  while (this->angle > 2 * M_PI)
-    this->angle -= 2 * M_PI;
+  while(this->timer >= this->symbolTime)
+  {
+    this->blinkStr = (float)((int)(blinkSequence[seqCounter]) - 48) / 9;
 
-  // blinkStr should be element of [0, 1]
-  this->blinkStr = (sinf(angle) + 1) / 2;
+    this->timer -= symbolTime;
+
+    seqCounter++;
+    seqCounter %= this->blinkSequence.length();
+  }
 
   this->bBoard->colorTexture(Color(color.r(), color.g(), color.b(), this->blinkStr));

trunk/src/world_entities/effects/blink.h

@@ -2 +2 @@
  * @file blink.h
  */
+ /*! example input in .oxw file with the standard values
+
+<Blink>
+  <name>Blink1</name>
+  <position>580, 70, -130</position>
+  <color>0, 255, 255</color>
+  <size>8</size>
+  <period>9</period>
+  <sequence>0123456789</sequence><!-- the number describe the strength of the blink light -->
+</Blink>
+
+*/
 
 #ifndef _BLINK_H
@@ -26 +38 @@
     void setPosition(float x, float y, float z) { this->bBoard->setAbsCoor(x, y, z); }
     void setSize(float s) { this->size = s; this->bBoard->setSize(this->size, this->size); }
-    void setOmega(float w) { this->omega = w; }
+    void setPeriod(float t) { this->period = t; }
     void setColor(float r, float g, float b) { this->color = Color(r/255, g/255, b/255); }
+    void loadBlinkSequence(const std::string& seq) { this->blinkSequence = seq; }
 
     virtual void tick(float dt);
@@ -35 +48 @@
     Billboard*        bBoard;
     Color             color;
+    std::string       blinkSequence;    //! 1 means fully viewable, 0 means fully transparent
     float             angle;
-    float             omega;
+    float             period;           //! period in seconds
     float             blinkStr;
     float             size;             //! only one float caus' its quadratical
+    int               seqCounter;
+    float             symbolTime;       //! defines how long one symbol of the sequence will be shown in sec
+    float             timer;
 };