- Timestamp:
- Jan 28, 2007, 1:25:21 AM (18 years ago)
- Location:
- branches/blink/src/world_entities/effects
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/blink/src/world_entities/effects/billboard.cc
r10425 r10426 149 149 //v += this->getAbsCoor(); 150 150 //PRINTF(0)("sizeX: %f sizeY: %f\n", sizeX, sizeY); 151 152 // changes the color of the texture (if any is set) 151 153 if(this->texColor != NULL) 152 {153 //glColor4ub((int)(this->texColor->r() * 255), (int)(this->texColor->g() * 255), (int)(this->texColor->b() * 255), (int)(this->texColor->a() * 255));154 154 glColor4ub((GLubyte)this->texColor->r()*255, (GLubyte)this->texColor->g()*255, (GLubyte)this->texColor->b()*255, 255); 155 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);156 157 }158 155 159 156 glBegin(GL_QUADS); … … 187 184 * @param col color for the texture 188 185 */ 189 void Billboard::colorTexture( Color col)186 void Billboard::colorTexture(const Color col) 190 187 { 191 this->texColor = &col;188 this->texColor = new Color(col.r(), col.g(), col.b(), col.a()); 192 189 } -
branches/blink/src/world_entities/effects/billboard.h
r10407 r10426 24 24 void setSize(float sizeX, float sizeY); 25 25 void setTexture(const std::string& textureFile); 26 void colorTexture( Color col);26 void colorTexture(const Color col); 27 27 28 28 virtual void tick(float dt); -
branches/blink/src/world_entities/effects/blink.cc
r10425 r10426 89 89 this->setAbsCoor(0, 0, 0); 90 90 this->position = Vector(0, 0, 0); ///remove 91 this->color = Color(1, 1, 0);91 this->color = Color(1, 0, 0); 92 92 this->size = 10; 93 93 this->omega = 10; … … 194 194 195 195 //this->material->select(); 196 PRINTF(0)("\n\n\n\n::%f,%f,%f\n\n\n\n", color.r(), color.g(), color.b());196 // PRINTF(0)("\n\n\n\n::%f,%f,%f\n\n\n\n", color.r(), color.g(), color.b()); 197 197 this->bBoard->colorTexture(Color(color.r(), color.g(), color.b(), 1)); 198 198
Note: See TracChangeset
for help on using the changeset viewer.