Changeset 5005 in orxonox.OLD for orxonox

Timestamp:

Aug 14, 2005, 1:26:49 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: quatSchlarp works

Location:

orxonox/trunk/src

Files:

• lib/coord/p_node.cc (modified) (1 diff)
• lib/math/vector.cc (modified) (1 diff)
• world_entities/camera.cc (modified) (1 diff)
• world_entities/camera.h (modified) (2 diffs)
• world_entities/player.cc (modified) (1 diff)

orxonox/trunk/src/lib/coord/p_node.cc

@@ -541 +541 @@
       if (unlikely(this->toDirection != NULL))
       {
-        Quaternion rotQuat = (*this->toDirection / this->relDirection);
+        Quaternion rotQuat = Quaternion::quatSlerp(Quaternion(0, Vector(0,1,0)), (*this->toDirection / this->relDirection), dt*this->bias);
 //         printf("1: ");
 //         this->relDirection.debug();

orxonox/trunk/src/lib/math/vector.cc

@@ -76 +76 @@
    and right should be -x or +x respectively or the mesh wont rotate correctly.
  *
- * @TODO !!!OPTIMIZE THIS!!!
+ * @TODO !!! OPTIMIZE THIS !!!
 */
 Quaternion::Quaternion (const Vector& dir, const Vector& up)

orxonox/trunk/src/world_entities/camera.cc

@@ -146 +146 @@
        this->setRelCoorSoft(4, 0, 0);
        this->target->setRelCoorSoft(10,0,0);
-      //this->target->setRelDirSoft(Quaternion(M_PI/4.0, Vector(0,1,0)));
+//      this->target->setRelDirSoft(Quaternion(M_PI/4.0, Vector(0,1,0)));
       break;
     case VIEW_LEFT:

orxonox/trunk/src/world_entities/camera.h

@@ -1 +1 @@
 /*!
-    \file camera.h
-  *  Viewpoint controlling class definitions
+ * @file camera.h
+ * Viewpoint controlling class definitions
 */
 
@@ -28 +28 @@
 //! Camera
 /**
-   This class controls the viewpoint from which the World is rendered.
+ * This class controls the viewpoint from which the World is rendered.
 */
 class Camera : public PNode, public EventListener

orxonox/trunk/src/world_entities/player.cc

@@ -121 +121 @@
 void Player::init()
 {
-//  this->setAbsDir(Quaternion(M_PI, Vector(1,0,0)));
+  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
   this->setClassID(CL_PLAYER, "Player");
   travelSpeed = 15.0;