Changeset 4998 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

Aug 13, 2005, 7:19:51 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more optimizations of the Quaternion Class.
Now the 3D-rotation is much faster through this code:

Vector tmpRot = this→getAbsDir().getSpacialAxis();
glRotatef (this→getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );

instead of the old Matrix-approach. furthermore glRotate is optimized much better in openGL as is clearly stated in the red book

also implemented some other really useless functions for Quaternion

Location:

orxonox/trunk/src/world_entities

Files:

• camera.cc (modified) (1 diff)
• player.cc (modified) (2 diffs)
• skybox.cc (modified) (1 diff)
• skybox.h (modified) (2 diffs)
• terrain.cc (modified) (2 diffs)
• world_entity.cc (modified) (2 diffs)

orxonox/trunk/src/world_entities/camera.cc

@@ -142 +142 @@
     case VIEW_FRONT:
       this->toFovy = 120.0;
-      this->softReparent("Player");
-      this->target->softReparent("Player");
-      this->setRelCoorSoft(4, 0, 0);
-      this->target->setRelCoorSoft(10,0,0);
+//       this->softReparent("Player");
+//       this->target->softReparent("Player");
+//       this->setRelCoorSoft(4, 0, 0);
+//       this->target->setRelCoorSoft(10,0,0);
+      this->target->setRelDirSoft(Quaternion(M_PI/4.0, Vector(0,1,0)));
       break;
     case VIEW_LEFT:

orxonox/trunk/src/world_entities/player.cc

@@ -222 +222 @@
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
-  float matrix[4][4];
-
   /* translate */
   glTranslatef (this->getAbsCoor ().x,
@@ -229 +227 @@
                 this->getAbsCoor ().z);
   /* rotate */
-  this->getAbsDir ().matrix (matrix);
-  glMultMatrixf((float*)matrix);
-
+  Vector tmpRot = this->getAbsDir().getSpacialAxis();
+  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
   this->model->draw();
   glPopMatrix();

orxonox/trunk/src/world_entities/skybox.cc

@@ -167 +167 @@
   this->size = size;
 }
-
-/**
- *  draws the SkyBox
-*/
-void SkyBox::draw()
-{
-  glPushMatrix();
-  glMatrixMode(GL_MODELVIEW);
-  Vector r = this->getAbsCoor();
-  glTranslatef(r.x, r.y, r.z);
-
-  this->model->draw();
-
-  glPopMatrix();
-}
-
 
 /**

orxonox/trunk/src/world_entities/skybox.h

@@ -34 +34 @@
 
   void setSize(float size);
-  /** \brief assumes jpg as input-format */
+  /** assumes jpg as input-format */
   void setTexture(const char* name) { setTextureAndType (name, "jpg"); };
 
@@ -40 +40 @@
   void setTextures(const char* top, const char* bottom, const char* left,
                    const char* right, const char* front, const char* back);
-
-  virtual void draw();
 
  private:

orxonox/trunk/src/world_entities/terrain.cc

@@ -106 +106 @@
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
-  float matrix[4][4];
 
   /* translate */
@@ -113 +112 @@
                 this->getAbsCoor ().z);
   /* rotate */
-  this->getAbsDir ().matrix (matrix);
-  glMultMatrixf((float*)matrix);
+  Vector tmpRot = this->getAbsDir().getSpacialAxis();
+  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
   if (this->objectList)

orxonox/trunk/src/world_entities/world_entity.cc

@@ -179 +179 @@
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
-  float matrix[4][4];
-
   /* translate */
   glTranslatef (this->getAbsCoor ().x,
@@ -186 +184 @@
                 this->getAbsCoor ().z);
   /* rotate */
-  this->getAbsDir ().matrix (matrix);
-  glMultMatrixf((float*)matrix);
+  Vector tmpRot = this->getAbsDir().getSpacialAxis();
+  glRotatef (this->getAbsDir().getSpacialAxisAngle(), tmpRot.x, tmpRot.y, tmpRot.z );
 
   if (this->obbTree)