Changeset 3049 for code/trunk/src/util

Timestamp:

May 25, 2009, 3:26:43 AM (16 years ago)

Author:

landauf

Message:

• Added option to add a Controller to a ControllableEntity in the XML file
• Added two new classes: WaypointController (follows waypoints) and WaypointPatrolController (follows waypoints and kills enemies within a given radius)
• Radarpoints in TeamDeathmatch are now coloured

File:

• code/trunk/src/util/Math.cc (modified) (2 diffs)

code/trunk/src/util/Math.cc

@@ -129 +129 @@
 
         float projectionlength = projection.length();
-        if (projectionlength == 0) return orxonox::Vector2(0, 0);
+        if (projectionlength == 0)
+        {
+            if (myposition.dotProduct(otherposition) >= 0)
+                return orxonox::Vector2(0, 0);
+            else
+                return orxonox::Vector2(0, 1);
+        }
+
         float angle = acos(clamp<float>(myorthonormal.dotProduct(projection) / projectionlength, -1, 1));
 
@@ -161 +168 @@
 
         float projectionlength = projection.length();
-        if (projectionlength == 0) return orxonox::Vector2(0, 0);
+        if (projectionlength == 0)
+        {
+            if (myposition.dotProduct(otherposition) >= 0)
+                return orxonox::Vector2(0, 0);
+            else
+                return orxonox::Vector2(0, 1);
+        }
         float angle = acos(clamp<float>(myorthonormal.dotProduct(projection) / projectionlength, -1, 1));