Changeset 10291 for code/trunk

Timestamp:

Mar 1, 2015, 3:08:45 PM (9 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

Location:

code/trunk/src

Files:

• libraries/util/Math.cc (modified) (1 diff)
• modules/overlays/hud/HUDNavigation.cc (modified) (3 diffs)
• modules/overlays/hud/HUDNavigation.h (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);

code/trunk/src/modules/overlays/hud/HUDNavigation.cc

@@ -487 +487 @@
                     {
                         // get the aim position
-                        Vector3* targetPos = this->toAimPosition(it->first);
+                        const Vector3& targetPos = this->toAimPosition(it->first);
                         // Transform to screen coordinates
-                        Vector3 screenPos = camTransform * (*targetPos);
+                        Vector3 screenPos = camTransform * targetPos;
                         // Check if the target marker is in view too
                         if(screenPos.z > 1 || screenPos.x < -1.0 || screenPos.x > 1.0
@@ -502 +502 @@
                             it->second.target_->show();
                         }
-                        delete targetPos;
                     }
 
@@ -679 +678 @@
     }
 
-    Vector3* HUDNavigation::toAimPosition(RadarViewable* target) const
+    Vector3 HUDNavigation::toAimPosition(RadarViewable* target) const
     {
         Vector3 wePosition = HumanController::getLocalControllerSingleton()->getControllableEntity()->getWorldPosition();
         Vector3 targetPosition = target->getRVWorldPosition();
         Vector3 targetSpeed = target->getRVVelocity();
-        Vector3 relativePosition = targetPosition - wePosition; //Vector from attacker to target
-
-        float p_half = relativePosition.dotProduct(targetSpeed)/(targetSpeed.squaredLength() - this->currentMunitionSpeed_ * this->currentMunitionSpeed_);
-        float time1 = -p_half + sqrt(p_half * p_half - relativePosition.squaredLength()/(targetSpeed.squaredLength() - this->currentMunitionSpeed_ * this->currentMunitionSpeed_));
-
-        Vector3* result = new Vector3(targetPosition + targetSpeed * time1);
-        return result;
+
+        return getPredictedPosition(wePosition, this->currentMunitionSpeed_, targetPosition, targetSpeed);
     }
 

code/trunk/src/modules/overlays/hud/HUDNavigation.h

@@ -138 +138 @@
             float getArrowSizeY(int dist) const;
 
-            Vector3* toAimPosition(RadarViewable* target) const;
+            Vector3 toAimPosition(RadarViewable* target) const;
 
             std::map<RadarViewable*, ObjectInfo> activeObjectList_;