Changeset 10005 in orxonox.OLD for branches/playability/src/world_entities/projectiles/hbolt.cc

Timestamp:

Dec 3, 2006, 10:52:11 PM (17 years ago)

Author:

nicolasc

Message:

textured test_entity2, minor changes in hbolt

File:

• branches/playability/src/world_entities/projectiles/hbolt.cc (modified) (4 diffs)

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

@@ -47 +47 @@
   this->angle = 0;
   this->rotationSpeed = 1000;
-
 
   this->emitter = new DotEmitter(100, 5, M_2_PI);
@@ -119 +118 @@
 void HBolt::updateAngle (float time)
 {
-<<<<<<< .mine
   this->angle += this->rotationSpeed * time;
-=======
-  this->angle = this->angle + this->rotationSpeed * time;
->>>>>>> .r10003
 }
 
@@ -178 +173 @@
   //this->updateAngle();
 
-<<<<<<< .mine
-  //glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
-  //glRotatef(this->angle, 0.0, 0.0, -1.0);
-  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);
-=======
   //glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
   //glRotatef(this->angle, 0.0, 0.0, -1.0);
@@ -196 +181 @@
   glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
   glRotatef(this->angle, 0.0, 0.0, 1.0);
->>>>>>> .r10003
   this->getModel()->draw();
   glPopMatrix();