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

Added distance filtering for stars and rendering flag for comet tails and ring shadows.

ver1_5_1
Chris Laurel 2002-09-09 03:50:37 +00:00
parent 2330573bc4
commit 757dc67ddc
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/celengine/render.cpp
View File

@ -125,7 +125,8 @@ Renderer::Renderer() :
useRescaleNormal(false),
useMinMaxBlending(false),
textureResolution(medres),
minOrbitSize(MinOrbitSizeForLabel)
minOrbitSize(MinOrbitSizeForLabel),
distanceLimit(1.0e6f)
{
starVertexBuffer = new StarVertexBuffer(2048);
}
@ -571,6 +572,18 @@ void Renderer::setMinimumOrbitSize(float pixels)
}
float Renderer::getDistanceLimit() const
{
return distanceLimit;
}
void Renderer::setDistanceLimit(float distanceLimit_)
{
distanceLimit = distanceLimit_;
}
bool Renderer::getFragmentShaderEnabled() const
{
return fragmentShaderEnabled;
@ -2524,7 +2537,8 @@ void Renderer::renderObject(Point3f pos,
{
renderRings(*obj.rings, ri, radius,
textureResolution,
nSimultaneousTextures > 1);
nSimultaneousTextures > 1 &&
(renderFlags & ShowRingShadows) != 0);
}
if (obj.atmosphere != NULL)
@ -2646,7 +2660,8 @@ void Renderer::renderObject(Point3f pos,
{
renderRings(*obj.rings, ri, radius,
textureResolution,
nSimultaneousTextures > 1);
nSimultaneousTextures > 1 &&
(renderFlags & ShowRingShadows) != 0);
}
glPopMatrix();
@ -3219,8 +3234,9 @@ void Renderer::renderPlanetarySystem(const Star& sun,
rle.appMag = appMag;
renderList.insert(renderList.end(), rle);
}
#if 1
if (body->getClassification() == Body::Comet)
if (body->getClassification() == Body::Comet &&
(renderFlags & ShowCometTails) != 0)
{
float radius = 10000000.0f; // body->getRadius() * 1000000.0f;
discSize = (radius / (float) distanceFromObserver) / pixelSize;
@ -3240,7 +3256,6 @@ void Renderer::renderPlanetarySystem(const Star& sun,
renderList.insert(renderList.end(), rle);
}
}
#endif
if (showLabels && (pos * conjugate(observer.getOrientation()).toMatrix3()).z < 0)
{
@ -3336,6 +3351,7 @@ public:
float saturationMag;
float brightnessScale;
float brightnessBias;
float distanceLimit;
int nProcessed;
int nRendered;
@ -3350,6 +3366,7 @@ StarRenderer::StarRenderer()
nBright = 0;
nProcessed = 0;
starVertexBuffer = NULL;
distanceLimit = 1.0e6f;
}
void StarRenderer::process(const Star& star, float distance, float appMag)
@ -3359,6 +3376,9 @@ void StarRenderer::process(const Star& star, float distance, float appMag)
Point3f starPos = star.getPosition();
Vec3f relPos = starPos - position;
if (distance > distanceLimit)
return;
if (relPos * viewNormal > 0 || relPos.x * relPos.x < 0.1f)
{
Color starColor = star.getStellarClass().getApparentColor();
@ -3477,6 +3497,7 @@ void Renderer::renderStars(const StarDatabase& starDB,
starRenderer.brightnessBias = brightnessBias;
starRenderer.faintestMag = faintestMag;
starRenderer.saturationMag = saturationMag;
starRenderer.distanceLimit = distanceLimit;
glareParticles.clear();
@ -3672,7 +3693,7 @@ void Renderer::labelStars(const vector<Star*>& stars,
float appMag = (distance > 0.0f) ?
astro::absToAppMag(star->getAbsoluteMagnitude(), distance) : -100.0f;
if (appMag < faintestMag)
if (appMag < faintestMag && distance <= distanceLimit)
{
Vec3f rpos = pos - observerPos_ly;

4
src/celengine/render.h
View File

@ -72,6 +72,7 @@ class Renderer
ShowRingShadows = 0x1000,
ShowBoundaries = 0x2000,
ShowAutoMag = 0x4000,
ShowCometTails = 0x8000,
};
int getRenderFlags() const;
@ -83,6 +84,8 @@ class Renderer
float getAmbientLightLevel() const;
void setAmbientLightLevel(float);
void setMinimumOrbitSize(float);
float getDistanceLimit() const;
void setDistanceLimit(float);
bool getFragmentShaderEnabled() const;
void setFragmentShaderEnabled(bool);
@ -327,6 +330,7 @@ class Renderer
std::vector<CachedOrbit*> orbitCache;
float minOrbitSize;
float distanceLimit;
};
#endif // _RENDER_H_