Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix cannon prediction bugs #891

Merged
merged 15 commits into from
Jul 28, 2023
Merged

fix cannon prediction bugs #891

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d602ea5
fix cannon prediction bugs
KyleAnthonyShepherd Jul 5, 2023
dc73705
code comment update
KyleAnthonyShepherd Jul 11, 2023
585dc41
optimization
KyleAnthonyShepherd Jul 12, 2023
e48acc2
circle of ground around target to ignore now proportional to velocity
KyleAnthonyShepherd Jul 12, 2023
a1b7d1d
Revert "circle of ground around target to ignore now proportional to …
KyleAnthonyShepherd Jul 12, 2023
c696617
circle of ground around target to ignore now proportional to velocity…
KyleAnthonyShepherd Jul 12, 2023
e4056c6
fix
KyleAnthonyShepherd Jul 12, 2023
963d7b3
change heuristic to be based on projectile vertical velocity
KyleAnthonyShepherd Jul 13, 2023
3d2178b
revert dumb git thing
KyleAnthonyShepherd Jul 13, 2023
3cc8714
do the chord check based on the projectile vertical velocity at the t…
KyleAnthonyShepherd Jul 13, 2023
cb96d63
Merge branch 'beyond-all-reason:BAR105' into cannon-traceray
KyleAnthonyShepherd Jul 28, 2023
efd0f7d
Adjust ground collision check criteria
KyleAnthonyShepherd Jul 28, 2023
ca2e37c
comment cleanup, std::max to avoid possible case of divide by zero.
KyleAnthonyShepherd Jul 28, 2023
701a4a1
undo ground.cpp changes
KyleAnthonyShepherd Jul 28, 2023
766fc37
comment update, and change endPos calculation location
KyleAnthonyShepherd Jul 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion rts/Map/Ground.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
#include "Sim/Misc/GlobalSynced.h"
#include "System/SpringMath.h"

#include "Rendering/GlobalRendering.h"
#include "Sim/Misc/GeometricObjects.h"

#include <cassert>
#include <limits>

Expand Down Expand Up @@ -588,12 +591,27 @@ float CGround::TrajectoryGroundCol(const float3& trajStartPos, const float3& tra
const float3 pos = (trajStartPos + dir * dist) + (alt * dist * dist);

#if 1
if (GetApproximateHeight(pos) > pos.y)
if (GetApproximateHeight(pos) > pos.y) {
if (globalRendering->drawDebugTraceRay) {

#define go geometricObjects

// red line pointing to hitPos
go->SetColor(go->AddLine(pos, trajStartPos, 3, 0, GAME_SPEED), 1.0f, 0.0f, 0.0f, 1.0f);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the #define looks very meek?

Suggested change
go->SetColor(go->AddLine(pos, trajStartPos, 3, 0, GAME_SPEED), 1.0f, 0.0f, 0.0f, 1.0f);
geometricObjects->SetColor(geometricObjects->AddLine(pos, trajStartPos, 3, 0, GAME_SPEED), 1.0f, 0.0f, 0.0f, 1.0f);

// blue lines showing chord checks
// While using this debug, on SlowUpdate Frames, CWeapon::TryTargetHeading will assume the unit chassis rotates to face the target,
// so the tstPos will not be lined up with any part of the unit.
// resulting in two visible debug lines. One from the weaponmuzzle, one from the rotated weaponmuzzle

#undef go
}
return dist;
}
#else
if (GetHeightReal(pos) > pos.y)
return dist;
#endif

}

return -1.0f;
Expand Down