Changeset 10291 for code/trunk/src/libraries

Timestamp:

Mar 1, 2015, 3:08:45 PM (10 years ago)

Author:

landauf

Message:

simplified Math: temp is always positive, thus only solution1 is necessary
simplified HUDNavigation: use existing function to calculation aim-position

File:

• code/trunk/src/libraries/util/Math.cc (modified) (1 diff)

code/trunk/src/libraries/util/Math.cc

@@ -360 +360 @@
             return orxonox::Vector3::ZERO;
 
-        float temp = sqrt(discriminant);
-        float solution1 = (-b + temp) / (2 * a);
-        float solution2 = (-b - temp) / (2 * a);
-        float time = 1.0f / std::max(solution1, solution2);
+        float solution = (-b + sqrt(discriminant)) / (2 * a);
+        float time = 1.0f / solution;
 
         return (targetposition + targetvelocity * time);