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

Changed label display logic so that the label of a barycenter is shown when 

it's the center of a planet or dwarf planet system.
ver1_6_1
Chris Laurel 2008-09-16 23:40:30 +00:00
parent f2e9fe9889
commit a12423b5de
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/celengine/render.cpp
View File

@ -8392,7 +8392,7 @@ void Renderer::addRenderListEntries(RenderListEntry& rle,
{
bool visibleAsPoint = rle.appMag < faintestPlanetMag && body.isVisibleAsPoint();
if ((rle.discSizeInPixels > 1 || visibleAsPoint || isLabeled) && body.isVisible())
if (rle.discSizeInPixels > 1 || visibleAsPoint || isLabeled)
{
rle.renderableType = RenderListEntry::RenderableBody;
rle.body = &body;
@ -8563,9 +8563,22 @@ void Renderer::buildRenderLists(const Point3d& astrocentricObserverPos,
}
bool visibleAsPoint = appMag < faintestPlanetMag && body->isVisibleAsPoint();
bool isLabeled = (body->getClassification() & labelClassMask) != 0;
if ((discSize > 1 || visibleAsPoint || isLabeled) && body->isVisible())
bool isLabeled = (body->getOrbitClassification() & labelClassMask) != 0;
bool visible = body->isVisible();
// Special case for barycenters of planetary systems. Ordinarily, labels of invisible
// objects should not be shown, but we do want them to be shown for planetary system
// barycenters (e.g. Pluto-Charon)
if (!visible && isLabeled)
{
if (body->getClassification() == Body::Invisible &&
(body->getOrbitClassification() & (Body::Planet | Body::DwarfPlanet | Body::Moon)))
{
visible = true;
}
}
if ((discSize > 1 || visibleAsPoint || isLabeled) && visible)
{
RenderListEntry rle;
@ -10811,6 +10824,11 @@ void Renderer::loadTextures(Body* body)
{
body->getRings()->texture.find(textureResolution);
}
if (body->getGeometry() != InvalidResource)
{
GetGeometryManager()->find(body->getGeometry());
}
}