Skip to content

Change minimal near plane calculation #2002

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Change minimal near plane calculation #2002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9584630
Fix near plane computation
375gnu Dec 5, 2023
a4abfce
Convert geodetic coordinates to cartesian for surface bodies
375gnu Dec 5, 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
4 changes: 0 additions & 4 deletions src/celengine/parseobject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,11 +827,7 @@ CreateOrbit(const Selection& centralObject,
Body* centralBody = centralObject.body();
if (centralBody != nullptr)
{
#if 0 // TODO: This should be enabled after #542 is fixed
Vector3d pos = centralBody->geodeticToCartesian(*longlat);
#else
Vector3d pos = centralBody->planetocentricToCartesian(longlat->x(), longlat->y(), longlat->z());
#endif
return new celestia::ephem::SynchronousOrbit(*centralBody, pos);
}
// TODO: Allow fixing objects to the surface of stars.
Expand Down
2 changes: 1 addition & 1 deletion src/celengine/render.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4888,7 +4888,7 @@ Renderer::removeInvisibleItems(const math::Frustum &frustum)
nearZ = -nearZ * nearZcoeff;

if (nearZ > -MinNearPlaneDistance)
ri.nearZ = -max(MinNearPlaneDistance, radius / 2000.0f);
ri.nearZ = -std::min(MinNearPlaneDistance, radius / 2000.0f);
else
ri.nearZ = nearZ;

Expand Down