Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 10722 in orxonox.OLD for branches/presentation/src/world_entities


Ignore:
Timestamp:
Jun 18, 2007, 10:05:48 PM (17 years ago)
Author:
nicolasc
Message:

fixed the deviation

Location:
branches/presentation/src/world_entities
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/presentation/src/world_entities/projectiles/nadion_blast.cc

    r10698 r10722  
    213213  float matrix[4][4];
    214214  glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
    215 //   glRotatef(this->angle, 1.0f, 0.0f, 0.0f); //spinning missile
    216   glRotatef(this->angle, this->flightDirection.x, this->flightDirection.y, this->flightDirection.z);
     215  glRotatef(this->angle, 1.0f, 0.0f, 0.0f); //spinning missile
     216//   glRotatef(this->angle, this->flightDirection.x, this->flightDirection.y, this->flightDirection.z);
    217217  this->getAbsDir().matrix (matrix);
    218218  glMultMatrixf((float*)matrix);
  • branches/presentation/src/world_entities/weapons/disruptor.cc

    r10719 r10722  
    156156
    157157//   pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*130 + VECTOR_RAND(1));
    158   pj->setVelocity(this->getAbsDir().apply(tmp.getNormalized())*130 + VECTOR_RAND(1));
     158  pj->setVelocity((tmp.getNormalized())*130 + VECTOR_RAND(1));
    159159
    160160  pj->setAbsCoor(this->emissionPoint[this->activeBarrel]->getAbsCoor());
    161 //   pj->setAbsDir(this->getAbsDir());
     161  pj->setAbsDir(this->getAbsDir());
    162162  pj->activate();
    163163
    164164
    165165  this->shootAnim[0][0]->replay();
    166 
    167 
    168166}
    169167
  • branches/presentation/src/world_entities/weapons/nadion_laser.cc

    r10721 r10722  
    144144  Vector tmp = this->getDefaultTarget()->getAbsCoor() - this->getAbsCoor();
    145145
    146   pj->setVelocity(this->getParent()->getVelocity() + this->getAbsDir().apply(tmp.getNormalized())*160);
     146  pj->setVelocity(this->getParent()->getVelocity() + (tmp.getNormalized())*160);
    147147
    148148  pj->setAbsCoor(this->getEmissionPoint());
  • branches/presentation/src/world_entities/weapons/rf_cannon.cc

    r10719 r10722  
    138138  Vector tmp = this->getDefaultTarget()->getAbsCoor() - this->getAbsCoor();
    139139
    140   pj->setVelocity(this->getParent()->getVelocity() + this->getAbsDir().apply(tmp.getNormalized())*190);
     140  pj->setVelocity(this->getParent()->getVelocity() + (tmp.getNormalized())*190);
    141141
    142142  pj->setAbsCoor(this->emissionPoint[this->activeBarrel]->getAbsCoor());
Note: See TracChangeset for help on using the changeset viewer.