Changeset 3352 in orxonox.OLD

Timestamp:

Jan 6, 2005, 5:38:49 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/parenting: :TrackManager: Joining works too. (grafically)

Location:

orxonox/branches/parenting/src

Files:

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

orxonox/branches/parenting/src/track_manager.cc

@@ -221 +221 @@
 bool TrackManager::addPoint(Vector newPoint)
 {
-  if (this->currentTrackElem->isFresh)
+  return this->addPoint(newPoint, this->currentTrackElem);
+}
+
+/**
+   \brief adds a point to trackElem
+   \param newPoint The point to add.
+   \param trackElem The TrackElement to add the Point to
+*/
+bool TrackManager::addPoint(Vector newPoint, TrackElement* trackElem)
+{
+  if (trackElem->isFresh)
     {
       this->setCurveType(BEZIERCURVE);
-      this->currentTrackElem->isFresh = false;
-      if(this->currentTrackElem != this->firstTrackElem)
+      trackElem->isFresh = false;
+      if(trackElem != this->firstTrackElem)
         {
-          this->addPoint(this->currentTrackElem->startPoint);
-          this->addPoint(this->currentTrackElem->startTangentPoint);
+          this->addPoint(trackElem->startPoint);
+          this->addPoint(trackElem->startTangentPoint);
         }
     }
-  this->currentTrackElem->curve->addNode(newPoint);
-  this->currentTrackElem->nodeCount++;
+  trackElem->curve->addNode(newPoint);
+  trackElem->nodeCount++;
 }
 
@@ -325 +335 @@
 
    Join will set the localTime to the longest time a Path has to get to this Point. \n
-   Join will join all curves to the first curve.
+   Join will join all curves to the curve we are working on, meaning that all the tangents will be matched.
 */
 void TrackManager::join(unsigned int count, ...)
@@ -350 +360 @@
 void TrackManager::joinV(unsigned int count, int* trackIDs)
 {
-  //! \todo this
+  Vector tmpEndPoint = this->currentTrackElem->curve->getNode(this->currentTrackElem->curve->getNodeCount());
+  Vector tmpTangentPoint = this->currentTrackElem->curve->getNode(this->currentTrackElem->curve->getNodeCount()-1); 
+  
+  for (int i = 0; i < count; i++)
+    {
+      TrackElement* tmpJoinElem = this->findTrackElementByID(trackIDs[i]);
+      this->addPoint(tmpTangentPoint, tmpJoinElem);
+      this->addPoint(tmpEndPoint, tmpJoinElem);
+      tmpJoinElem->isJoined = true;
+    }
+  this->currentTrackElem->isJoined = true;
+
 }
 
@@ -426 +447 @@
 void TrackManager::drawGraph(float dt) const
 {
-  glBegin(GL_LINES);
+
   for (int i = 1; i <= trackElemCount; i++)
     {
+      glBegin(GL_LINE_STRIP);
       TrackElement* tmpElem = this->findTrackElementByID(i);
-      printf("Element: %i\n", tmpElem->ID);
       if (tmpElem->curve)
         for(float f = 0.0; f < 1.0; f+=dt)
@@ -438 +459 @@
             glVertex3f(tmpVector.x, tmpVector.y, tmpVector.z);
           }
-    }
   glEnd();
-  
-  
+    }
 }
 

orxonox/branches/parenting/src/track_manager.h

@@ -116 +116 @@
   void setDuration(float time);
   bool addPoint(Vector newPoint);
+  bool addPoint(Vector newPoint, TrackElement* trackElem);
   int addHotPoint(Vector newPoint);
   int setSavePoint(void);

orxonox/branches/parenting/src/world.cc

@@ -253 +253 @@
       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->join(2, fork11, fork12);
       
       /*