Changeset 5004 in orxonox.OLD for orxonox

Timestamp:

Aug 13, 2005, 10:44:50 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: cooler movement

Location:

orxonox/trunk/src

Files:

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

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

@@ -75 +75 @@
    in mind that if you do that, the model's front has to point in +z direction, and left
    and right should be -x or +x respectively or the mesh wont rotate correctly.
+ *
+ * @TODO !!!OPTIMIZE THIS!!!
 */
 Quaternion::Quaternion (const Vector& dir, const Vector& up)
 {
-  Vector z = dir;
-  z.normalize();
-  Vector x = up.cross(z);
-  x.normalize();
+  Vector z = dir.getNormalized();
+  Vector x = up.cross(z).getNormalized();
   Vector y = z.cross(x);
 

orxonox/trunk/src/story_entities/world.cc

@@ -377 +377 @@
   tn->addChild(this->localCamera);
   localCamera->lookAt(tn);
-  localCamera->setParentMode(PNODE_MOVEMENT);
   localCamera->setClipRegion(1, 10000.0);
   this->localPlayer->setParentMode(PNODE_ALL);

orxonox/trunk/src/world_entities/camera.cc

@@ -52 +52 @@
   this->setViewMode(VIEW_NORMAL);
 
-  //this->setParentMode(PNODE_MOVEMENT);
+  this->setParentMode(PNODE_ALL);
 }
 
@@ -261 +261 @@
 }
 
-CameraTarget::~CameraTarget()
-{
-
-}

orxonox/trunk/src/world_entities/camera.h

@@ -69 +69 @@
 
  public:
-  virtual ~CameraTarget();
 };
 

orxonox/trunk/src/world_entities/player.cc

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