Changeset 3355 in orxonox.OLD for orxonox/branches/parenting/src/world.cc

Timestamp:

Jan 6, 2005, 1:52:47 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/parenting: :Curve: bezierCurve now can have 0,1,2,3 points. instead of only more than 3

File:

• orxonox/branches/parenting/src/world.cc (modified) (5 diffs)

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);
+      int fork11, fork12, fork13;
+      trackManager->fork(3, &fork11, &fork12, &fork13);
       trackManager->workOn(fork11);
       trackManager->addPoint(Vector(170, 0, -15));
@@ -254 +254 @@
       trackManager->addPoint(Vector(190,2,5));
       trackManager->addPoint(Vector(200,2,5));
-      trackManager->setSavePoint();
+      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->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->workOn(fork13);
+      trackManager->addPoint(Vector(200,-10,5));
+      trackManager->addPoint(Vector(250,-10,5));
+      trackManager->join(3, fork21, fork22, fork13);
       /*
       tmpCurve->addNode(Vector(10,0,-10));
-      tmpCurve->addNode(Vector(10,2,5));
-      tmpCurve->addNode(Vector(10,3,-5));
-      tmpCurve->addNode(Vector(10,1,5));
+      //tmpCurve->addNode(Vector(10,2,5));
+      //tmpCurve->addNode(Vector(10,3,-5));
+      //      tmpCurve->addNode(Vector(10,1,5));
       tmpCurve->addNode(Vector(10,0,5));
       */
@@ -563 +574 @@
     }
   glEnd();
-
+  
   /*
   glBegin(GL_LINE_STRIP);
@@ -576 +587 @@
   trackManager->drawGraph(.01);
   trackManager->debug(2);
+  //  delete trackManager;
+  
   /*
   glBegin(GL_LINES);
@@ -584 +597 @@
       glVertex3f(tmpCurve->calcPos(i).x, tmpCurve->calcPos(i).y, tmpCurve->calcPos(i).z);
     }
+  glEnd();
   */
-  glEnd();
   glEndList();
 }