Changeset 10722 in orxonox.OLD

Timestamp:

Jun 18, 2007, 10:05:48 PM (17 years ago)

Author:

nicolasc

Message:

fixed the deviation

Location:

branches/presentation/src/world_entities

Files:

• projectiles/nadion_blast.cc (modified) (1 diff)
• weapons/disruptor.cc (modified) (1 diff)
• weapons/nadion_laser.cc (modified) (1 diff)
• weapons/rf_cannon.cc (modified) (1 diff)

branches/presentation/src/world_entities/projectiles/nadion_blast.cc

@@ -213 +213 @@
   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, this->flightDirection.x, this->flightDirection.y, this->flightDirection.z);
+  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);

branches/presentation/src/world_entities/weapons/disruptor.cc

@@ -156 +156 @@
 
 //   pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*130 + VECTOR_RAND(1));
-  pj->setVelocity(this->getAbsDir().apply(tmp.getNormalized())*130 + VECTOR_RAND(1));
+  pj->setVelocity((tmp.getNormalized())*130 + VECTOR_RAND(1));
 
   pj->setAbsCoor(this->emissionPoint[this->activeBarrel]->getAbsCoor());
-//   pj->setAbsDir(this->getAbsDir());
+  pj->setAbsDir(this->getAbsDir());
   pj->activate();
 
 
   this->shootAnim[0][0]->replay();
-
-
 }
 

branches/presentation/src/world_entities/weapons/nadion_laser.cc

@@ -144 +144 @@
   Vector tmp = this->getDefaultTarget()->getAbsCoor() - this->getAbsCoor();
 
-  pj->setVelocity(this->getParent()->getVelocity() + this->getAbsDir().apply(tmp.getNormalized())*160);
+  pj->setVelocity(this->getParent()->getVelocity() + (tmp.getNormalized())*160);
 
   pj->setAbsCoor(this->getEmissionPoint());

branches/presentation/src/world_entities/weapons/rf_cannon.cc

@@ -138 +138 @@
   Vector tmp = this->getDefaultTarget()->getAbsCoor() - this->getAbsCoor();
 
-  pj->setVelocity(this->getParent()->getVelocity() + this->getAbsDir().apply(tmp.getNormalized())*190);
+  pj->setVelocity(this->getParent()->getVelocity() + (tmp.getNormalized())*190);
 
   pj->setAbsCoor(this->emissionPoint[this->activeBarrel]->getAbsCoor());