Changeset 4122 in orxonox.OLD for orxonox/branches/heightMap/src/track_manager.cc

Timestamp:

May 9, 2005, 11:29:19 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/heightMap: merged the Trunk back into branches/heightMap:
merged with Command
svn merge -r 3918:HEAD trunk branches/heightMap
conflicts resolved in favor of the Trunk

Location:

orxonox/branches/heightMap

Files:

• . (modified) (1 prop)
• src/track_manager.cc (modified) (4 diffs)

orxonox/branches/heightMap

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+

orxonox/branches/heightMap/src/track_manager.cc

@@ -29 +29 @@
 
 using namespace std;
+
+CREATE_FACTORY(TrackManager);
 
 /**
@@ -312 +314 @@
   PNode* tmpNode = (PNode*)node;
 
-  if (tmpNode->getRelCoor()->z < 0)
+  if (tmpNode->getRelCoor().z < 0)
     return 0;
   else 
@@ -333 +335 @@
   PNode* tmpNode = (PNode*)node;
 
-  Vector nodeRelCoord = *tmpNode->getRelCoor();
+  Vector nodeRelCoord = tmpNode->getRelCoor();
   float minDist = 100000000;
   int childNumber = 0;
@@ -396 +398 @@
   this->textAnimation->setInfinity(ANIM_INF_CONSTANT);
 }
+
+
+/**
+   \brief loads a trackElement from a TiXmlElement
+   \param root the TiXmlElement to load the Data from
+
+*/
+TrackManager::TrackManager( TiXmlElement* root)
+{
+
+}
+
+
 
 /**

@@ -1 @@
-data http://svn.orxonox.ethz.ch/data
+