Changeset 3349 in orxonox.OLD

Timestamp:

Jan 6, 2005, 3:39:28 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/parenting: :TrackManager: curves are now being added in a C1-static maner (at least for bezier).

Location:

orxonox/branches/parenting/src

Files:

• curve.cc (modified) (1 diff)
• curve.h (modified) (1 diff)
• track_manager.cc (modified) (3 diffs)
• track_manager.h (modified) (1 diff)

orxonox/branches/parenting/src/curve.cc

@@ -46 +46 @@
 }
 
+/**
+   \brief Finds a Node by its Number, and returns its Position
+   \param nodeToFind the n'th node in the List of nodes
+   \returns A Vector to the Position of the Node.
+*/
+Vector Curve::getNode(unsigned int nodeToFind)
+{
+  if (nodeToFind > this->nodeCount)
+    return Vector(0,0,0);
+  PathNode* tmpNode = this->firstNode;
+  for (int i = 1; i < nodeToFind; i++)
+    tmpNode = tmpNode->next;
+  return tmpNode->position;
+}
 
 ///////////////////////////////////

orxonox/branches/parenting/src/curve.h

@@ -42 +42 @@
   virtual void rebuild(void) = 0;
  public:
-  void addNode (const Vector& newNode);
+  void addNode(const Vector& newNode);
+  Vector getNode(unsigned int nodeToFind);
+  inline int getNodeCount(void) { return this->nodeCount;}
 
   virtual Vector calcPos(float t) = 0;

orxonox/branches/parenting/src/track_manager.cc

@@ -40 +40 @@
   this->childCount = 0;
   this->name = NULL;
+  this->startPoint = Vector(0,0,0);
+  this->startTangentPoint = Vector(0,0,0);
   this->curve = NULL;
   this->children = NULL;
@@ -154 +156 @@
       this->currentTrackElem->children[i]->ID = ++trackElemCount;
       this->currentTrackElem->children[i]->startingTime = this->currentTrackElem->startingTime+this->currentTrackElem->duration;
+      this->currentTrackElem->children[i]->startPoint = this->currentTrackElem->curve->getNode(this->currentTrackElem->curve->getNodeCount());
+      this->currentTrackElem->children[i]->startTangentPoint = (this->currentTrackElem->children[i]->startPoint *2) - this->currentTrackElem->curve->getNode(this->currentTrackElem->curve->getNodeCount()-1);
     }
 }
@@ -221 +225 @@
       this->setCurveType(BEZIERCURVE);
       this->currentTrackElem->isFresh = false;
+      if(this->currentTrackElem != this->firstTrackElem)
+        this->addPoint(this->currentTrackElem->startPoint);
+        this->addPoint(this->currentTrackElem->startTangentPoint);
+      
     }
   this->currentTrackElem->curve->addNode(newPoint);

orxonox/branches/parenting/src/track_manager.h

@@ -46 +46 @@
   int nodeCount;             //!< The count of points this TrackElement has.
   char* name;                //!< A name for the Trac.
+  Vector startPoint;         //!< A Vector that Points to the first point of the containing Curve. (for c1-steadiness)
+  Vector startTangentPoint;  //!< A Vector that points into the direction of the previous Curve. (for c1-steadiness)
   Curve* curve;              //!< The Curve of this TrackElement
   int childCount;            //!< The number of Children This TrackElement has.