Changeset 3516 in orxonox.OLD

Timestamp:

Mar 12, 2005, 4:00:06 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/trackManager: now nearest works… this was rather strange
what is important is, that the nearest node is not too far from the center (if there is a 3-fork

Location:

orxonox/branches/trackManager/src

Files:

• story_entities/world.cc (modified) (2 diffs)
• track_manager.cc (modified) (2 diffs)

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

@@ -116 +116 @@
       trackManager->addPoint(Vector(30,0,5));
       trackManager->addPoint(Vector(40,0,5));
-      trackManager->setDuration(2);
-      trackManager->setSavePoint();
-      trackManager->addPoint(Vector(50,10,10));
-      trackManager->addPoint(Vector(60,0, 10));
-      trackManager->addPoint(Vector(70,0, 10));
-      trackManager->addPoint(Vector(80,0,-10));
-      trackManager->addPoint(Vector(90,0,-10));
-      trackManager->setDuration(5);
-      trackManager->setSavePoint();
-      trackManager->addPoint(Vector(110,0,5));
-      trackManager->addPoint(Vector(120,0, 10));
-      trackManager->addPoint(Vector(130,0, 10));
-      trackManager->addPoint(Vector(140,0,-10));
-      trackManager->addPoint(Vector(150,0,-10));
       trackManager->setDuration(3);
-      int fork11, fork12, fork13, fork14;
-      trackManager->fork(4, &fork11, &fork12, &fork13, &fork14);
+      int fork11, fork12, fork13;
+      trackManager->fork(3, &fork11, &fork12, &fork13);
       trackManager->workOn(fork11);
-      trackManager->addPoint(Vector(170, 0, -15));
-      trackManager->addPoint(Vector(180, 0, -15));
+      trackManager->addPoint(Vector(70, 0, -10));
+      trackManager->addPoint(Vector(100, 0, -15));
       trackManager->setDuration(3);
       trackManager->workOn(fork12);
-      trackManager->addPoint(Vector(170, 0, 10));
-      trackManager->addPoint(Vector(180, 0, 10));
-      trackManager->addPoint(Vector(190,2,5));
-      trackManager->addPoint(Vector(200,2,5));
+      trackManager->addPoint(Vector(70,  0, 0));
+      trackManager->addPoint(Vector(100, 0, 0));
+      trackManager->addPoint(Vector(120,10, 0));
+      trackManager->addPoint(Vector(150,10, 0));
       trackManager->setDuration(7);
-      int fork21, fork22;
-      trackManager->fork(2, &fork21, &fork22);
-      trackManager->workOn(fork21);
-      trackManager->addPoint(Vector(220, 10,-10));
-      trackManager->addPoint(Vector(230, 0,-10));
-      trackManager->addPoint(Vector(240, 0, 2));
-      trackManager->addPoint(Vector(250, 0, 0));
-      trackManager->addPoint(Vector(260, 0, 5));
-      trackManager->setDuration(3);
-      trackManager->join(2, fork12, fork11);
-      trackManager->workOn(fork22);
-      trackManager->addPoint(Vector(220, -10,10));
-      trackManager->addPoint(Vector(230, 0, 10));
-      trackManager->addPoint(Vector(240, 0, 10));
-      trackManager->addPoint(Vector(250, 0, 5));
-      trackManager->setDuration(6);
       trackManager->workOn(fork13);
-      trackManager->addPoint(Vector(200,-10,5));
-      trackManager->addPoint(Vector(250,-10,5));
-      trackManager->setDuration(3);
-      trackManager->workOn(fork14);
-      trackManager->addPoint(Vector(200,15,0));
-      trackManager->addPoint(Vector(210,0,10));
-      trackManager->setDuration(1);
-      trackManager->join(4, fork21, fork22, fork13, fork14);
-      trackManager->workOn(10);
-      trackManager->addPoint(Vector(250,-10,5));
-      trackManager->addPoint(Vector(260,-10,5));
+      trackManager->addPoint(Vector(70,  0, 10));
+      trackManager->addPoint(Vector(100, 0, 30));
+      trackManager->addPoint(Vector(120,-10, 30));
+      trackManager->addPoint(Vector(150,-10, 30));
+
       trackManager->finalize();
       
@@ -240 +204 @@
 
             trackManager->setBindSlave(TrackNode::getInstance());
-            trackManager->condition(3, LEFTRIGHT, myPlayer);
+            trackManager->condition(1, NEAREST, myPlayer);
             TrackNode::getInstance()->addChild(myPlayer);
             TrackNode::getInstance()->addChild(localCamera);

orxonox/branches/trackManager/src/track_manager.cc

@@ -148 +148 @@
 
   Vector nodeRelCoord = tmpNode->relCoordinate;
-
-  if (nodeRelCoord.z < 0)
-    return 0;
-  else 
-    return 1;
+  float minDist = 100000000;
+  int nodeNumber = 0;
+  for (int i = 0; i < this->childCount; i++)
+    {
+      float dist = (nodeRelCoord - this->children[i]->curve->getNode(4)).len();
+      if (dist < minDist)
+        {
+          minDist = dist;
+          nodeNumber = i;
+        }
+    }
+  PRINTF(3)("PathDecision with nearest algorithm: %d\n", nodeNumber);
+  return nodeNumber;
 }
 
@@ -432 +440 @@
       break;
     case ENEMYKILLED:
-      break;
-    default: // same as LOWEST
-      tmpElem->condFunc = &TrackElement::lowest;
       break;
     }