Changeset 4855 for data/contentcreation/pps/FabianLandau/mover/environments/mover_station_list.cc

Timestamp:

Jun 4, 2007, 12:57:01 AM (17 years ago)

Author:

landauf

Message:

 

File:

• data/contentcreation/pps/FabianLandau/mover/environments/mover_station_list.cc (modified) (6 diffs)

data/contentcreation/pps/FabianLandau/mover/environments/mover_station_list.cc

@@ -236 +236 @@
 }
 
-Quaternion MoverStationList::getTotalRelDir(MoverStation *station)
+Vector MoverStationList::getTotalRelDir(MoverStation *station)
 {
     MoverStationListElement *temp = this->first;
-    Quaternion totalRelDir = Quaternion(0, Vector(0, 0, 0));
+    Vector totalRelDir = Vector(0, 0, 0);
     
     if (station)
@@ -247 +247 @@
             while (temp != 0)
             {
-                totalRelDir *= temp->station->relTargetDir;
+                totalRelDir += temp->station->relTargetDir;
                 if (temp->station == station)
                     break;
@@ -260 +260 @@
                 while (temp->next != 0)
                 {
-                    totalRelDir *= temp->next->station->relTargetDir;
+                    totalRelDir += temp->next->station->relTargetDir;
                     if (temp->next->station == station)
                         break;
@@ -336 +336 @@
 }
 
-Quaternion MoverStationList::getRelTargetDir(MoverStation *station)
+Vector MoverStationList::getRelTargetDir(MoverStation *station)
 {
     if (station)
@@ -345 +345 @@
                 return station->relTargetDir;
             else
-                return station->relTargetDir.inverse();
+                return station->relTargetDir * -1;
         }
         else
@@ -354 +354 @@
             {
                 if (this->goForward)
-                    return (station->relTargetDir / this->getTotalRelDir(moveToStation)).inverse();
+                    return (station->relTargetDir - this->getTotalRelDir(moveToStation)) * -1;
                 else
-                    return (station->relTargetDir / this->getTotalRelDir(moveToStation));
-            }
-        }
-    }
-    
-    return Quaternion(0, Vector(0, 0, 0));
+                    return station->relTargetDir - this->getTotalRelDir(moveToStation);
+            }
+        }
+    }
+    
+    return Vector(0, 0, 0);
 }
 
 Vector MoverStationList::getVelocity(MoverStation *station)
 {
-    Vector velocity = Vector(0, 0, 0);
-
     if (station)
         if (station->movingTime != 0)
-            velocity = this->getRelTargetCoor(station) / station->movingTime;
-
-    return velocity;
-}
-
-Quaternion MoverStationList::getRotation(MoverStation *station)
-{
-    Quaternion rotation = Quaternion(0, Vector(0, 0, 0));
-
+            return this->getRelTargetCoor(station) / station->movingTime;
+
+    return Vector(0, 0, 0);
+}
+
+Vector MoverStationList::getRotation(MoverStation *station)
+{
     if (station)
         if (station->movingTime != 0)
-            rotation = Quaternion(this->getRelTargetDir(station).w / station->movingTime, this->getRelTargetDir(station).v);
-
-    return rotation;
+            return this->getRelTargetDir(station) / station->movingTime;
+
+    return Vector(0, 0, 0);
 }