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

improved projectile code

Browse Source
This commit is contained in:
Orange
2024-05-07 02:12:17 +03:00
parent a2b1b5635a
commit edc01cfece
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/uml/ProjectilePredictor.h
View File

@@ -49,7 +49,7 @@ namespace uml::prediction
const Vector3& targetPosition) const; const Vector3& targetPosition) const;
[[nodiscard]] [[nodiscard]]
float ProjectileTravelTime(const Vector3& end, const Projectile& projectile, std::optional<float> ProjectileTravelTime(const Vector3& end, const Projectile& projectile,
const float angle) const; const float angle) const;
}; };

13
source/ProjectilePredictor.cpp
View File

@@ -35,7 +35,7 @@ namespace uml::prediction
const auto timeToHit = ProjectileTravelTime(predictedTargetPosition, const auto timeToHit = ProjectileTravelTime(predictedTargetPosition,
projectile, projectile,
projectilePitch.value()); projectilePitch.value());
if (timeToHit > time) if (!timeToHit.has_value() || timeToHit.value() > time)
continue; continue;
const auto delta2d = (predictedTargetPosition - projectile.m_origin).Length2D(); const auto delta2d = (predictedTargetPosition - projectile.m_origin).Length2D();
@@ -65,7 +65,7 @@ namespace uml::prediction
const Vector3 &targetPosition) const Vector3 &targetPosition)
const const
{ {
const auto bulletGravity = projectile.m_gravityMultiplier*750.f; const auto bulletGravity = m_gravity * projectile.m_gravityMultiplier;
const auto delta = targetPosition - projectile.m_origin;; const auto delta = targetPosition - projectile.m_origin;;
const auto distance2d = delta.Length2D(); const auto distance2d = delta.Length2D();
@@ -83,7 +83,7 @@ namespace uml::prediction
return angles::RadToDeg(angle); return angles::RadToDeg(angle);
} }
float ProjectilePredictor::ProjectileTravelTime(const Vector3 &end, std::optional<float> ProjectilePredictor::ProjectileTravelTime(const Vector3 &end,
const Projectile &projectile, const Projectile &projectile,
const float angle) const const float angle) const
{ {
@@ -91,19 +91,16 @@ namespace uml::prediction
launchAngles.x = angle; launchAngles.x = angle;
const auto velocity = Vector3::CreateVelocity(launchAngles, projectile.m_velocity); const auto velocity = Vector3::CreateVelocity(launchAngles, projectile.m_velocity);
auto prevProjectilePosition = projectile.m_origin;
for (float time = 0.0f; time <= m_maxTravelTime; time += m_timeStepSize) 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 * std::pow(time, 2.f) * 0.5f; currentPos.z -= m_gravity * projectile.m_gravityMultiplier * std::pow(time, 2.f) * 0.5f;
if (prevProjectilePosition.DistTo(end) < currentPos.DistTo(end)) if (currentPos.DistTo(end) <= 25.f)
return time; return time;
prevProjectilePosition = currentPos;
} }
return 0; return std::nullopt;
} }
} }