Changeset 3351 in orxonox.OLD for orxonox

Timestamp:

Jan 6, 2005, 5:09:13 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/parenting: :TrackManager: forking works.

Location:

orxonox/branches/parenting/src

Files:

• curve.cc (modified) (1 diff)
• track_manager.cc (modified) (5 diffs)
• world.cc (modified) (1 diff)

orxonox/branches/parenting/src/curve.cc

@@ -131 +131 @@
   float n = nodeCount -1;
   float binCoef = 1;
-  printf("n=%f\n", n);
   while(tmpNode)
     {
       tmpNode->factor = binCoef;
-      printf("bincoef: %f\n", binCoef);
       if (tmpNode =tmpNode->next)
         {

orxonox/branches/parenting/src/track_manager.cc

@@ -232 +232 @@
     }
   this->currentTrackElem->curve->addNode(newPoint);
+  this->currentTrackElem->nodeCount++;
 }
 
@@ -249 +250 @@
   // \todo HotPoint Handling.
   this->currentTrackElem->curve->addNode(newPoint);
+  this->currentTrackElem->nodeCount++;
 }
 
@@ -277 +279 @@
 void TrackManager::fork(unsigned int count, ...)
 {
-  int* trackIDs = new int [count];
+  int* trackIDs = new int[count];
+  this->forkV(count, trackIDs);
   va_list ID;
   va_start (ID, count);
   for(int i = 0; i < count; i++)
     {
-      trackIDs[i] = va_arg (ID, int);
-    }
-  va_end(ID);
-  this->forkV(count, trackIDs);
+      *va_arg (ID, int*) = trackIDs[i];
+    }
+  va_end(ID);  
   delete []trackIDs;
 }
@@ -303 +305 @@
     return;
   this->currentTrackElem->isFork = true;
-
+  for(int i = 0; i < count; i++)
+    trackIDs[i]=this->trackElemCount+1+i;
   this->initChildren(count);
 }
@@ -463 +466 @@
             printf("   is a SavePoint\n");
           if(tmpElem->isFork)
-            printf("   is A Fork with with %d children\n", tmpElem->childCount);
+            {
+              printf("   is A Fork with with %d children: ", tmpElem->childCount);
+              for(int i = 0; i < tmpElem->childCount; i++)
+                printf("=%d= ", tmpElem->children[i]->ID);
+              printf("\n");
+            }
           if(tmpElem->isJoined)
             printf("   is Joined at the End\n");

orxonox/branches/parenting/src/world.cc

@@ -244 +244 @@
       trackManager->addPoint(Vector(150,0,-10));
       trackManager->setDuration(.5);
+      int fork11, fork12;
+      trackManager->fork(2, &fork11, &fork12);
+      printf("FORKS: %d, %d\n", fork11, fork12);
+      trackManager->workOn(fork11);
+      trackManager->addPoint(Vector(170, 0, -15));
+      trackManager->addPoint(Vector(180, 0, -15));
+      trackManager->workOn(fork12);
+      trackManager->addPoint(Vector(170, 0, 10));
+      trackManager->addPoint(Vector(180, 0, 10));
       
       /*