admin/omath
1
0
Fork 0
mirror of https://github.com/orange-cpp/omath.git synced 2026-02-13 07:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed broken proj prediction

Browse Source
This commit is contained in:
Orange
2024-05-07 02:12:17 +03:00
parent 1b59e254f4
commit 618971adbb
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/ProjectilePredictor.cpp
View File

@@ -7,6 +7,7 @@
#include "uml/angles.h" #include "uml/angles.h"
#include <cmath> #include <cmath>
#include <cstdio>
namespace uml::prediction namespace uml::prediction
{ {
@@ -23,7 +24,7 @@ namespace uml::prediction
{ {
for (float time = 0.0f; time <= m_maxTravelTime; time += m_timeStepSize) for (float time = 0.0f; time <= m_maxTravelTime; time += m_timeStepSize)
{ {
const auto predictedTargetPosition = LinearPrediction(target, time); auto predictedTargetPosition = LinearPrediction(target, time);
const auto projectilePitch = const auto projectilePitch =
MaybeCalculateProjectileLaunchPitchAngle(projectile, predictedTargetPosition); MaybeCalculateProjectileLaunchPitchAngle(projectile, predictedTargetPosition);
@@ -37,8 +38,12 @@ namespace uml::prediction
if (timeToHit > time) if (timeToHit > time)
continue; continue;
return Vector3(); const auto delta2d = (predictedTargetPosition - projectile.m_origin).Length2D();
const auto height = delta2d * std::tan(angles::DegToRad(projectilePitch.value()));
predictedTargetPosition.z = projectile.m_origin.z + height;
return predictedTargetPosition;
} }
@@ -60,21 +65,21 @@ namespace uml::prediction
const Vector3 &targetPosition) const Vector3 &targetPosition)
const const
{ {
const auto delta = targetPosition - projectile.m_origin; auto bulletSpeed = projectile.m_velocity;
const auto distance2d = delta.Length2D(); auto bulletGravity = projectile.m_gravityMultiplier*750.f;
const auto projectileGravity = m_gravity * projectile.m_gravityMultiplier; const auto delta = targetPosition - projectile.m_origin;;
float root = std::pow(projectile.m_velocity, 4.f) - projectileGravity * const auto distance2d = delta.Length2D();
(projectileGravity * std::pow(distance2d, 2.f)
+ 2.0f * delta.z * std::pow(projectile.m_velocity, 2.f));
float root = std::pow(projectile.m_velocity, 4.f) - bulletGravity * (bulletGravity *
std::pow(distance2d, 2.f) + 2.0f * delta.z * std::pow(projectile.m_velocity, 2));
if (root < 0.0f) if (root < 0.0f)
return std::nullopt; return std::nullopt;
root = std::sqrt(root); root = std::sqrt(root);
const float angle = std::atan((std::pow(projectile.m_velocity, 2.f) - root) / (bulletGravity * distance2d));
const float angle = std::atan((std::pow(projectile.m_velocity, 2.f) - root)
/ (projectile.m_velocity * distance2d));
return angles::RadToDeg(angle); return angles::RadToDeg(angle);
} }
@@ -90,7 +95,7 @@ namespace uml::prediction
const auto velocity = Vector3::CreateVelocity(launchAngles, projectile.m_velocity); const auto velocity = Vector3::CreateVelocity(launchAngles, projectile.m_velocity);
auto prevProjectilePosition = projectile.m_origin; auto prevProjectilePosition = projectile.m_origin;
for (float time = 0.0f; time <= m_maxTravelTime; time += 0.0001f) for (float time = 0.0f; time <= m_maxTravelTime; time += m_timeStepSize)
{ {
auto currentPos = projectile.m_origin + velocity * time; auto currentPos = projectile.m_origin + velocity * time;
currentPos.z -= (m_gravity * projectile.m_gravityMultiplier) currentPos.z -= (m_gravity * projectile.m_gravityMultiplier)