Changeset 10645 in orxonox.OLD for branches/vs-enhencements/src/world_entities/projectiles

Timestamp:

May 2, 2007, 11:48:16 PM (18 years ago)

Author:

nicolasc

Message:

minor cleanup

Location:

branches/vs-enhencements/src/world_entities/projectiles

Files:

• hbolt.cc (modified) (4 diffs)
• lbolt.cc (modified) (1 diff)

branches/vs-enhencements/src/world_entities/projectiles/hbolt.cc

@@ -59 +59 @@
   this->halo = new Billboard();
   this->halo->setSize(.65, .65);
-  this->halo->setTexture("hbolt_halo2.png");
+  this->halo->setTexture("hbolt_halo2.jpg");
   this->halo->setVisibility(false);
 
@@ -177 +177 @@
   glPushAttrib(GL_ENABLE_BIT);
   glDisable(GL_LIGHTING);
-//   glDisable(GL_FOG);
+  glDisable(GL_FOG);
 
   glMatrixMode(GL_MODELVIEW);
@@ -184 +184 @@
 //     float matrix[4][4];
     glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
+    this->halo->draw();
+
     Vector tmpRot = this->getAbsDir().getSpacialAxis();
     glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
@@ -189 +191 @@
 //     glMultMatrixf((float*)matrix);
     this->getModel()->draw();
-    this->halo->draw();
 
   glPopMatrix();

branches/vs-enhencements/src/world_entities/projectiles/lbolt.cc

@@ -62 +62 @@
   this->halo = new Billboard();
   this->halo->setSize(.35, .35);
-  this->halo->setTexture("hbolt_halo.png");
+  this->halo->setTexture("hbolt_halo.jpg");
   this->halo->setVisibility(false);