Changeset 10618 in orxonox.OLD for trunk/src/world_entities/projectiles/lbolt.cc

Timestamp:

Apr 4, 2007, 12:13:53 PM (18 years ago)

Author:

bknecht

Message:

merged cleanup into trunk (only improvements)

Location:

trunk

Files:

• . (modified) (1 prop)
• src/world_entities/projectiles/lbolt.cc (modified) (3 diffs)

trunk

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs

trunk/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();
 }

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs