Changeset 708 for code/branches/FICN/src/orxonox/Arrival.h

Timestamp:

Dec 28, 2007, 10:30:29 PM (16 years ago)

Author:

rgrieder

Message:

• added Vector2, Vector3, Matrix3, ColourValue, Quaternion and String to the misc folder as header files (each of them contains #include <string> … typedef std::string String , etc.)
• please use String from now on by including <misc/String.h"
• removed #include <OgreVector3.h", etc. from "CoreIncludes.h" (adjusted all source files)
• adjusted all the source files (except network, that keeps <string> for the moment) (what a mess..)
• moved usleep hack to misc/Sleep.h
• relative include paths for files from other root directories (like misc, network, etc.) (but it stills writes "../Orxonox.h" when in folder orxonox/objects)
• "OgreSceneManager.h" —> <OgreSceneManager.h>
• included OrxonoxPrereqs in every file in folder orxonox
• moved HUD and ParticleInterface to namespace orxonox
• removed some using namespace Ogre/std when appropriate
• I hope I haven't forgotten important points..

File:

• code/branches/FICN/src/orxonox/Arrival.h (modified) (2 diffs)

code/branches/FICN/src/orxonox/Arrival.h

@@ -6 +6 @@
 #define _Arrival_H__
 
-// #include <Ogre.h>
-#include <OgreVector3.h>
+#include "misc/Vector3.h"
+#include "misc/Quaternion.h"
 
-
-#include <iostream>
-
-// FIXME: using namspace xy; in header files is a bad idea
-using namespace std;
-using namespace Ogre;
-
-class Arrival {
-
+namespace orxonox
+{
+  class Arrival
+  {
   public:
     Vector3 location;           //!< locationvector of the element
@@ -27 +22 @@
 
 
-  Arrival() {
-    acceleration = (0,0,0);
-    speed = (0,0,0);
-    location = (0,0,0);
-    target = (0,0,0);
-  }
+    Arrival() {
+      acceleration = (0,0,0);
+      speed = (0,0,0);
+      location = (0,0,0);
+      target = (0,0,0);
+    }
 
-  Arrival(Vector3 location_, Vector3 speed_, Vector3 acceleration_, Vector3 target_) {
-    acceleration = acceleration_;
-    speed = speed_;
-    location = location_;
-    target = target_;
-  }
+    Arrival(Vector3 location_, Vector3 speed_, Vector3 acceleration_, Vector3 target_) {
+      acceleration = acceleration_;
+      speed = speed_;
+      location = location_;
+      target = target_;
+    }
 
-  void setValues(Vector3 location_, Vector3 speed_, Vector3 acceleration_, Vector3 target_) {
-    acceleration = acceleration_;
-    speed = speed_;
-    location = location_;
-    target = target_;
-  }
+    void setValues(Vector3 location_, Vector3 speed_, Vector3 acceleration_, Vector3 target_) {
+      acceleration = acceleration_;
+      speed = speed_;
+      location = location_;
+      target = target_;
+    }
 
-  void setTarget(Vector3 target_) {
-    setValues(this.location, this.speed, this.acceleration, target_);
-  }
+    void setTarget(Vector3 target_) {
+      setValues(this->location, this->speed, this->acceleration, target_);
+    }
 
-  Vector3 getDirection() {
-    Vector3 direction = target-location;
-  }
+    Vector3 getDirection() {
+      Vector3 direction = target-location;
+    }
 
-  double relativeDirectApproach() {
-    // Maxspeed / accelerationForwards = time needed to break with max acceleration
-    // 2*getDistance()length/(MaxSpeed/accelerationForwards)^2 = required acceleration to arrive at the target with speed = 0
-    return (accelerationForwards / (2*getDirection().length / (MaxSpeed/accelerationForwards)^2) );
-  }
+    double relativeDirectApproach() {
+      // Maxspeed / accelerationForwards = time needed to break with max acceleration
+      // 2*getDistance()length/(MaxSpeed/accelerationForwards)^2 = required acceleration to arrive at the target with speed = 0
+      return (accelerationForwards / (2*getDirection().length() / ((MaxSpeed/accelerationForwards)*(MaxSpeed/accelerationForwards))) );
+    }
 
-  void Approach() {
-    Quaternion rotation = (0,0,0,0);
-    if (relativeDirectApproach() > 1) {
-      float length = speed.length();
-      speed = (speed+getDirection());
-      speed.normalise();
-      speed = speed*length;
-      if (relativeDirectApproach > 4) {
-        //accelerate
+    void Approach() {
+      Quaternion rotation = Quaternion(0,0,0,0);
+      if (relativeDirectApproach() > 1)
+      {
+        float length = speed.length();
+        speed = (speed+getDirection());
+        speed.normalise();
+        speed = speed*length;
+        if (relativeDirectApproach() > 4)
+        {
+          //accelerate
+        }
+        else
+        {
+          // speed will stay constant
+        }
       }
       else {
-        // speed will stay constant
       }
-
-
-    }
-    else {
-
-
     }
 
-  }
+  };
 }