Changeset 4989 in orxonox.OLD

Timestamp:

Aug 12, 2005, 4:37:06 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: softPNode finished for Movement only

Location:

orxonox/trunk/src

Files:

• lib/coord/p_node.cc (modified) (1 diff)
• world_entities/camera.cc (modified) (1 diff)

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

@@ -420 +420 @@
 void PNode::softReparent(PNode* parentNode)
 {
+  //this->setRelCoorSoft(this->getRelCoor());
   if (likely(this->toPosition == NULL))
+  {
     this->toPosition = new Vector();
-
-  *this->toPosition = this->getRelCoor();
+    *this->toPosition = this->getRelCoor();
+  }
+
 
   Vector tmp = this->getAbsCoor();

orxonox/trunk/src/world_entities/camera.cc

@@ -127 +127 @@
   //    this->target->setRelCoorSoft(Vector(10,0,0));
 
-      this->target->softReparent("Player");
+      if (!strcmp(this->target->getParent()->getName(), "Player"))
+        this->target->softReparent("TrackNode");
+      else
+        this->target->softReparent("Player");
+
 //      this->setParent("main-Turret");
 //      this->setParentMode(PNODE_ALL);