Changeset 10425 in orxonox.OLD for branches/blink/src/world_entities/effects/blink.cc

Timestamp:

Jan 28, 2007, 1:08:54 AM (18 years ago)

Author:

stefalie

Message:

blink: 1 bug less

File:

• branches/blink/src/world_entities/effects/blink.cc (modified) (9 diffs)

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

@@ -1 +1 @@
 /*
-   orxonox - the future of 3D-vertical-scrollers
 
    Copyright (C) 2006 orx
@@ -50 +49 @@
 Blink::~Blink ()
 {
-  if (this->material)
-    delete this->material;
+//  if (this->material)
+  //  delete this->material;
 }
 
@@ -65 +64 @@
   this->toList(OM_COMMON);
 
-  this->material = new Material();
+  //this->material = new Material();
   //this->material->setIllum(0);
   //this->material->setDiffuse(1.0,1.0,1.0);
@@ -73 +72 @@
   //this->material->setBlendFunc(GL_ZERO,GL_ZERO);
   //this->material->setDiffuseMap("pictures/rblink2.png");
-  this->material->setDiffuseMap("maps/star_alpha.png");
+  //this->material->setDiffuseMap("maps/star_alpha.png");
   //this->setAbsCoor(0, 0, 0);d
   //this->setVisibiliy(true);
@@ -90 +89 @@
   this->setAbsCoor(0, 0, 0); 
   this->position = Vector(0, 0, 0); ///remove
-  this->color = Vector(255, 255, 255);
+  this->color = Color(1, 1, 0);
   this->size = 10;
   this->omega = 10;
@@ -151 +150 @@
 void Blink::draw() const
 {
-  glPushAttrib(GL_ENABLE_BIT);
-  glEnable(GL_LIGHTING); //glDisable(GL_LIGHTING);
-  glDisable(GL_FOG);
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
+//   glPushAttrib(GL_ENABLE_BIT);
+//   glEnable(GL_LIGHTING); //glDisable(GL_LIGHTING);
+//   glDisable(GL_FOG);
+//   glMatrixMode(GL_MODELVIEW);
+//   glPushMatrix();
 
 //   Vector pos = this->getAbsCoor();
@@ -179 +178 @@
 //   glShadeModel(GL_SMOOTH);
 
-
+/*
   Vector camCoor = State::getCameraNode()->getAbsCoor();
   Vector diff = camCoor - this->position;
@@ -186 +185 @@
   //glTranslatef(position.x + size/2, position.y + size/2, position.z);
 
-  glTranslatef(this->position.x - this->size/2, this->position.y - this->size/2, this->position.z);
+  glTranslatef(this->position.x - this->size/2, this->position.y - this->size/2, this->position.z);*/
 
 //   Vector view = this->getAbsCoor() - State::getCameraNode()->getAbsCoor();
@@ -194 +193 @@
 //   Vector h = view.cross(up);
 
-  this->material->select();
-
-  this->bBoard->colorTexture(Color(1, 0, 0, 0));
-  //glColor4ub(this->color.x, this->color.y, this->color.z, 127.5*(this->blinkStr + 1));
-//   glBegin(GL_QUADS);
-//     glTexCoord2f(1, 1); glVertex3f(0, 0, 0);
-//     glTexCoord2f(1, 0); glVertex3f(this->size, 0, 0);
-//     glTexCoord2f(0, 0); glVertex3f(this->size, this->size, 0);
-//     glTexCoord2f(0, 1); glVertex3f(0, this->size, 0);
-//   glEnd();
-
+  //this->material->select();
+  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));
 
   glPopMatrix();