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

System : Added support for disable of lighting for surface effect generator

Browse Source
This commit is contained in:
Magne Sjaastad 2015-10-23 09:34:47 +02:00
parent 0383c35be6
commit e378d5637e
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,6 +247,7 @@ SurfaceEffectGenerator::SurfaceEffectGenerator(const cvf::Color4f& color, Polygo
m_polygonOffset = polygonOffset; m_polygonOffset = polygonOffset;
m_cullBackfaces = FC_NONE; m_cullBackfaces = FC_NONE;
m_enableDepthWrite = true; m_enableDepthWrite = true;
m_enableLighting = true;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -258,6 +259,7 @@ SurfaceEffectGenerator::SurfaceEffectGenerator(const cvf::Color3f& color, Polygo
m_polygonOffset = polygonOffset; m_polygonOffset = polygonOffset;
m_cullBackfaces = FC_NONE; m_cullBackfaces = FC_NONE;
m_enableDepthWrite = true; m_enableDepthWrite = true;
m_enableLighting = true;
} }
@ -269,8 +271,16 @@ void SurfaceEffectGenerator::updateForShaderBasedRendering(cvf::Effect* effect)
cvf::ShaderProgramGenerator gen("SurfaceEffectGenerator", cvf::ShaderSourceProvider::instance()); cvf::ShaderProgramGenerator gen("SurfaceEffectGenerator", cvf::ShaderSourceProvider::instance());
gen.addVertexCode(cvf::ShaderSourceRepository::vs_Standard); gen.addVertexCode(cvf::ShaderSourceRepository::vs_Standard);
gen.addFragmentCode(cvf::ShaderSourceRepository::src_Color); gen.addFragmentCode(cvf::ShaderSourceRepository::src_Color);
gen.addFragmentCode(CommonShaderSources::light_AmbientDiffuse());
gen.addFragmentCode(cvf::ShaderSourceRepository::fs_Standard); if (m_enableLighting)
{
gen.addFragmentCode(CommonShaderSources::light_AmbientDiffuse());
gen.addFragmentCode(cvf::ShaderSourceRepository::fs_Standard);
}
else
{
gen.addFragmentCode(cvf::ShaderSourceRepository::fs_Unlit);
}
cvf::ref<cvf::ShaderProgram> shaderProg = gen.generate(); cvf::ref<cvf::ShaderProgram> shaderProg = gen.generate();
@ -296,6 +306,7 @@ void SurfaceEffectGenerator::updateForFixedFunctionRendering(cvf::Effect* effect
cvf::ref<cvf::RenderStateLighting_FF> lighting = new cvf::RenderStateLighting_FF; cvf::ref<cvf::RenderStateLighting_FF> lighting = new cvf::RenderStateLighting_FF;
lighting->enableTwoSided(true); lighting->enableTwoSided(true);
lighting->enable(m_enableLighting);
eff->setRenderState(lighting.p()); eff->setRenderState(lighting.p());
this->updateCommonEffect(effect); this->updateCommonEffect(effect);
@ -361,6 +372,7 @@ bool SurfaceEffectGenerator::isEqual(const EffectGenerator* other) const
if (m_color == otherSurfaceEffect->m_color if (m_color == otherSurfaceEffect->m_color
&& m_polygonOffset == otherSurfaceEffect->m_polygonOffset && m_polygonOffset == otherSurfaceEffect->m_polygonOffset
&& m_enableDepthWrite == otherSurfaceEffect->m_enableDepthWrite && m_enableDepthWrite == otherSurfaceEffect->m_enableDepthWrite
&& m_enableLighting == otherSurfaceEffect->m_enableLighting
&& m_cullBackfaces == otherSurfaceEffect->m_cullBackfaces) && m_cullBackfaces == otherSurfaceEffect->m_cullBackfaces)
{ {
return true; return true;
@ -378,6 +390,7 @@ EffectGenerator* SurfaceEffectGenerator::copy() const
SurfaceEffectGenerator* effGen = new SurfaceEffectGenerator(m_color, m_polygonOffset); SurfaceEffectGenerator* effGen = new SurfaceEffectGenerator(m_color, m_polygonOffset);
effGen->m_cullBackfaces = m_cullBackfaces; effGen->m_cullBackfaces = m_cullBackfaces;
effGen->m_enableDepthWrite = m_enableDepthWrite; effGen->m_enableDepthWrite = m_enableDepthWrite;
effGen->m_enableLighting = m_enableLighting;
return effGen; return effGen;
} }

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

@ -135,6 +135,7 @@ public:
void setCullBackfaces(FaceCulling cullBackFaces) { m_cullBackfaces = cullBackFaces; } void setCullBackfaces(FaceCulling cullBackFaces) { m_cullBackfaces = cullBackFaces; }
void enableDepthWrite(bool enableWrite) { m_enableDepthWrite = enableWrite; } void enableDepthWrite(bool enableWrite) { m_enableDepthWrite = enableWrite; }
void enableLighting(bool enableLighting) { m_enableLighting = enableLighting; }
protected: protected:
virtual bool isEqual(const EffectGenerator* other) const; virtual bool isEqual(const EffectGenerator* other) const;
@ -151,6 +152,7 @@ private:
PolygonOffset m_polygonOffset; PolygonOffset m_polygonOffset;
FaceCulling m_cullBackfaces; FaceCulling m_cullBackfaces;
bool m_enableDepthWrite; bool m_enableDepthWrite;
bool m_enableLighting;
}; };