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

Cleanup renderFlags definitions

pull/703/head
Hleb Valoshka 2020-04-16 10:17:21 +03:00
parent 97a2ae6330
commit 4b6062838b
2 changed files with 29 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/celengine/render.cpp
View File

@ -211,21 +211,6 @@ Color Renderer::EclipticColor (0.5f, 0.1f, 0.1f);
Color Renderer::SelectionCursorColor (1.0f, 0.0f, 0.0f);
// Solar system objects
constexpr const uint64_t ShowSSO = Renderer::ShowPlanets |
Renderer::ShowDwarfPlanets |
Renderer::ShowMoons |
Renderer::ShowMinorMoons |
Renderer::ShowAsteroids |
Renderer::ShowComets |
Renderer::ShowPlanetRings |
Renderer::ShowSpacecrafts;
// Deep Sky Objects
constexpr const uint64_t ShowDSO = Renderer::ShowGalaxies |
Renderer::ShowGlobulars |
Renderer::ShowNebulae |
Renderer::ShowOpenClusters;
// Some useful unit conversions
inline float mmToInches(float mm)
{
@ -1676,14 +1661,14 @@ void Renderer::draw(const Observer& observer,
bool foundBrightestStar = false;
#endif
if ((renderFlags & (ShowSSO | ShowOrbits)) != 0)
if ((renderFlags & (ShowSolarSystemObjects | ShowOrbits)) != 0)
{
nearStars.clear();
universe.getNearStars(observer.getPosition(), SolarSystemMaxDistance, nearStars);
// Set up direct light sources (i.e. just stars at the moment)
// Skip if only star orbits to be shown
if ((renderFlags & ShowSSO) != 0)
if ((renderFlags & ShowSolarSystemObjects) != 0)
setupLightSources(nearStars, observer.getPosition(), now, lightSourceList, renderFlags);
// Traverse the frame trees of each nearby solar system and
@ -1692,7 +1677,7 @@ void Renderer::draw(const Observer& observer,
{
addStarOrbitToRenderList(*sun, observer, now);
// Skip if only star orbits to be shown
if ((renderFlags & ShowSSO) == 0)
if ((renderFlags & ShowSolarSystemObjects) == 0)
continue;
SolarSystem* solarSystem = universe.getSolarSystem(sun);
@ -1966,7 +1951,7 @@ void Renderer::draw(const Observer& observer,
glEnable(GL_BLEND);
// Render deep sky objects
if ((renderFlags & ShowDSO) != 0 && universe.getDSOCatalog() != nullptr)
if ((renderFlags & ShowDeepSpaceObjects) != 0 && universe.getDSOCatalog() != nullptr)
{
renderDeepSkyObjects(universe, observer, faintestMag);
}

51
src/celengine/render.h
View File

@ -172,6 +172,31 @@ class Renderer
ShowComets = 0x0000000080000000,
ShowSpacecrafts = 0x0000000100000000,
ShowFadingOrbits = 0x0000000200000000,
ShowSolarSystemObjects = ShowPlanets |
ShowDwarfPlanets |
ShowMoons |
ShowMinorMoons |
ShowAsteroids |
ShowComets |
ShowPlanetRings |
ShowSpacecrafts,
ShowDeepSpaceObjects = ShowGalaxies |
ShowGlobulars |
ShowNebulae |
ShowOpenClusters,
DefaultRenderFlags = ShowStars |
ShowSolarSystemObjects|
ShowDeepSpaceObjects |
ShowCloudMaps |
ShowNightMaps |
ShowAtmospheres |
ShowEclipseShadows |
ShowRingShadows |
ShowCloudShadows |
ShowCometTails |
ShowAutoMag |
ShowFadingOrbits |
ShowSmoothLines
};
enum StarStyle
@ -190,32 +215,6 @@ class Renderer
BGR_EXT = GL_BGR_EXT
};
// constants
constexpr static const uint64_t DefaultRenderFlags =
Renderer::ShowStars |
Renderer::ShowPlanets |
Renderer::ShowDwarfPlanets |
Renderer::ShowMoons |
Renderer::ShowMinorMoons |
Renderer::ShowAsteroids |
Renderer::ShowComets |
Renderer::ShowSpacecrafts |
Renderer::ShowGalaxies |
Renderer::ShowGlobulars |
Renderer::ShowCloudMaps |
Renderer::ShowNightMaps |
Renderer::ShowAtmospheres |
Renderer::ShowEclipseShadows |
Renderer::ShowPlanetRings |
Renderer::ShowRingShadows |
Renderer::ShowCloudShadows |
Renderer::ShowCometTails |
Renderer::ShowNebulae |
Renderer::ShowOpenClusters |
Renderer::ShowAutoMag |
Renderer::ShowFadingOrbits |
Renderer::ShowSmoothLines;
uint64_t getRenderFlags() const;
void setRenderFlags(uint64_t);
int getLabelMode() const;