diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-03-02 23:29:28 +0000 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-03-02 23:29:28 +0000 |
| commit | acdead96cd194040f586c5a6e976beca7bb999c4 (patch) | |
| tree | c61662fe5f0a91f4c9dc291251625410036c2e19 /indra/newview/llvosky.cpp | |
| parent | 7951001081209855178b73a0092cc18b1a192397 (diff) | |
Replace ifdefs with comments marking legacy atmo params.
Diffstat (limited to 'indra/newview/llvosky.cpp')
| -rw-r--r-- | indra/newview/llvosky.cpp | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/indra/newview/llvosky.cpp b/indra/newview/llvosky.cpp index c1ba7b1efd..f27bfcb959 100644 --- a/indra/newview/llvosky.cpp +++ b/indra/newview/llvosky.cpp @@ -397,7 +397,7 @@ void LLVOSky::init() calcAtmospherics(); -#if SUPPORT_LEGACY_ATMOSPHERICS +// LEGACY_ATMOSPHERICS // Initialize the cached normalized direction vectors for (S32 side = 0; side < 6; ++side) { @@ -413,7 +413,6 @@ void LLVOSky::init() mSkyTex[i].create(1.0f); mShinyTex[i].create(1.0f); } -#endif initCubeMap(); mInitialized = true; @@ -496,7 +495,7 @@ void LLVOSky::restoreGL() } -#if SUPPORT_LEGACY_ATMOSPHERICS +// LEGACY_ATMOSPHERICS void LLVOSky::initSkyTextureDirs(const S32 side, const S32 tile) { S32 tile_x = tile % NUM_TILES_X; @@ -830,7 +829,6 @@ LLColor3 LLVOSky::createAmbientFromWL(LLColor3 ambient, LLColor3 sundiffuse, LLC { return (componentMult(ambient, sundiffuse) + sunambient) * 0.8f; } -#endif void LLVOSky::calcAtmospherics(void) { @@ -882,7 +880,7 @@ BOOL LLVOSky::updateSky() return TRUE; } -#if SUPPORT_LEGACY_ATMOSPHERICS +// LEGACY_ATMOSPHERICS static S32 next_frame = 0; const S32 total_no_tiles = 6 * NUM_TILES; const S32 cycle_frame_no = total_no_tiles + 1; @@ -1001,7 +999,6 @@ BOOL LLVOSky::updateSky() { gPipeline.markRebuild(mDrawable, LLDrawable::REBUILD_VOLUME, TRUE); } -#endif return TRUE; } @@ -1865,7 +1862,7 @@ void LLVOSky::updateReflectionGeometry(LLDrawable *drawable, F32 H, void LLVOSky::updateFog(const F32 distance) { -#if SUPPORT_LEGACY_ATMOSPHERICS +// LEGACY_ATMOSPHERICS if (!gPipeline.hasRenderDebugFeatureMask(LLPipeline::RENDER_DEBUG_FEATURE_FOG)) { if (!LLGLSLShader::sNoFixedFunction) @@ -2010,9 +2007,6 @@ void LLVOSky::updateFog(const F32 distance) glHint(GL_FOG_HINT, GL_NICEST); } stop_glerror(); - -#endif - } |