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

Code cleanup: 

- Fixed some unused parameter warnings in renderglsl
- Removed unused debug log messages
- Changed radius parameter in renderglsl to more apt 'geometryScale'
ver1_6_1
Chris Laurel 2008-09-17 02:50:46 +00:00
parent a12423b5de
commit 7253a498f3
3 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/celengine/particlesystem.cpp
View File

@ -300,8 +300,6 @@ ParticleEmitter::render(double tsec,
bool startBounded = m_startTime > -numeric_limits<double>::infinity();
bool endBounded = m_endTime < numeric_limits<double>::infinity();
clog << "particles: " << t << endl;
// Return immediately if we're far enough past the end time that no
// particles remain.
if (endBounded)

12
src/celengine/renderglsl.cpp
View File

@ -267,14 +267,14 @@ void renderGeometry_GLSL(Geometry* geometry,
ResourceHandle texOverride,
const LightingState& ls,
const Atmosphere* atmosphere,
float radius,
float geometryScale,
int renderFlags,
const Mat4f& planetMat,
double tsec)
{
glDisable(GL_LIGHTING);
GLSL_RenderContext rc(ls, radius, planetMat);
GLSL_RenderContext rc(ls, geometryScale, planetMat);
if (renderFlags & Renderer::ShowAtmospheres)
{
@ -313,14 +313,14 @@ void renderGeometry_GLSL(Geometry* geometry,
void renderGeometry_GLSL_Unlit(Geometry* geometry,
const RenderInfo& ri,
ResourceHandle texOverride,
float radius,
int renderFlags,
const Mat4f& planetMat,
float geometryScale,
int /* renderFlags */,
const Mat4f& /* planetMat */,
double tsec)
{
glDisable(GL_LIGHTING);
GLSLUnlit_RenderContext rc(radius);
GLSLUnlit_RenderContext rc(geometryScale);
rc.setPointScale(ri.pointScale);

28
src/celengine/renderglsl.h
View File

@ -27,14 +27,14 @@ void renderSphere_GLSL(const RenderInfo& ri,
const GLContext& context);
void renderGeometry_GLSL(Geometry* geometry,
const RenderInfo& ri,
ResourceHandle texOverride,
const LightingState& ls,
const Atmosphere* atmosphere,
float radius,
int renderFlags,
const Mat4f& planetMat,
double tsec);
const RenderInfo& ri,
ResourceHandle texOverride,
const LightingState& ls,
const Atmosphere* atmosphere,
float geometryScale,
int renderFlags,
const Mat4f& planetMat,
double tsec);
void renderClouds_GLSL(const RenderInfo& ri,
const LightingState& ls,
@ -68,12 +68,12 @@ void renderRings_GLSL(RingSystem& rings,
unsigned int nSections);
void renderGeometry_GLSL_Unlit(Geometry* geometry,
const RenderInfo& ri,
ResourceHandle texOverride,
float radius,
int renderFlags,
const Mat4f& planetMat,
double tsec);
const RenderInfo& ri,
ResourceHandle texOverride,
float geometryScale,
int renderFlags,
const Mat4f& planetMat,
double tsec);
#endif // _CELENGINE_RENDERGLSL_H_