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

Added depth write to effect generator

Browse Source
This commit is contained in:
Magne Sjaastad
2013-12-19 08:59:28 +01:00
parent f492f0eda2
commit ec181e94f8
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -394,6 +394,7 @@ ScalarMapperEffectGenerator::ScalarMapperEffectGenerator(const cvf::ScalarMapper
m_polygonOffset = polygonOffset; m_polygonOffset = polygonOffset;
m_opacityLevel = 1.0f; m_opacityLevel = 1.0f;
m_faceCulling = FC_NONE; m_faceCulling = FC_NONE;
m_enableDepthWrite = true;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -509,6 +510,13 @@ void ScalarMapperEffectGenerator::updateCommonEffect(cvf::Effect* effect) const
effect->setRenderState(faceCulling.p()); effect->setRenderState(faceCulling.p());
} }
if (!m_enableDepthWrite)
{
cvf::ref<cvf::RenderStateDepth> depth = new cvf::RenderStateDepth;
depth->enableDepthWrite(false);
effect->setRenderState(depth.p());
}
} }
@@ -525,7 +533,8 @@ bool ScalarMapperEffectGenerator::isEqual(const EffectGenerator* other) const
&& m_polygonOffset == otherTextureResultEffect->m_polygonOffset && m_polygonOffset == otherTextureResultEffect->m_polygonOffset
&& m_opacityLevel == otherTextureResultEffect->m_opacityLevel && m_opacityLevel == otherTextureResultEffect->m_opacityLevel
&& m_undefinedColor == otherTextureResultEffect->m_undefinedColor && m_undefinedColor == otherTextureResultEffect->m_undefinedColor
&& m_faceCulling == otherTextureResultEffect->m_faceCulling) && m_faceCulling == otherTextureResultEffect->m_faceCulling
&& m_enableDepthWrite == otherTextureResultEffect->m_enableDepthWrite)
{ {
cvf::ref<cvf::TextureImage> texImg2 = new cvf::TextureImage; cvf::ref<cvf::TextureImage> texImg2 = new cvf::TextureImage;
otherTextureResultEffect->m_scalarMapper->updateTexture(texImg2.p()); otherTextureResultEffect->m_scalarMapper->updateTexture(texImg2.p());
@@ -547,6 +556,7 @@ EffectGenerator* ScalarMapperEffectGenerator::copy() const
scEffGen->m_opacityLevel = m_opacityLevel; scEffGen->m_opacityLevel = m_opacityLevel;
scEffGen->m_undefinedColor = m_undefinedColor; scEffGen->m_undefinedColor = m_undefinedColor;
scEffGen->m_faceCulling = m_faceCulling; scEffGen->m_faceCulling = m_faceCulling;
scEffGen->m_enableDepthWrite = m_enableDepthWrite;
return scEffGen; return scEffGen;
} }

3
Fwk/AppFwk/CommonCode/cafEffectGenerator.h
View File

@@ -158,6 +158,8 @@ public:
void setOpacityLevel(float opacity) { m_opacityLevel = cvf::Math::clamp(opacity, 0.0f , 1.0f ); } void setOpacityLevel(float opacity) { m_opacityLevel = cvf::Math::clamp(opacity, 0.0f , 1.0f ); }
void setUndefinedColor(cvf::Color3f color) { m_undefinedColor = color; } void setUndefinedColor(cvf::Color3f color) { m_undefinedColor = color; }
void setFaceCulling(FaceCulling faceCulling) { m_faceCulling = faceCulling; } void setFaceCulling(FaceCulling faceCulling) { m_faceCulling = faceCulling; }
void enableDepthWrite(bool enableWrite) { m_enableDepthWrite = enableWrite; }
public: public:
static cvf::ref<cvf::TextureImage> addAlphaAndUndefStripes(const cvf::TextureImage* texImg, const cvf::Color3f& undefScalarColor, float opacityLevel); static cvf::ref<cvf::TextureImage> addAlphaAndUndefStripes(const cvf::TextureImage* texImg, const cvf::Color3f& undefScalarColor, float opacityLevel);
static bool isImagesEqual(const cvf::TextureImage* texImg1, const cvf::TextureImage* texImg2); static bool isImagesEqual(const cvf::TextureImage* texImg1, const cvf::TextureImage* texImg2);
@@ -179,6 +181,7 @@ private:
float m_opacityLevel; float m_opacityLevel;
cvf::Color3f m_undefinedColor; cvf::Color3f m_undefinedColor;
FaceCulling m_faceCulling; FaceCulling m_faceCulling;
bool m_enableDepthWrite;
}; };