Changeset 3535 in orxonox.OLD for orxonox

Timestamp:

Mar 13, 2005, 11:38:45 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: player connected to the track.
There is some strange error about this, that I do not quite understand.

Location:

orxonox/trunk/src

Files:

• lib/coord/p_node.cc (modified) (1 diff)
• lib/coord/p_node.h (modified) (1 diff)
• story_entities/world.cc (modified) (2 diffs)
• world_entities/player.cc (modified) (1 diff)

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

@@ -343 +343 @@
    \param parent the Parent to set
 */
-/*
 void PNode::setParent (PNode* parent)
 {
   parent->addChild(this);
 }
-*/
+
 
 /**

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

@@ -65 +65 @@
   void addChild (PNode* pNode, parentingMode mode);
   void removeChild (PNode* pNode);
-  //void setParent (PNode* parent);
+  void setParent (PNode* parent);
   void parentCoorChanged ();
   void parentDirChanged ();

orxonox/trunk/src/story_entities/world.cc

@@ -30 +30 @@
 #include "light.h"
 #include "fontset.h"
+#include "track_node.h"
 
 using namespace std;
@@ -245 +246 @@
             this->glmis->step();
 
-            trackManager->setBindSlave(env);
+            //      trackManager->setBindSlave(env);
+            TrackNode::getInstance()->addChild(myPlayer);
+            localCamera->setParent(TrackNode::getInstance());
             trackManager->condition(1, NEAREST, myPlayer);
 

orxonox/trunk/src/world_entities/player.cc

@@ -179 +179 @@
   //l->dist = l->dist + travelSpeed * time;
   
-  Vector* shift = new Vector (this->travelSpeed * time, 0, 0);
-  this->shiftCoor (shift);
+  //  Vector* shift = new Vector (this->travelSpeed * time, 0, 0);
+  //  this->shiftCoor (shift);
   
   /* this updates the player position on the track - user interaction */