Changeset 3953 in orxonox.OLD for orxonox/branches/physics/src/track_manager.cc

Timestamp:

Apr 25, 2005, 9:29:41 AM (19 years ago)

Author:

patrick

Message:

orxonox/branches/physics: merged with trunk - with command svn merge -r 3866:HEAD

File:

• orxonox/branches/physics/src/track_manager.cc (modified) (5 diffs)

orxonox/branches/physics/src/track_manager.cc

@@ -111 +111 @@
     }
   // if not found
-  else 
-    return NULL;
+  return NULL;
 }
 
@@ -141 +140 @@
     }
   // if not found
-  else 
-    return NULL;
+  return NULL;
 }
 
@@ -762 +760 @@
 {
   TrackElement* tmpTrackElem;
+  TrackElement* tmpJoinElem;
   for (int i = 0; i < count; i++)
     if (!this->firstTrackElem->findByID(trackIDs[i]))
@@ -793 +792 @@
   for (int i = 0; i < count; i++)
     {
-      TrackElement* tmpJoinElem = this->firstTrackElem->findByID(trackIDs[i]);
-      if (tmpJoinElem->childCount == 0
-          && tmpJoinElem->endTime > tmpLatestTime)
-        tmpLatestTime = tmpJoinElem->endTime;
+      if(tmpJoinElem = this->firstTrackElem->findByID(trackIDs[i]))
+        {
+          if (tmpJoinElem->childCount == 0
+              && tmpJoinElem->endTime > tmpLatestTime)
+            tmpLatestTime = tmpJoinElem->endTime;
+        }
     }
   // time the main Join.
@@ -804 +805 @@
   for (int i = 1; i < count; i++)
     {
-      TrackElement* tmpJoinElem = this->firstTrackElem->findByID(trackIDs[i]);
-      if (tmpJoinElem->childCount > 0)
-        printf("!!This Curve has children, and as such will not be joined!!\n You can try joining other childless TrackElements to this one!");
-      else
-        {
-          this->addPoint(tmpc2Point, tmpJoinElem);
-          this->addPoint(tmpTangentPoint, tmpJoinElem);
-          this->addPoint(tmpEndPoint, tmpJoinElem);
-          // time all other Joins
-          tmpJoinElem->jumpTime = tmpLatestTime - tmpJoinElem->endTime;
-          
-          //Copying Joint-Info
-          tmpJoinElem->children = firstJoint->children;
-          tmpJoinElem->childCount = firstJoint->childCount;
-          tmpJoinElem->isSavePoint = firstJoint->isSavePoint;
-          tmpJoinElem->isFork = firstJoint->isFork;
-
-          tmpJoinElem->isJoined = true;
+      if( tmpJoinElem = this->firstTrackElem->findByID(trackIDs[i]))
+        {
+          if (tmpJoinElem->childCount > 0)
+            printf("!!This Curve has children, and as such will not be joined!!\n You can try joining other childless TrackElements to this one!");
+          else
+            {
+              this->addPoint(tmpc2Point, tmpJoinElem);
+              this->addPoint(tmpTangentPoint, tmpJoinElem);
+              this->addPoint(tmpEndPoint, tmpJoinElem);
+              // time all other Joins
+              tmpJoinElem->jumpTime = tmpLatestTime - tmpJoinElem->endTime;
+              
+              //Copying Joint-Info
+              tmpJoinElem->children = firstJoint->children;
+              tmpJoinElem->childCount = firstJoint->childCount;
+              tmpJoinElem->isSavePoint = firstJoint->isSavePoint;
+              tmpJoinElem->isFork = firstJoint->isFork;
+              
+              tmpJoinElem->isJoined = true;
+            }
         }
     }