Changeset 8026 in orxonox.OLD

Timestamp:

May 31, 2006, 2:20:18 PM (18 years ago)

Author:

hdavid

Message:

branches/atmospheric_engine: billboard

Location:

branches/atmospheric_engine/src

Files:

• lib/graphics/effects/lightening_effect.cc (modified) (1 diff)
• world_entities/effects/billboard.cc (modified) (5 diffs)

branches/atmospheric_engine/src/lib/graphics/effects/lightening_effect.cc

@@ -34 +34 @@
   billboard = new Billboard(NULL);
   billboard->setTexture("maps/lightning_bolt.png");
-  //billboard->setSize(50, 50);
+  billboard->setSize(10, 20);
   //billboard->setAbsCoor2D(10,10);
   //billboard->setVisibility(true);

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

@@ -63 +63 @@
 
   this->material = new Material();
-  //this->setTexture("maps/lightning_bolt.png");
-  //this->setAbsCoor(0, 0, 0);
+  this->setAbsCoor(0, 0, 0);
   this->setVisibiliy(true);
-  this->setSize(10, 10);
+  this->setSize(5, 5);
 }
 
@@ -92 +91 @@
   this->sizeX = sizeX;
   this->sizeY = sizeY;
+
+  PRINTF(0)("sizeX: %f sizeY: %f", sizeX, sizeY);
 }
 
@@ -110 +111 @@
  */
 void Billboard::tick(float dt)
-{/*
-  float z = 0.0f;
-  glReadPixels ((int)this->getAbsCoor2D().x,
-                 GraphicsEngine::getInstance()->getResolutionY()-(int)this->getAbsCoor2D().y-1,
-                 1,
-                 1,
-                 GL_DEPTH_COMPONENT,
-                 GL_FLOAT,
-                 &z);
-
-  GLdouble objX=.0, objY=.0, objZ=.0;
-  gluUnProject(this->getAbsCoor2D().x,
-               GraphicsEngine::getInstance()->getResolutionY()-this->getAbsCoor2D().y-1,
-               .99,  // z
-               GraphicsEngine::modMat,
-               GraphicsEngine::projMat,
-               GraphicsEngine::viewPort,
-               &objX,
-               &objY,
-  &objZ );*/
+{
 }
 
@@ -144 +126 @@
 
   //glTranslatef(this->getAbsCoor().x, this->getAbsCoor().y, this->getAbsCoor().z);
-  glTranslatef(0,0,0);
+  //glTranslatef(0,0,0);
   this->material->select();
-  /*
-  glBegin(GL_QUADS);
-  glTexCoord2f(1.0f, 1.0f); glVertex3f(-sizeX/2, -sizeY/2,  0.0f);
-  glTexCoord2f(0.0f, 1.0f); glVertex3f( sizeX/2, -sizeY/2,  0.0f);
-  glTexCoord2f(0.0f, 0.0f); glVertex3f( sizeX/2,  sizeY/2,  0.0f);
-  glTexCoord2f(1.0f, 0.0f); glVertex3f(-sizeX/2,  sizeY/2,  0.0f);
-  glEnd();
-  */
   
   const PNode* camera = State::getCameraNode();  //!< @todo MUST be different
@@ -167 +141 @@
   
   float radius = 5;
-  v *= .5 * radius;
-  h *= .5 * radius;
-  /*
-  glBegin(GL_TRIANGLE_STRIP);
-  glTexCoord2i(1, 1);
-  glVertex3f(0 - h.x - v.x,
-             0 - h.y - v.y,
-             0 - h.z - v.z);
-  glTexCoord2i(0, 1);
-  glVertex3f(0 - h.x + v.x,
-             0 - h.y + v.y,
-             0 - h.z + v.z);
-  glTexCoord2i(1, 0);
-  glVertex3f(0 + h.x - v.x,
-             0 + h.y - v.y,
-             0 + h.z - v.z);
-  glTexCoord2i(0, 0);
-  glVertex3f(0 + h.x + v.x,
-             0 + h.y + v.y,
-             0 + h.z + v.z);
-
-  glEnd();*/
+  v *= .5 * sizeX;
+  h *= .5 * sizeY;
   
   glBegin(GL_QUADS);
   glTexCoord2f(0.0f, 0.0f);
-  glVertex3f(0 - h.x - v.x,
-              0 - h.y - v.y,
-              0 - h.z - v.z);
+  glVertex3f(this->getAbsCoor().x - h.x - v.x,
+             this->getAbsCoor().y - h.y - v.y,
+             this->getAbsCoor().z - h.z - v.z);
   glTexCoord2f(1.0f, 0.0f);
-  glVertex3f( 0 + h.x - v.x,
-              0 + h.y - v.y,
-              0 + h.z - v.z);
+  glVertex3f( this->getAbsCoor().x + h.x - v.x,
+              this->getAbsCoor().y + h.y - v.y,
+              this->getAbsCoor().z + h.z - v.z);
   glTexCoord2f(1.0f, 1.0f);
-  glVertex3f(0 + h.x + v.x,
-             0 + h.y + v.y,
-             0 + h.z + v.z);
+  glVertex3f(this->getAbsCoor().x + h.x + v.x,
+             this->getAbsCoor().y + h.y + v.y,
+             this->getAbsCoor().z + h.z + v.z);
   glTexCoord2f(0.0f, 1.0f);
-  glVertex3f(0 - h.x + v.x,
-             0 - h.y + v.y,
-             0 - h.z + v.z);
+  glVertex3f(this->getAbsCoor().x - h.x + v.x,
+             this->getAbsCoor().y - h.y + v.y,
+             this->getAbsCoor().z - h.z + v.z);
   glEnd();