Changeset 10426 in orxonox.OLD for branches/blink

Timestamp:

Jan 28, 2007, 1:25:21 AM (18 years ago)

Author:

stefalie

Message:

blink: another bug committed suicide

Location:

branches/blink/src/world_entities/effects

Files:

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

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

@@ -149 +149 @@
 //v += this->getAbsCoor();
     //PRINTF(0)("sizeX: %f sizeY: %f\n", sizeX, sizeY);
+
+  // changes the color of the texture (if any is set)
   if(this->texColor != NULL)
-  {
-    //glColor4ub((int)(this->texColor->r() * 255), (int)(this->texColor->g() * 255), (int)(this->texColor->b() * 255), (int)(this->texColor->a() * 255));
     glColor4ub((GLubyte)this->texColor->r()*255, (GLubyte)this->texColor->g()*255, (GLubyte)this->texColor->b()*255, 255);
-    PRINTF(0)("\n\n\n\n::%f,%f,%f\n\n\n\n", this->texColor->r()*255, this->texColor->g()*255, this->texColor->b()*255);
-
-  }
 
   glBegin(GL_QUADS);
@@ -187 +184 @@
  * @param col color for the texture
  */
-void Billboard::colorTexture(Color col)
+void Billboard::colorTexture(const Color col)
 {
-  this->texColor = &col;
+  this->texColor = new Color(col.r(), col.g(), col.b(), col.a());
 }

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

@@ -24 +24 @@
     void setSize(float sizeX, float sizeY);
     void setTexture(const std::string& textureFile);
-    void colorTexture(Color col);
+    void colorTexture(const Color col);
 
     virtual void tick(float dt);

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

@@ -89 +89 @@
   this->setAbsCoor(0, 0, 0); 
   this->position = Vector(0, 0, 0); ///remove
-  this->color = Color(1, 1, 0);
+  this->color = Color(1, 0, 0);
   this->size = 10;
   this->omega = 10;
@@ -194 +194 @@
 
   //this->material->select();
-  PRINTF(0)("\n\n\n\n::%f,%f,%f\n\n\n\n", color.r(), color.g(), color.b());
+//   PRINTF(0)("\n\n\n\n::%f,%f,%f\n\n\n\n", color.r(), color.g(), color.b());
   this->bBoard->colorTexture(Color(color.r(), color.g(), color.b(), 1));