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

Fix typo when generating light NNC colors

Browse Source
This commit is contained in:
Magne Sjaastad 2018-03-24 14:42:30 +01:00
parent a55740a376
commit bffc50b826
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp
View File

@ -705,8 +705,9 @@ void RivFaultPartMgr::updateNNCColors(size_t timeStepIndex, RimEclipseCellColors
cvf::Color3f nncColor = m_defaultColor; cvf::Color3f nncColor = m_defaultColor;
nncColor.r() += (1.0 - nncColor.r()) * 0.2; nncColor.r() += (1.0 - nncColor.r()) * 0.2;
nncColor.g() += (1.0 - nncColor.g()) * 0.2; nncColor.g() += (1.0 - nncColor.g()) * 0.2;
nncColor.g() += (1.0 - nncColor.b()) * 0.2; nncColor.b() += (1.0 - nncColor.b()) * 0.2;
CVF_ASSERT(nncColor.isValid());
cvf::ref<cvf::Effect> nncEffect; cvf::ref<cvf::Effect> nncEffect;
if (m_rimFaultCollection->showFaultFaces || m_rimFaultCollection->showOppositeFaultFaces) if (m_rimFaultCollection->showFaultFaces || m_rimFaultCollection->showOppositeFaultFaces)

4
Fwk/AppFwk/CommonCode/cafEffectGenerator.cpp
View File

@ -259,6 +259,8 @@ void EffectGenerator::releaseUnreferencedEffects()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
SurfaceEffectGenerator::SurfaceEffectGenerator(const cvf::Color4f& color, PolygonOffset polygonOffset) SurfaceEffectGenerator::SurfaceEffectGenerator(const cvf::Color4f& color, PolygonOffset polygonOffset)
{ {
CVF_ASSERT(color.isValid());
m_color = color; m_color = color;
m_polygonOffset = polygonOffset; m_polygonOffset = polygonOffset;
m_cullBackfaces = FC_NONE; m_cullBackfaces = FC_NONE;
@ -271,6 +273,8 @@ SurfaceEffectGenerator::SurfaceEffectGenerator(const cvf::Color4f& color, Polygo
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
SurfaceEffectGenerator::SurfaceEffectGenerator(const cvf::Color3f& color, PolygonOffset polygonOffset) SurfaceEffectGenerator::SurfaceEffectGenerator(const cvf::Color3f& color, PolygonOffset polygonOffset)
{ {
CVF_ASSERT(color.isValid());
m_color = cvf::Color4f(color, 1.0f); m_color = cvf::Color4f(color, 1.0f);
m_polygonOffset = polygonOffset; m_polygonOffset = polygonOffset;
m_cullBackfaces = FC_NONE; m_cullBackfaces = FC_NONE;