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

GuiTraceRay from theater ray intersection instead of camera position. #1782

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
Open

GuiTraceRay from theater ray intersection instead of camera position. #1782

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2a0a27e
GuiTraceRay from theater ray intersection instead of camera position.
saurtron Nov 25, 2024
fab8808
Fix typo.
saurtron Nov 25, 2024
940bc8c
Fix error in plane equation.
saurtron Nov 25, 2024
76e69d4
Keep track of max unit altitude inside UnitHandler.
saurtron Nov 25, 2024
146709b
Make new camera methods const and improve variable name.
saurtron Nov 25, 2024
9d167ce
use float3::dot
saurtron Nov 25, 2024
d89a16d
Change NULL to nullptr at GuiTraceRay calls.
saurtron Nov 25, 2024
5773b9b
Change function name to TracePointToMaxAltitude and ensure proper
saurtron Nov 25, 2024
9850d92
Init unit max altitude to readMap->GetCurrMaxHeight and change how unit
saurtron Nov 27, 2024
cc626ec
Also keep maxaltitude for features.
saurtron Nov 27, 2024
8b8c81e
Fix function call.
saurtron Nov 27, 2024
01c3ef0
The frame number to check needs to be 2^x-1.
saurtron Nov 27, 2024
b15e68a
Improve theater ray intersection by using std::optional and removing
saurtron Nov 27, 2024
0e190f8
Don't calculate theater intersection if bottom frustum isn't parallel to
saurtron Nov 30, 2024
3af3c51
Use fbl.y/100000.0 instead of stl::epsilon since the frustum points
saurtron Dec 1, 2024
ad030ea
Check camera is straight enough by tracing cam to ftl to theater plane.
saurtron Dec 1, 2024
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
12 changes: 10 additions & 2 deletions rts/Game/Camera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -795,8 +795,16 @@ float3 CCamera::NearTheaterIntersection(const float3& dir, const float rayLength
if (pos.y < maxAltitude)
return pos;

const auto fv1 = TracePointToMaxAltitude(GetFrustumVert(CCamera::FRUSTUM_POINT_FBL), rayLength, maxAltitude);
const auto fv2 = TracePointToMaxAltitude(GetFrustumVert(CCamera::FRUSTUM_POINT_FBR), rayLength, maxAltitude);
const auto fbl = GetFrustumVert(CCamera::FRUSTUM_POINT_FBL);
const auto fbr = GetFrustumVert(CCamera::FRUSTUM_POINT_FBR);
const auto ftl = GetFrustumVert(CCamera::FRUSTUM_POINT_FTL);

// check the bottom frustum is parallel to ground and lower than the top frustum
if ((std::abs(fbl.y-fbr.y) > std::numeric_limits<float>::epsilon()) || (fbl.y >= ftl.y))
Copy link
Collaborator

Choose a reason for hiding this comment

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

epscmp exists, perhaps use that? Maybe std::numerlic_limits<T>::epsilon() could even become the default for its 3rd arg:

spring/rts/System/SpringMath.h

Line 141 in a2dd682

template<class T> inline bool epscmp(const T a, const T b, const T eps) {

return pos;

const auto fv1 = TracePointToMaxAltitude(fbl, rayLength, maxAltitude);
const auto fv2 = TracePointToMaxAltitude(fbr, rayLength, maxAltitude);
if (!fv1 || !fv2)
return pos;

Expand Down