Faults: First shot on getting the face culling right

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

View File

@ -377,11 +377,11 @@ void RivFaultPartMgr::updatePartEffect()
{
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)
{
geometryEffgen.setCullBackfaces(caf::FC_FRONT);
geometryEffgen.setCullBackfaces(caf::FC_BACK); // Because the cells are inverted
}
}
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)
{
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)
{
scalarEffgen.setCullBackfaces(caf::FC_FRONT);
scalarEffgen.setCullBackfaces(caf::FC_BACK);// Because the cells are inverted
}
}

View File

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