Changeset 10635 in orxonox.OLD for branches/vs-enhencements/src

Timestamp:

Apr 19, 2007, 1:13:11 PM (18 years ago)

Author:

nicolasc

Message:

pulse grid update, drawing corrections

Location:

branches/vs-enhencements/src/world_entities

Files:

• effects/billboard.cc (modified) (4 diffs)
• effects/billboard.h (modified) (1 diff)
• projectiles/lbolt.cc (modified) (3 diffs)
• projectiles/mbolt.cc (modified) (1 diff)

branches/vs-enhencements/src/world_entities/effects/billboard.cc

@@ -11 +11 @@
 ### File Specific:
    main-programmer: David Hasenfratz
+   co-programmer: Nicolas Schlumberger
 */
 
@@ -73 +74 @@
   this->bPulse = false;
 
-  this->angularSpeed = M_PI; //180;
+  this->angularSpeed = M_2_PI; //360;
   this->angle = 0;
 
@@ -122 +123 @@
 {
   this->angle += dt * this->angularSpeed;
-  if (this->angle > 2 * M_PI)
-    this->angle -= 2 * M_PI;
+  if (this->angle > M_2_PI)
+    this->angle -= M_2_PI;
 }
 
@@ -158 +159 @@
   float tmp = 1;
   if (this->bPulse)
-    tmp = 1 + this->pulseMagnitude * updatePulse(this->angle);
+    tmp += this->pulseMagnitude * updatePulse(this->angle);
 
   v *= sizeX * tmp;

branches/vs-enhencements/src/world_entities/effects/billboard.h

@@ -31 +31 @@
     inline float getPulse () { return this->bPulse; };
 
+    inline void setPulseMagnitude(float mag) {this->pulseMagnitude = mag; };
+
     virtual void tick(float dt);
     virtual void draw() const;

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

@@ -65 +65 @@
   this->halo->setVisibility(false);
 
+  this->halo->setPulse();
 
 }
@@ -148 +149 @@
 
   angle += LBolt::rotationSpeed * dt;
+  if(angle > 360)
+    angle -= 360;
 
   for( ObjectList<NPC>::const_iterator eIterator = NPC::objectList().begin(); eIterator !=NPC::objectList().end(); eIterator++)
@@ -183 +186 @@
     float matrix[4][4];
     glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
-    Vector tmpRot = this->getAbsDir().getSpacialAxis();
+    this->halo->draw();
+
+    Vector tmpRot;
+    tmpRot = this->flightDirection.getNormalized();
+    glRotatef(this->angle, tmpRot.x, tmpRot.y, tmpRot.z);
+    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();
 
-    this->halo->draw();
-
   glPopMatrix();
   glPopAttrib();

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

@@ -212 +212 @@
   float matrix[4][4];
   glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
-  glRotatef(this->angle, 1.0f, 0.0f, 0.0f); //spinning missile
+//   glRotatef(this->angle, 1.0f, 0.0f, 0.0f); //spinning missile
+  glRotatef(this->angle, this->flightDirection.x, this->flightDirection.y, this->flightDirection.z);
   this->getAbsDir().matrix (matrix);
   glMultMatrixf((float*)matrix);