Changeset 1608 for code/trunk/src/util

Timestamp:

Jun 17, 2008, 3:33:03 PM (17 years ago)

Author:

landauf

Message:

• added a backlight to all SpaceShips, leaving a trail behind (configurable)
• changed some lines in SpaceShipAI, AI seems to be more fair now…
• fixed a bug in Math.cc algorithms to calculate radar positions and AI movement (division by zero and acos of 1.000001)
• added destroy() and destroydelay to ParticleSpawner, so the smoketrail of a destroyed enemy stays visible for some seconds
• added 2 lines to Orxonox.cc to make the length of the backlight-trail independend of the gamespeed

########################
# !!! MEDIA UPDATE !!! #
########################

File:

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

code/trunk/src/util/Math.cc

@@ -75 +75 @@
 {
     orxonox::Vector3 distance = otherposition - myposition;
-    return acos(mydirection.dotProduct(distance) / distance.length());
+    float distancelength = distance.length();
+    if (distancelength == 0)
+        return 0;
+    else
+        return acos(clamp<float>(mydirection.dotProduct(distance) / distancelength, -1, 1));
 }
 
@@ -84 +88 @@
     // project difference vector on our plane
     orxonox::Vector3 projection = Ogre::Plane(mydirection, myposition).projectVector(distance);
-    float angle = acos(myorthonormal.dotProduct(projection) / projection.length());
+
+    float projectionlength = projection.length();
+    if (projectionlength == 0) return orxonox::Vector2(0, 0);
+    float angle = acos(clamp<float>(myorthonormal.dotProduct(projection) / projectionlength, -1, 1));
 
     if ((mydirection.crossProduct(myorthonormal)).dotProduct(distance) > 0)
@@ -98 +105 @@
     // project difference vector on our plane
     orxonox::Vector3 projection = Ogre::Plane(mydirection, myposition).projectVector(distance);
-    float angle = acos(myorthonormal.dotProduct(projection) / projection.length());
-    float radius = acos(mydirection.dotProduct(distance) / distance.length()) / Ogre::Math::PI;
+
+    float projectionlength = projection.length();
+    if (projectionlength == 0) return orxonox::Vector2(0, 0);
+    float angle = acos(clamp<float>(myorthonormal.dotProduct(projection) / projectionlength, -1, 1));
+
+    float distancelength = distance.length();
+    if (distancelength == 0) return orxonox::Vector2(0, 0);
+    float radius = acos(clamp<float>(mydirection.dotProduct(distance) / distancelength, -1, 1)) / Ogre::Math::PI;
 
     if ((mydirection.crossProduct(myorthonormal)).dotProduct(distance) > 0)