Changeset 3605 in orxonox.OLD for orxonox/branches/levelloader/src/lib/math/curve.cc

Timestamp:

Mar 18, 2005, 11:52:15 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged trunk back to levelloader
merged with command:
svn merge -r 3499:HEAD trunk branches/levelloader

Conflicts in
C track_manager.h
C world_entities/player.cc
C world_entities/player.h
C world_entities/environment.h
C lib/coord/p_node.cc
C defs/debug.h
C track_manager.cc
C story_entities/campaign.h

solved in merge-favouring. It was quite easy because Chris only worked on the headers, and he didi it quite clean. Thats the spirit

Conflits in world.cc are a MESS: fix it

File:

• orxonox/branches/levelloader/src/lib/math/curve.cc (modified) (5 diffs)

orxonox/branches/levelloader/src/lib/math/curve.cc

@@ -19 +19 @@
      local-Time implementation
      NURBS
+     tList implementation
      
 */
 
+#define DEBUG_SPECIAL_MODULE DEBUG_MODULE_MATH
+
 #include "curve.h"
-#include "matrix.h"
+
 #include "debug.h"
 
 #include <math.h>
 #include <stdio.h>
+
+
+/** 
+    \brief default constructor for a Curve
+*/
+Curve::Curve(void)
+{
+  nodeCount = 0;
+  firstNode = new PathNode;
+  currentNode = firstNode;
+
+  firstNode->position = Vector (.0, .0, .0);
+  firstNode->number = 0;
+  firstNode->next = 0; // not sure if this really points to NULL!!
+}
 
 /**
@@ -131 +149 @@
   this->derivation = 0;
   dirCurve = new BezierCurve(1);
-  this->init();
 }
 
@@ -141 +158 @@
   this->derivation = derivation;
   dirCurve=NULL;
-  this->init();
 }
 
@@ -161 +177 @@
   if (dirCurve)
     delete dirCurve;
-}
-
-/**
-   \brief Initializes a BezierCurve
-*/
-void BezierCurve::init(void)
-{
-  nodeCount = 0;
-  firstNode = new PathNode;
-  currentNode = firstNode;
-
-  firstNode->position = Vector (.0, .0, .0);
-  firstNode->number = 0;
-  firstNode->next = 0; // not sure if this really points to NULL!!
-
-  return;
 }
 
@@ -285 +285 @@
   return curvePoint;
 }
-
-
-
-///////////////////////////////////
-//// Uniform Point curve  /////////
-///////////////////////////////////
-/**
-   \brief Creates a new UPointCurve
-*/
-UPointCurve::UPointCurve (void)
-{
-  this->derivation = 0;
-  this->init();
-}
-
-/**
-   \brief Creates a new UPointCurve-Derivation-Curve of deriavation'th degree
-*/
-UPointCurve::UPointCurve (int derivation)
-{
-  this->derivation = derivation;
-  dirCurve=NULL;
-  this->init();
-}
-
-/**
-   \brief Deletes a UPointCurve.
-
-   It does this by freeing all the space taken over from the nodes
-*/
-UPointCurve::~UPointCurve(void)
-{
-  PathNode* tmpNode;
-  currentNode = firstNode;
-  while (tmpNode != 0)
-    {
-      tmpNode = currentNode;
-      currentNode = currentNode->next;
-      delete tmpNode;
-    }
-  if (dirCurve)
-    delete dirCurve;
-}
-
-/**
-   \brief Initializes a UPointCurve
-*/
-void UPointCurve::init(void)
-{
-  nodeCount = 0;
-  firstNode = new PathNode;
-  currentNode = firstNode;
-
-  firstNode->position = Vector (.0, .0, .0);
-  firstNode->number = 0;
-  firstNode->next = 0; // not sure if this really points to NULL!!
-
-  return;
-}
-
-/**
-   \brief Rebuilds a UPointCurve
-   
-   \todo very bad algorithm
-*/
-void UPointCurve::rebuild(void)
-{
-  // rebuilding the Curve itself
-  PathNode* tmpNode = this->firstNode;
-  int i=0;
-  Matrix xTmpMat = Matrix(this->nodeCount, this->nodeCount);
-  Matrix yTmpMat = Matrix(this->nodeCount, this->nodeCount);
-  Matrix zTmpMat = Matrix(this->nodeCount, this->nodeCount);
-  Matrix xValMat = Matrix(this->nodeCount, 3);
-  Matrix yValMat = Matrix(this->nodeCount, 3);
-  Matrix zValMat = Matrix(this->nodeCount, 3);
-  while(tmpNode)
-    {
-      Vector fac = Vector(1,1,1);
-      for (int j = 0; j < this->nodeCount; j++)
-        {
-          xTmpMat(i,j) = fac.x; fac.x *= (float)i/(float)this->nodeCount;//tmpNode->position.x;
-          yTmpMat(i,j) = fac.y; fac.y *= (float)i/(float)this->nodeCount;//tmpNode->position.y;
-          zTmpMat(i,j) = fac.z; fac.z *= (float)i/(float)this->nodeCount;//tmpNode->position.z;
-        }
-      xValMat(i,0) = tmpNode->position.x;
-      yValMat(i,0) = tmpNode->position.y;
-      zValMat(i,0) = tmpNode->position.z;
-      ++i;
-      tmpNode = tmpNode->next;
-    }
-  tmpNode = this->firstNode;
-  xValMat = xTmpMat.Inv() *= xValMat;
-  yValMat = yTmpMat.Inv() *= yValMat;
-  zValMat = zTmpMat.Inv() *= zValMat;
-  i = 0;
-  while(tmpNode)
-    {
-      tmpNode->vFactor.x = xValMat(i,0);
-      tmpNode->vFactor.y = yValMat(i,0);
-      tmpNode->vFactor.z = zValMat(i,0);
-
-      i++;
-      tmpNode = tmpNode->next;
-    }
-}
-
-/**
-   \brief calculates the Position on the curve
-   \param t The position on the Curve (0<=t<=1)
-   \return the Position on the Path
-*/
-Vector UPointCurve::calcPos(float t) 
-{
-  PathNode* tmpNode = firstNode;
-  Vector ret = Vector(0.0,0.0,0.0);
-  float factor = 1.0;
-  while(tmpNode)
-    {
-      ret.x += tmpNode->vFactor.x * factor;
-      ret.y += tmpNode->vFactor.y * factor;
-      ret.z += tmpNode->vFactor.z * factor;
-      factor *= t;
-
-      tmpNode = tmpNode->next;
-    }
-  return ret;
-}
-
-/**
-   \brief Calulates the direction of the Curve at time t.
-   \param The time at which to evaluate the curve.
-   \returns The vvaluated Vector.
-*/
-Vector UPointCurve::calcDir (float t)
-{
-  PathNode* tmpNode = firstNode;
-  Vector ret = Vector(0.0,0.0,0.0);
-  float factor = 1.0/t;
-  int k=0;
-  while(tmpNode)
-    {
-      ret.x += tmpNode->vFactor.x * factor *k;
-      ret.y += tmpNode->vFactor.y * factor *k;
-      ret.z += tmpNode->vFactor.z * factor *k;
-      factor *= t;
-      k++;
-      tmpNode = tmpNode->next;
-    }
-  ret.normalize();
-  return ret;
-}
-
-Vector UPointCurve::calcAcc (float t)
-{
-}
-
-/**
-   \brief Calculates the Quaternion needed for our rotations
-   \param t The time at which to evaluate the cuve.
-   \returns The evaluated Quaternion.
-*/
-Quaternion UPointCurve::calcQuat (float t)
-{
-  return Quaternion (calcDir(t), Vector(0,0,1));
-}
-
-
-/**
-  \brief returns the Position of the point calculated on the Curve
-  \return a Vector to the calculated position
-*/
-Vector UPointCurve::getPos(void) const
-{
-  return curvePoint;
-}