Changeset 3505 in orxonox.OLD

Timestamp:

Mar 11, 2005, 9:08:55 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/trackManager: added trackNode, but there is a segfault while deleting the pNodes

Location:

orxonox/branches/trackManager/src

Files:

• story_entities/world.cc (modified) (2 diffs)
• track_node.cc (modified) (1 diff)
• world_entities/player.cc (modified) (1 diff)

orxonox/branches/trackManager/src/story_entities/world.cc

@@ -222 +222 @@
             this->localCamera->setName ("camera");
             this->localCamera->bind (myPlayer);
-            this->localPlayer->addChild (this->localCamera);
+            //this->localPlayer->addChild (this->localCamera);
 
             // Create SkySphere
@@ -240 +240 @@
 
             trackManager->setBindSlave(TrackNode::getInstance());
-            env->setParent(TrackNode::getInstance());
+            TrackNode::getInstance()->addChild(myPlayer);
+            TrackNode::getInstance()->addChild(localCamera);
 
             break;

orxonox/branches/trackManager/src/track_node.cc

@@ -41 +41 @@
 TrackNode::TrackNode () 
 {
-  this->setParent(NullParent::getInstance());
+  NullParent::getInstance()->addChild(this);
   this->trackManager = TrackManager::getInstance();
   this->mode = ALL;

orxonox/branches/trackManager/src/world_entities/player.cc

@@ -202 +202 @@
   //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 */