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

Restore star orbits (Closes: #448) 

Was broken by e73e366
pull/3/head
Hleb Valoshka 2019-10-21 21:11:57 +03:00
parent f84ca4277a
commit 8957e22472
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/celengine/render.cpp
View File

@ -2565,18 +2565,25 @@ void Renderer::draw(const Observer& observer,
bool foundBrightestStar = false; bool foundBrightestStar = false;
#endif #endif
if ((renderFlags & ShowSSO) != 0) if ((renderFlags & (ShowSSO | ShowOrbits)) != 0)
{ {
nearStars.clear(); nearStars.clear();
universe.getNearStars(observer.getPosition(), SolarSystemMaxDistance, nearStars); universe.getNearStars(observer.getPosition(), SolarSystemMaxDistance, nearStars);
// Set up direct light sources (i.e. just stars at the moment) // Set up direct light sources (i.e. just stars at the moment)
setupLightSources(nearStars, observer.getPosition(), now, lightSourceList, renderFlags); // Skip if only star orbits to be shown
if ((renderFlags & ShowSSO) != 0)
setupLightSources(nearStars, observer.getPosition(), now, lightSourceList, renderFlags);
// Traverse the frame trees of each nearby solar system and // Traverse the frame trees of each nearby solar system and
// build the list of objects to be rendered. // build the list of objects to be rendered.
for (const auto sun : nearStars) for (const auto sun : nearStars)
{ {
addStarOrbitToRenderList(*sun, observer, now);
// Skip if only star orbits to be shown
if ((renderFlags & ShowSSO) == 0)
continue;
SolarSystem* solarSystem = universe.getSolarSystem(sun); SolarSystem* solarSystem = universe.getSolarSystem(sun);
if (solarSystem == nullptr) if (solarSystem == nullptr)
continue; continue;
@ -2603,7 +2610,7 @@ void Renderer::draw(const Observer& observer,
solarSysTree, solarSysTree,
observer, observer,
now); now);
if (renderFlags & ShowOrbits) if ((renderFlags & ShowOrbits) != 0)
{ {
buildOrbitLists(astrocentricObserverPos, buildOrbitLists(astrocentricObserverPos,
observer.getOrientation(), observer.getOrientation(),
@ -2611,8 +2618,6 @@ void Renderer::draw(const Observer& observer,
solarSysTree, solarSysTree,
now); now);
} }
addStarOrbitToRenderList(*sun, observer, now);
} }
if ((labelMode & BodyLabelMask) != 0) if ((labelMode & BodyLabelMask) != 0)