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

Timestamp:

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

Author:

landauf

Message:

 

File:

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

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

@@ -56 +56 @@
     
     this->originCoor = Vector(0, 0, 0);
-    this->originDir = Quaternion(0, Vector(0, 0, 0));
+    this->originDir = Vector(0, 0, 0);
 
     this->soundSource_starting.setSourceNode(this);
@@ -69 +69 @@
         
     this->originCoor = this->getAbsCoor();
-    this->originDir = this->getAbsDir();
+    this->originDir = this->getAbsDir().getRotation();
 
     PRINTF(0)("1_3\n");
@@ -291 +291 @@
     if (this->stations)
     {
-        this->shiftCoor(this->stations->getVelocity(this->station) * dt);
-        this->setAbsDir(this->originDir * (this->stations->getRotation(this->station) * this->time));
+        this->setAbsCoor(this->originCoor + this->stations->getVelocity(this->station) * this->time);
+        this->setAbsDir(VtoQ(this->originDir + this->stations->getRotation(this->station) * this->time));
     }
     
@@ -304 +304 @@
             this->time = this->stations->getMovingTime(this->station) - this->time;
             this->originCoor = this->originCoor - this->stations->getRelTargetCoor(this->station);
-            this->originDir = this->originDir / this->stations->getRelTargetDir(this->station);
+            this->originDir = this->originDir - this->stations->getRelTargetDir(this->station);
         }
     }
 
-    if (/*this->reachedStationsTarget(dt) || */(this->stations && (this->time >= 1.1 * this->stations->getMovingTime(this->station))))
+    if (/*this->reachedStationsTarget(dt) || */(this->stations && (this->time >= 1.0 * this->stations->getMovingTime(this->station))))
 //    if (this->stations && (this->time >= this->stations->getMovingTime(this->station)))
     {
         this->setAbsCoor(this->originCoor + this->stations->getRelTargetCoor(this->station));
-        this->setAbsDir(this->originDir * this->stations->getRelTargetDir(this->station));
+        this->setAbsDir(VtoQ(this->originDir + this->stations->getRelTargetDir(this->station)));
 
         if (this->stations->getEndingSound(this->station).loaded())
@@ -319 +319 @@
 
         this->originCoor = this->originCoor + this->stations->getRelTargetCoor(this->station);
-        this->originDir = this->originDir * this->stations->getRelTargetDir(this->station);
+        this->originDir = this->originDir + this->stations->getRelTargetDir(this->station);
         
         return STAY;
@@ -345 +345 @@
     if (this->stations)
         if ((this->getAbsCoor() - (this->originCoor + this->stations->getRelTargetCoor(this->station))).len() <= 1.2 * (this->stations->getVelocity(this->station) * dt).len())
-            if (fabs((this->getAbsDir() / (this->originDir * this->stations->getRelTargetDir(this->station))).w) <= 1.2 * fabs(this->stations->getRotation(this->station).w * dt))
+            if ((this->getAbsDir().getRotation() - (this->originDir + this->stations->getRelTargetDir(this->station))).len() <= 1.2 * (this->stations->getRotation(this->station) * dt).len())
                 return true;