diff --git a/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp b/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp index a566924d80..99ba62348a 100644 --- a/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp @@ -262,7 +262,7 @@ void RivFaultPartMgr::generatePartGeometry() part->updateBoundingBox(); part->setEnableMask(meshFaultBit); - part->setPriority(RivPartPriority::PartType::MeshLines); + part->setPriority(RivPartPriority::PartType::FaultMeshLines); m_nativeFaultGridLines = part; } @@ -314,7 +314,7 @@ void RivFaultPartMgr::generatePartGeometry() part->updateBoundingBox(); part->setEnableMask(meshFaultBit); - part->setPriority(RivPartPriority::PartType::MeshLines); + part->setPriority(RivPartPriority::PartType::FaultMeshLines); m_oppositeFaultGridLines = part; } @@ -403,12 +403,12 @@ void RivFaultPartMgr::updatePartEffect() if (m_nativeFaultGridLines.notNull()) { - m_nativeFaultGridLines->setPriority(RivPartPriority::PartType::TransparentMeshLines); + m_nativeFaultGridLines->setPriority(RivPartPriority::PartType::FaultMeshLines); } if (m_oppositeFaultGridLines.notNull()) { - m_oppositeFaultGridLines->setPriority(RivPartPriority::PartType::TransparentMeshLines); + m_oppositeFaultGridLines->setPriority(RivPartPriority::PartType::FaultMeshLines); } } } diff --git a/ApplicationCode/ModelVisualization/RivPartPriority.h b/ApplicationCode/ModelVisualization/RivPartPriority.h index 9d72e7fa56..2212b34ece 100644 --- a/ApplicationCode/ModelVisualization/RivPartPriority.h +++ b/ApplicationCode/ModelVisualization/RivPartPriority.h @@ -40,6 +40,7 @@ public: Intersection, CrossSectionNnc, MeshLines, + FaultMeshLines, Transparent, TransparentFault, TransparentNnc, @@ -47,5 +48,4 @@ public: Highlight, Text }; - }; diff --git a/Fwk/AppFwk/CommonCode/cafEffectGenerator.cpp b/Fwk/AppFwk/CommonCode/cafEffectGenerator.cpp index b748e9a212..2c91de2872 100644 --- a/Fwk/AppFwk/CommonCode/cafEffectGenerator.cpp +++ b/Fwk/AppFwk/CommonCode/cafEffectGenerator.cpp @@ -846,6 +846,8 @@ void MeshEffectGenerator::updateForShaderBasedRendering(cvf::Effect* effect) con { eff->setRenderState(new cvf::RenderStateLine(m_lineWidth)); } + + eff->setRenderState(new cvf::RenderStateDepth(true, cvf::RenderStateDepth::LEQUAL)); } //--------------------------------------------------------------------------------------------------