spacecruft
/
celestia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make pick functions ignore bodies that aren't extant at the current simulation time.

ver1_5_1
Chris Laurel 2003-12-12 05:53:37 +00:00
parent fd6ddfc71a
commit d518743c59
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/celengine/universe.cpp
View File

@ -274,8 +274,8 @@ static bool ApproxPlanetPickTraversal(Body* body, void* info)
{
PlanetPickInfo* pickInfo = (PlanetPickInfo*) info;
// Reject invisible bodies
if (body->getClassification() == Body::Invisible)
// Reject invisible bodies and bodies that don't exist at the current time
if (body->getClassification() == Body::Invisible || !body->extant(pickInfo->jd))
return true;
Point3d bpos = body->getHeliocentricPosition(pickInfo->jd);
@ -318,6 +318,7 @@ static bool ExactPlanetPickTraversal(Body* body, void* info)
// Test for intersection with the bounding sphere
if (body->getClassification() != Body::Invisible &&
body->extant(pickInfo->jd) &&
testIntersection(pickInfo->pickRay, Sphered(bpos, radius), distance))
{
if (body->getMesh() == InvalidResource)
@ -425,7 +426,7 @@ Selection Universe::pickPlanet(SolarSystem& solarSystem,
// sufficiently close to the pickRay
solarSystem.getPlanets()->traverse(ApproxPlanetPickTraversal,
(void*) &pickInfo);
(void*) &pickInfo);
if (pickInfo.closestBody == closestBody)
return Selection(closestBody);
// Nothing else around, select the body and return