Changeset 9991 in orxonox.OLD

Timestamp:

Dec 3, 2006, 5:40:09 PM (17 years ago)

Author:

nicolasc

Message:

rotating TE2, hbolt still not working

Location:

branches/playability/src/world_entities

Files:

• projectiles/hbolt.cc (modified) (4 diffs)
• test_entity2.cc (modified) (3 diffs)

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

@@ -46 +46 @@
 
   this->angle = 0;
-  this->rotationSpeed = 90;
+  this->rotationSpeed = 3;
 
   this->emitter = new DotEmitter(100, 5, M_2_PI);
@@ -135 +135 @@
     this->deactivate();
 
-  //this->updateAngle();
+  this->updateAngle();
 
 }
@@ -154 +154 @@
 void HBolt::draw () //const
 {
-
-  glBegin(GL_TRIANGLES);
-  this->getModel();
-  glEnd();
-
   glPushAttrib(GL_ENABLE_BIT);
   glDisable(GL_LIGHTING);
 
-  //glPushMatrix();
-  //glRotatef(30, 0.0f, 1.0f, 0.0f);
-
-  //WorldEntity::draw();
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
@@ -177 +168 @@
   glPopMatrix();*/
 
-  this->updateAngle();
+  //this->updateAngle();
 
-  float matrix[4][4];
   glTranslatef (this->getAbsCoor ().x, this->getAbsCoor ().y, this->getAbsCoor ().z);
-  this->getAbsDir().matrix (matrix);
-  glMultMatrixf((float*)matrix);
-  glScalef(4.0, 4.0, 4.0);
-  glRotatef(this->getAngle(), 0.0, 1.0, 0.0);
-  this->getModel()->draw();
+  glRotatef(this->angle, 0.0, 0.0, -1.0);
+  //this->getModel()->draw();
+  WorldEntity::draw();
   glPopMatrix();
   glPopAttrib();

branches/playability/src/world_entities/test_entity2.cc

@@ -85 +85 @@
 
   this->angle = 0;
-  this->rotationSpeed = 10;
+  this->rotationSpeed = 3;
 
   //this->material->setDiffuseMap("maps/torp2.png");
@@ -122 +122 @@
     Vector tmpRot = this->getAbsDir().getSpacialAxis();
     glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
-
+    glRotatef(this->angle, 0.0, 0.0, -1.0);
 //PRINTF(0)("axis: %f\n", axis);
 
@@ -240 +240 @@
   glEnd();
 
-  //this->angle += this->rotationSpeed;
-  glRotatef(this->angle, 0.0, 1.0, 0.0);
-
   glPopMatrix();
   glPopAttrib();