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

Timestamp:

Dec 3, 2006, 10:36:50 PM (18 years ago)

Author:

marcscha

Message:

see changelog

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