diff options
author | Armin Weatherwax | 2010-09-07 13:41:02 +0200 |
---|---|---|
committer | Armin Weatherwax | 2010-09-23 15:42:40 +0200 |
commit | 087e15e89930d51c3964329befb273ae3b2d330d (patch) | |
tree | 684c49a772b0097ed88a25660e1fd3dd10b264cc /linden/indra/newview/llvosky.cpp | |
parent | Robin Cornelius: fixes for building plugins on Linux 64bit (diff) | |
download | meta-impy-087e15e89930d51c3964329befb273ae3b2d330d.zip meta-impy-087e15e89930d51c3964329befb273ae3b2d330d.tar.gz meta-impy-087e15e89930d51c3964329befb273ae3b2d330d.tar.bz2 meta-impy-087e15e89930d51c3964329befb273ae3b2d330d.tar.xz |
port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewer 2 texture system
Diffstat (limited to 'linden/indra/newview/llvosky.cpp')
-rw-r--r-- | linden/indra/newview/llvosky.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llvosky.cpp b/linden/indra/newview/llvosky.cpp index d15a2dc..2200c02 100644 --- a/linden/indra/newview/llvosky.cpp +++ b/linden/indra/newview/llvosky.cpp | |||
@@ -289,7 +289,7 @@ void LLSkyTex::create(const F32 brightness) | |||
289 | 289 | ||
290 | void LLSkyTex::createGLImage(S32 which) | 290 | void LLSkyTex::createGLImage(S32 which) |
291 | { | 291 | { |
292 | mImageGL[which]->createGLTexture(0, mImageRaw[which], 0, TRUE, LLViewerImageBoostLevel::OTHER); | 292 | mImageGL[which]->createGLTexture(0, mImageRaw[which]); |
293 | mImageGL[which]->setAddressMode(LLTexUnit::TAM_CLAMP); | 293 | mImageGL[which]->setAddressMode(LLTexUnit::TAM_CLAMP); |
294 | } | 294 | } |
295 | 295 | ||
@@ -1095,10 +1095,10 @@ BOOL LLVOSky::updateSky() | |||
1095 | mLastTotalAmbient.mV[2] - mTotalAmbient.mV[2]); | 1095 | mLastTotalAmbient.mV[2] - mTotalAmbient.mV[2]); |
1096 | 1096 | ||
1097 | if ( mForceUpdate | 1097 | if ( mForceUpdate |
1098 | || ((dot_lighting < LIGHT_DIRECTION_THRESHOLD) | 1098 | || (((dot_lighting < LIGHT_DIRECTION_THRESHOLD) |
1099 | || (delta_color.length() > COLOR_CHANGE_THRESHOLD) | 1099 | || (delta_color.length() > COLOR_CHANGE_THRESHOLD) |
1100 | || !mInitialized) | 1100 | || !mInitialized) |
1101 | && !direction.isExactlyZero()) | 1101 | && !direction.isExactlyZero())) |
1102 | { | 1102 | { |
1103 | mLastLightingDirection = direction; | 1103 | mLastLightingDirection = direction; |
1104 | mLastTotalAmbient = mTotalAmbient; | 1104 | mLastTotalAmbient = mTotalAmbient; |
@@ -1180,7 +1180,7 @@ BOOL LLVOSky::updateSky() | |||
1180 | return TRUE; | 1180 | return TRUE; |
1181 | } | 1181 | } |
1182 | 1182 | ||
1183 | void LLVOSky::updateTextures() | 1183 | void LLVOSky::updateTextures(LLAgent &agent) |
1184 | { | 1184 | { |
1185 | if (mSunTexturep) | 1185 | if (mSunTexturep) |
1186 | { | 1186 | { |