OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed #1223, now pipe can also be rendered without lighting

Browse Source
This commit is contained in:
Magne Sjaastad 2017-02-15 15:55:24 +01:00
parent 037c7c1f73
commit a29fe1f7c1
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp
View File

@ -239,6 +239,12 @@ void RivSimWellPipesPartMgr::updatePipeResultColor(size_t frameIndex)
} }
caf::ScalarMapperEffectGenerator surfEffGen(scalarMapper.p(), caf::PO_1); caf::ScalarMapperEffectGenerator surfEffGen(scalarMapper.p(), caf::PO_1);
if (m_rimReservoirView && m_rimReservoirView->isLightingDisabled())
{
surfEffGen.disableLighting(true);
}
cvf::ref<cvf::Effect> scalarMapperSurfaceEffect = surfEffGen.generateUnCachedEffect(); cvf::ref<cvf::Effect> scalarMapperSurfaceEffect = surfEffGen.generateUnCachedEffect();
caf::ScalarMapperMeshEffectGenerator meshEffGen(scalarMapper.p()); caf::ScalarMapperMeshEffectGenerator meshEffGen(scalarMapper.p());

9
ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp
View File

@ -173,6 +173,11 @@ void RivWellHeadPartMgr::buildWellHeadParts(size_t frameIndex)
part->setDrawable(pipeSurface.p()); part->setDrawable(pipeSurface.p());
caf::SurfaceEffectGenerator surfaceGen(cvf::Color4f(well->wellPipeColor()), caf::PO_1); caf::SurfaceEffectGenerator surfaceGen(cvf::Color4f(well->wellPipeColor()), caf::PO_1);
if (m_rimReservoirView && m_rimReservoirView->isLightingDisabled())
{
surfaceGen.enableLighting(false);
}
cvf::ref<cvf::Effect> eff = surfaceGen.generateCachedEffect(); cvf::ref<cvf::Effect> eff = surfaceGen.generateCachedEffect();
part->setEffect(eff.p()); part->setEffect(eff.p());
@ -292,6 +297,10 @@ void RivWellHeadPartMgr::buildWellHeadParts(size_t frameIndex)
} }
caf::SurfaceEffectGenerator surfaceGen(headColor, caf::PO_1); caf::SurfaceEffectGenerator surfaceGen(headColor, caf::PO_1);
if (m_rimReservoirView && m_rimReservoirView->isLightingDisabled())
{
surfaceGen.enableLighting(false);
}
cvf::ref<cvf::Effect> eff = surfaceGen.generateCachedEffect(); cvf::ref<cvf::Effect> eff = surfaceGen.generateCachedEffect();
part->setEffect(eff.p()); part->setEffect(eff.p());