Changeset 10600 in orxonox.OLD for branches/cleanup/src/world_entities/projectiles

Timestamp:

Mar 5, 2007, 11:37:52 AM (18 years ago)

Author:

nicolasc

Message:

Comestic cleanup in projectiles

Location:

branches/cleanup/src/world_entities/projectiles

Files:

• hbolt.cc (modified) (3 diffs)
• hbolt.h (modified) (1 diff)
• lbolt.cc (modified) (3 diffs)
• lbolt.h (modified) (1 diff)

branches/cleanup/src/world_entities/projectiles/hbolt.cc

@@ -49 +49 @@
 
   this->angle = 0;
-  this->rotationSpeed = 600;
+//   this->rotationSpeed = 600;
 
   this->emitter = new DotEmitter(100, 5, M_2_PI);
@@ -146 +146 @@
     this->deactivate();
 
-  this->angle += this->rotationSpeed * dt;
+  this->angle += HBolt::rotationSpeed * dt;
 
   for( ObjectList<NPC>::const_iterator eIterator = NPC::objectList().begin(); eIterator !=NPC::objectList().end(); eIterator++)
@@ -177 +177 @@
   glPushAttrib(GL_ENABLE_BIT);
   glDisable(GL_LIGHTING);
-  glDisable(GL_FOG);
+//   glDisable(GL_FOG);
 
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
 
-
-  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 );
-  glRotatef(this->angle, 0.0, 0.0, 1.0);
-
-  this->getModel()->draw();
+//     float matrix[4][4];
+    glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
+    Vector tmpRot = this->getAbsDir().getSpacialAxis();
+    glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
+    glRotatef(this->angle, 0.0, 0.0, 1.0);
+//     glMultMatrixf((float*)matrix);
+    this->getModel()->draw();
+    this->halo->draw();
 
   glPopMatrix();

branches/cleanup/src/world_entities/projectiles/hbolt.h

@@ -42 +42 @@
 
     float                             angle;
-    float                             rotationSpeed;
+    static const float                rotationSpeed = 600;
 
     Billboard*                        halo;

branches/cleanup/src/world_entities/projectiles/lbolt.cc

@@ -59 +59 @@
 
   this->angle = 0;
-  this->rotationSpeed = 130;
 
   this->halo = new Billboard();
@@ -148 +147 @@
     this->deactivate();
 
-  angle += rotationSpeed * dt;
+  angle += LBolt::rotationSpeed * dt;
 
   for( ObjectList<NPC>::const_iterator eIterator = NPC::objectList().begin(); eIterator !=NPC::objectList().end(); eIterator++)
@@ -182 +181 @@
   glPushMatrix();
 
-  float matrix[4][4];
-  glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
+    float matrix[4][4];
+    glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
+    Vector tmpRot = this->getAbsDir().getSpacialAxis();
+    glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
+    glRotatef(this->angle, 1.0, 0.0, 0.0);
+    this->getAbsDir().matrix (matrix);
+    glMultMatrixf((float*)matrix);
+    this->getModel()->draw();
 
-  glRotatef(angle, 1.0, 0.0, 0.0);
-  this->getAbsDir().matrix (matrix);
-  glMultMatrixf((float*)matrix);
-  this->getModel()->draw();
-
-  this->halo->draw();
+    this->halo->draw();
 
   glPopMatrix();
-
   glPopAttrib();
 }

branches/cleanup/src/world_entities/projectiles/lbolt.h

@@ -43 +43 @@
 
     float                             angle;
-    float                             rotationSpeed;
+    static const float                rotationSpeed = 1080;
 
     Billboard*                        halo;