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

Faults: First shot on getting the face culling right

Browse Source 
Still needs to handle flipaxis
This commit is contained in:
Jacob Støren
2013-12-18 15:49:03 +01:00
parent 12e818b3b2
commit 2171b1bde4
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ModelVisualization/RivFaultPartMgr.cpp
View File

@@ -377,11 +377,11 @@ void RivFaultPartMgr::updatePartEffect()
{ {
if (m_rimFaultCollection->faultFaceCulling() == RimFaultCollection::FAULT_BACK_FACE_CULLING) if (m_rimFaultCollection->faultFaceCulling() == RimFaultCollection::FAULT_BACK_FACE_CULLING)
{ {
geometryEffgen.setCullBackfaces(caf::FC_BACK); geometryEffgen.setCullBackfaces(caf::FC_FRONT); // Because the cells are inverted
} }
else if (m_rimFaultCollection->faultFaceCulling() == RimFaultCollection::FAULT_FRONT_FACE_CULLING) else if (m_rimFaultCollection->faultFaceCulling() == RimFaultCollection::FAULT_FRONT_FACE_CULLING)
{ {
geometryEffgen.setCullBackfaces(caf::FC_FRONT); geometryEffgen.setCullBackfaces(caf::FC_BACK); // Because the cells are inverted
} }
} }
cvf::ref<cvf::Effect> geometryOnlyEffect = geometryEffgen.generateEffect(); cvf::ref<cvf::Effect> geometryOnlyEffect = geometryEffgen.generateEffect();
@@ -646,11 +646,11 @@ cvf::ref<cvf::Effect> RivFaultPartMgr::cellResultEffect(const cvf::ScalarMapper*
{ {
if (m_rimFaultCollection->faultFaceCulling() == RimFaultCollection::FAULT_BACK_FACE_CULLING) if (m_rimFaultCollection->faultFaceCulling() == RimFaultCollection::FAULT_BACK_FACE_CULLING)
{ {
scalarEffgen.setCullBackfaces(caf::FC_BACK); scalarEffgen.setCullBackfaces(caf::FC_FRONT);// Because the cells are inverted
} }
else if (m_rimFaultCollection->faultFaceCulling() == RimFaultCollection::FAULT_FRONT_FACE_CULLING) else if (m_rimFaultCollection->faultFaceCulling() == RimFaultCollection::FAULT_FRONT_FACE_CULLING)
{ {
scalarEffgen.setCullBackfaces(caf::FC_FRONT); scalarEffgen.setCullBackfaces(caf::FC_BACK);// Because the cells are inverted
} }
} }

6
ApplicationCode/ProjectDataModel/RimFaultCollection.cpp
View File

@@ -44,9 +44,9 @@ namespace caf
template<> template<>
void AppEnum< RimFaultCollection::FaultFaceCullingMode >::setUp() void AppEnum< RimFaultCollection::FaultFaceCullingMode >::setUp()
{ {
addItem(RimFaultCollection::FAULT_BACK_FACE_CULLING, "FAULT_BACK_FACE_CULLING", "Back face culling"); addItem(RimFaultCollection::FAULT_BACK_FACE_CULLING, "FAULT_BACK_FACE_CULLING", "Show outside face only");
addItem(RimFaultCollection::FAULT_FRONT_FACE_CULLING, "FAULT_FRONT_FACE_CULLING", "Front face culling"); addItem(RimFaultCollection::FAULT_FRONT_FACE_CULLING, "FAULT_FRONT_FACE_CULLING", "Show inside face only");
addItem(RimFaultCollection::FAULT_NO_FACE_CULLING, "FAULT_NO_FACE_CULLING", "No face culling"); addItem(RimFaultCollection::FAULT_NO_FACE_CULLING, "FAULT_NO_FACE_CULLING", "Show Both");
setDefault(RimFaultCollection::FAULT_NO_FACE_CULLING); setDefault(RimFaultCollection::FAULT_NO_FACE_CULLING);
} }
} }