diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-04-28 15:51:31 +0000 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-04-28 15:51:31 +0000 |
| commit | deffbca3ee209f6aea3358692d9ca6dc7090e748 (patch) | |
| tree | 8aa3ecfe2d8ebf5714a76c2fc77c2b630a0e80e0 /indra/newview/pipeline.cpp | |
| parent | a3ffa9f006b008b5faad248f700c8c2fbc6b74fd (diff) | |
SL-17281 environment map prototype (stupid slow and hacky, but provides a way to get a "real" environment map for shader development)
Diffstat (limited to 'indra/newview/pipeline.cpp')
| -rw-r--r-- | indra/newview/pipeline.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 20d6fe39e3..09437473d9 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -8191,7 +8191,7 @@ void LLPipeline::bindDeferredShader(LLGLSLShader& shader, LLRenderTarget* light_ channel = shader.enableTexture(LLShaderMgr::ENVIRONMENT_MAP, LLTexUnit::TT_CUBE_MAP); if (channel > -1) { - LLCubeMap* cube_map = gSky.mVOSkyp ? gSky.mVOSkyp->getCubeMap() : NULL; + LLCubeMap* cube_map = mEnvironmentMap.mCubeMap.notNull() ? mEnvironmentMap.mCubeMap : gSky.mVOSkyp ? gSky.mVOSkyp->getCubeMap() : NULL; if (cube_map) { cube_map->enable(channel); @@ -11467,3 +11467,8 @@ void LLPipeline::restoreHiddenObject( const LLUUID& id ) } } +void LLPipeline::overrideEnvironmentMap() +{ + mEnvironmentMap.update(LLViewerCamera::instance().getOrigin(), 1024); +} + |