diff --git a/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp b/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp index f06db186b1..ad4017a1d8 100644 --- a/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp +++ b/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp @@ -318,53 +318,6 @@ RivGridPartMgr::~RivGridPartMgr() #endif } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -cvf::ref RivGridPartMgr::createPerVertexColoringEffect(float opacity) -{ - cvf::ref colorArrayEffect = new cvf::Effect; - - if (RiaApplication::instance()->useShaders()) - { - cvf::ShaderProgramGenerator gen("PerVertexColor", cvf::ShaderSourceProvider::instance()); - gen.addVertexCode(cvf::ShaderSourceRepository::vs_Standard); - gen.addFragmentCode(cvf::ShaderSourceRepository::src_VaryingColorGlobalAlpha); - gen.addFragmentCode(caf::CommonShaderSources::light_AmbientDiffuse()); - gen.addFragmentCode(cvf::ShaderSourceRepository::fs_Standard); - - cvf::ref m_shaderProg = gen.generate(); - m_shaderProg->setDefaultUniform(new cvf::UniformFloat("u_alpha", opacity)); - - colorArrayEffect->setShaderProgram(m_shaderProg.p()); - } - else - { - cvf::ref mat = new cvf::RenderStateMaterial_FF(cvf::Color3::BLUE); - mat->setAlpha(opacity); - mat->enableColorMaterial(true); - colorArrayEffect->setRenderState(mat.p()); - - cvf::ref lighting = new cvf::RenderStateLighting_FF; - lighting->enableTwoSided(true); - colorArrayEffect->setRenderState(lighting.p()); - } - - // Simple transparency - if (opacity < 1.0f) - { - cvf::ref blender = new cvf::RenderStateBlending; - blender->configureTransparencyBlending(); - colorArrayEffect->setRenderState(blender.p()); - } - - caf::PolygonOffset polygonOffset = caf::PO_1; - cvf::ref polyOffset = caf::EffectGenerator::createAndConfigurePolygonOffsetRenderState(polygonOffset); - colorArrayEffect->setRenderState(polyOffset.p()); - - return colorArrayEffect; -} - //-------------------------------------------------------------------------------------------------- /// Helper class used to provide zero for all cells diff --git a/ApplicationCode/ModelVisualization/RivGridPartMgr.h b/ApplicationCode/ModelVisualization/RivGridPartMgr.h index 711d276135..ea79932791 100644 --- a/ApplicationCode/ModelVisualization/RivGridPartMgr.h +++ b/ApplicationCode/ModelVisualization/RivGridPartMgr.h @@ -62,8 +62,6 @@ public: void appendPartsToModel(cvf::ModelBasicList* model); - static cvf::ref createPerVertexColoringEffect(float opacity); - private: void generatePartGeometry(cvf::StructGridGeometryGenerator& geoBuilder); void updateCellEdgeResultColorOnPart(cvf::Part* facePart,