Changeset 10003 in orxonox.OLD

Timestamp:

Dec 3, 2006, 9:56:51 PM (17 years ago)

Author:

nicolasc

Message:

hbolt rotates

Location:

branches/playability/src/world_entities

Files:

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

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

@@ -46 +46 @@
 
   this->angle = 0;
-  this->rotationSpeed = 3;
-  this->axis = Vector (0, 0, -1);
+  this->rotationSpeed = 1000;
 
   this->emitter = new DotEmitter(100, 5, M_2_PI);
@@ -119 +118 @@
 void HBolt::updateAngle (float time)
 {
-  this->angle = this->angle + this->rotationSpeed * time / 1000;
+  this->angle = this->angle + this->rotationSpeed * time;
 }
 
@@ -158 +157 @@
 
 
-void HBolt::draw () //const
+void HBolt::draw () const
 {
-  glPushAttrib(GL_ENABLE_BIT);
-  glDisable(GL_LIGHTING);
 
   glMatrixMode(GL_MODELVIEW);
@@ -176 +173 @@
   //this->updateAngle();
 
-  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);
+  //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);
   this->getModel()->draw();
-  //WorldEntity::draw();
   glPopMatrix();
-  glPopAttrib();
 }
-

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

@@ -31 +31 @@
 
     virtual void tick (float dt);
-    virtual void draw (); //const;
+    virtual void draw () const;
 
     virtual void updateAngle(float time);
@@ -45 +45 @@
     float                             angle;
     float                             rotationSpeed;
-    Vector                            axis;
 
     WorldEntity* hitEntity; // FIXME TEMPORARY

branches/playability/src/world_entities/test_entity2.cc

@@ -87 +87 @@
   this->rotationSpeed = 3;
 
-  //this->material->setDiffuseMap("maps/torp2.png");
+  this->material->setDiffuseMap("maps/torp2.png");
 }
 
@@ -130 +130 @@
 
   glColor3f(0.0, 1.0, 0.0);
-  glBindTexture( GL_TEXTURE_2D, 1 );
+
+  glBindTexture( GL_TEXTURE_2D, 0 );
+
   glBegin(GL_QUADS); // +X
     glTexCoord2f (0.0, 0.0);