Changeset 10431 in orxonox.OLD for branches

Timestamp:

Jan 28, 2007, 2:08:47 AM (18 years ago)

Author:

stefalie

Message:

blink: another small cleanup commit

Location:

branches/blink/src/world_entities/effects

Files:

• billboard.cc (modified) (1 diff)
• blink.cc (modified) (6 diffs)
• blink.h (modified) (1 diff)

branches/blink/src/world_entities/effects/billboard.cc

@@ -152 +152 @@
   // changes the color of the texture (if any is set)
   if(this->texColor != NULL)
-    glColor4ub((GLubyte)this->texColor->r()*255, (GLubyte)this->texColor->g()*255, (GLubyte)this->texColor->b()*255, 255);
+    glColor4ub((GLubyte)this->texColor->r()*255, (GLubyte)this->texColor->g()*255, (GLubyte)this->texColor->b()*255, (GLubyte)(this->texColor->a()*255));
 
   glBegin(GL_QUADS);

branches/blink/src/world_entities/effects/blink.cc

@@ -9 +9 @@
 
 ### File Specific:
-   main-programmer:
+   main-programmer: Lieni
 */
 
@@ -19 +19 @@
 #include "state.h"
 #include "effects/billboard.h"
-
-#include "material.h"
-
-
 
 
@@ -37 +33 @@
   this->init();
 
-  if( root)
+  if(root)
     this->loadParams(root);
-
-//   this->bBoard->setSize(this->size, this->size);
 }
 
@@ -49 +43 @@
 Blink::~Blink ()
 {
-//  if (this->material)
-  //  delete this->material;
+  if(bBoard)
+    delete bBoard;
 }
 
@@ -67 +61 @@
   this->bBoard->setVisibiliy(true);
   this->bBoard->setTexture("maps/star_alpha.png");
-  this->bBoard->setAbsCoor(0, 0, 0);
-
 
   /// Standard values
-  this->setAbsCoor(0, 0, 0);
-  // red if not defined in xml
+  this->bBoard->setAbsCoor(0, 0, 0);
+  // default position if not set in xml
   this->color = Color(1, 0, 0);
   // 10x10 pxl if not defined in xml
   this->size = 10;
+  // default angular rate
   this->omega = 10;
-  this->angle = rand() % 1000;
-  PRINTF(0)("\n\n\n\n\n\n\nangle: %f\n\n\n\n\n\n\n\n", this->angle);
-  this->angle *= 2 * M_PI;
-  PRINTF(0)("\n\n\n\n\n\n\nangle: %f\n\n\n\n\n\n\n\n", this->angle);
+
+  // random start angle, blinkies shouldn't blink synchronous
+  this->angle = (float)rand()/(float)RAND_MAX * 2 * M_PI;
 }
 
@@ -107 +99 @@
   this->angle += dt * this->omega;
 
-  if (this->angle > 2 * M_PI)
+  while (this->angle > 2 * M_PI)
     this->angle -= 2 * M_PI;
 
-  this->blinkStr = sinf(angle);
+  // blinkStr should be element of [0, 1]
+  this->blinkStr = (sinf(angle) + 1) / 2;
 
-  this->bBoard->colorTexture(Color(color.r(), color.g(), color.b(), 1));
+  this->bBoard->colorTexture(Color(color.r(), color.g(), color.b(), this->blinkStr));
 }
 

branches/blink/src/world_entities/effects/blink.h

@@ -34 +34 @@
   private:
     Billboard*        bBoard;
-    //Vector            position;
     Color             color;
     float             angle;