Changeset 5419 in orxonox.OLD for trunk/src

Timestamp:

Oct 22, 2005, 10:55:51 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: MUCH better algorithm for the QuaternionSlerp in PNodes rotate-to function
also updated the Quaternion class, to now hold dot-product and distance

Location:

trunk/src

Files:

• lib/coord/p_node.cc (modified) (2 diffs)
• lib/graphics/text_engine/text.cc (modified) (1 diff)
• lib/math/vector.h (modified) (1 diff)
• world_entities/environment.cc (modified) (1 diff)
• world_entities/test_entity.cc (modified) (1 diff)
• world_entities/world_entity.cc (modified) (1 diff)

trunk/src/lib/coord/p_node.cc

@@ -11 +11 @@
    ### File Specific:
    main-programmer: Patrick Boenzli
-   co-programmer:
+   co-programmer: Benjamin Grauer
 */
 
@@ -630 +630 @@
       if (unlikely(this->toDirection != NULL))
       {
-        Quaternion rotQuat = Quaternion::quatSlerp(Quaternion(), (*this->toDirection / this->relDirection), fabsf(dt)*this->bias);
-        if (likely(rotQuat.getSpacialAxisAngle() > PNODE_ITERATION_DELTA))
+        Quaternion rotQuat = Quaternion::quatSlerp(this->relDirection,*this->toDirection, fabsf(dt)*this->bias);
+        if (this->relDirection.distance(rotQuat) >PNODE_ITERATION_DELTA)
         {
-          this->shiftDir(rotQuat);
+          this->relDirection = rotQuat;
+          this->bRelDirChanged;
         }
         else

trunk/src/lib/graphics/text_engine/text.cc

@@ -251 +251 @@
         {
           glBegin(GL_QUADS);
+
           glTexCoord2f(tmpGlyph->texCoord[0], tmpGlyph->texCoord[2]);
           glVertex2d(posX, - tmpGlyph->bearingY * this->size);
+
           glTexCoord2f(tmpGlyph->texCoord[0], tmpGlyph->texCoord[3]);
           glVertex2d(posX, (tmpGlyph->height - tmpGlyph->bearingY)*this->size);
+
           glTexCoord2f(tmpGlyph->texCoord[1], tmpGlyph->texCoord[3]);
           glVertex2d(posX+tmpGlyph->width*this->size, (tmpGlyph->height - tmpGlyph->bearingY)*this->size);
+
           glTexCoord2f(tmpGlyph->texCoord[1], tmpGlyph->texCoord[2]);
           glVertex2d(posX+tmpGlyph->width*this->size, - tmpGlyph->bearingY*this->size);
+
           glEnd();
           glEndList();
-          posX += tmpGlyph->width*this->size;
+          posX += tmpGlyph->advance * this->size;
         }
-        tmpText++;
+        ++tmpText;
       }
     }

trunk/src/lib/math/vector.h

@@ -157 +157 @@
   /** @returns the inverted Quaterntion of this */
   inline Quaternion inverse () const { return conjugate() / (w*w + v.x*v.x + v.y*v.y + v.z*v.z); };
+  /** @returns the dot Product of a Quaternion */
+  inline float dot (const Quaternion& q) const { return v.x*q.v.x + v.y*q.v.y + v.z*q.v.z + w*q.w; };
+  /** @retuns the Distance between two Quaternions */
+  inline float distance(const Quaternion& q) const { return 2*acos(fabsf(this->dot(q))); };
   /** @param v: the Vector  @return a new Vector representing v rotated by the Quaternion */
   inline Vector apply (const Vector& v) const { return (*this * Quaternion(v, 0) * conjugate()).v; };

trunk/src/world_entities/environment.cc

@@ -38 +38 @@
   this->loadModel("models/ships/bolido.obj");
 
-  if(this->obbTree == NULL)
-    this->obbTree = new OBBTree(4, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
+/*  if(this->obbTree == NULL)
+    this->obbTree = new OBBTree(4, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());*/
 }
 

trunk/src/world_entities/test_entity.cc

@@ -37 +37 @@
 //   this->md2Model = new MD2Model("models/tris.md2", "models/tris.pcx");
 // this->md2Model = new MD2Model("models/goblin.md2", "maps/goblin.bmp");
-  this->obbTree = new OBBTree(4, (sVec3D*)this->md2Model->data->pVertices, this->md2Model->data->numVertices);
+//  this->obbTree = new OBBTree(4, (sVec3D*)this->md2Model->data->pVertices, this->md2Model->data->numVertices);
 
   this->md2Model->setAnim(RUN);

trunk/src/world_entities/world_entity.cc

@@ -98 +98 @@
 bool WorldEntity::buildObbTree(unsigned int depth)
 {
-  if (this->obbTree)
-    delete this->obbTree;
-
-  if (this->model)
-  {
-    PRINTF(4)("creating obb tree\n");
-    this->obbTree = new OBBTree(depth, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
-    return true;
-  }
-  else
-  {
-    PRINTF(2)("could not create obb-tree, because no model was loaded yet\n");
-    this->obbTree = NULL;
-    return false;
-  }
+//   if (this->obbTree)
+//     delete this->obbTree;
+//
+//   if (this->model)
+//   {
+//     PRINTF(4)("creating obb tree\n");
+//     this->obbTree = new OBBTree(depth, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
+//     return true;
+//   }
+//   else
+//   {
+//     PRINTF(2)("could not create obb-tree, because no model was loaded yet\n");
+//     this->obbTree = NULL;
+//     return false;
+//  }
 }