From 441dbe6b0276b0fd8cc70d57c76596365da9edd1 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 17 Feb 2015 19:21:29 +0000 Subject: [PATCH] Removed commented out lines git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14696 16af8721-9629-0410-8352-f15c8da7e697 --- src/osgTerrain/GeometryPool.cpp | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/osgTerrain/GeometryPool.cpp b/src/osgTerrain/GeometryPool.cpp index 01e2b8c62..d5f70c917 100644 --- a/src/osgTerrain/GeometryPool.cpp +++ b/src/osgTerrain/GeometryPool.cpp @@ -608,9 +608,6 @@ osg::ref_ptr GeometryPool::getOrCreateProgram(LayerTypes& layerTyp #endif - bool useLighting = true; - bool useTextures = true; - osg::ref_ptr program = new osg::Program; _programMap[layerTypes] = program; @@ -622,17 +619,6 @@ osg::ref_ptr GeometryPool::getOrCreateProgram(LayerTypes& layerTyp { #include "shaders/terrain_displacement_mapping_vert.cpp" osg::ref_ptr shader = osgDB::readShaderFileWithFallback(osg::Shader::VERTEX, "shaders/terrain_displacement_mapping.vert", terrain_displacement_mapping_vert); - if (_useGeometryShader) - { - // prepend define to enable the compute shader style - //shader->setShaderSource(std::string("#define COMPUTE_DIAGONALS\n")+shader->getShaderSource()); - } - - if (useLighting) - { - // prepend define to enable lighting - // shader->setShaderSource(std::string("#define GL_LIGHTING\n")+shader->getShaderSource()); - } program->addShader(shader.get()); } @@ -684,11 +670,6 @@ osg::ref_ptr GeometryPool::getOrCreateProgram(LayerTypes& layerTyp if (shader.valid()) { - if (useTextures) - { - // prepend define to enable lighting - //shader->setShaderSource(std::string("#define GL_TEXTURE_2D\n")+shader->getShaderSource()); - } program->addShader(shader.get()); }