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

(#266) No depth test for legend lines

Browse Source
This commit is contained in:
Magne Sjaastad
2015-11-17 11:29:27 +01:00
parent 518ce2d2a7
commit 031ca38a53
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/ModelVisualization/GridBox/RivGridBoxGenerator.cpp
View File

@@ -23,6 +23,7 @@
#include "RivPatchGenerator.h" #include "RivPatchGenerator.h"
#include "cafEffectGenerator.h" #include "cafEffectGenerator.h"
#include "cvfCamera.h" #include "cvfCamera.h"
#include "cvfDrawableText.h" #include "cvfDrawableText.h"
#include "cvfFixedAtlasFont.h" #include "cvfFixedAtlasFont.h"
@@ -30,6 +31,7 @@
#include "cvfGeometryBuilderFaceList.h" #include "cvfGeometryBuilderFaceList.h"
#include "cvfMeshEdgeExtractor.h" #include "cvfMeshEdgeExtractor.h"
#include "cvfPrimitiveSetIndexedUInt.h" #include "cvfPrimitiveSetIndexedUInt.h"
#include "cvfRenderStateDepth.h"
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
@@ -528,8 +530,13 @@ void RivGridBoxGenerator::createLegend(EdgeType edge, cvf::Collection<cvf::Part>
cvf::ref<cvf::Effect> eff; cvf::ref<cvf::Effect> eff;
caf::MeshEffectGenerator effGen(m_gridLegendColor); caf::MeshEffectGenerator effGen(m_gridLegendColor);
eff = effGen.generateCachedEffect(); eff = effGen.generateUnCachedEffect();
cvf::ref<cvf::RenderStateDepth> depth = new cvf::RenderStateDepth;
depth->enableDepthTest(false);
eff->setRenderState(depth.p());
part->setPriority(1500);
part->setEffect(eff.p()); part->setEffect(eff.p());
parts->push_back(part.p()); parts->push_back(part.p());
@@ -628,12 +635,12 @@ void RivGridBoxGenerator::updateFromBackgroundColor(const cvf::Color3f backgroun
{ {
if (backgroundColor.r() + backgroundColor.g() + backgroundColor.b() > 1.5f) if (backgroundColor.r() + backgroundColor.g() + backgroundColor.b() > 1.5f)
{ {
m_gridColor = cvf::Color3f::LIGHT_GRAY; m_gridColor = cvf::Color3f::DARK_GRAY;
m_gridLegendColor = cvf::Color3f::fromByteColor(10, 10, 10); m_gridLegendColor = cvf::Color3f::fromByteColor(10, 10, 10);
} }
else else
{ {
m_gridColor = cvf::Color3f::DARK_GRAY; m_gridColor = cvf::Color3f::LIGHT_GRAY;
m_gridLegendColor = cvf::Color3f::WHITE; m_gridLegendColor = cvf::Color3f::WHITE;
} }
} }