FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed commented out lines

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14696 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2015-02-17 19:21:29 +00:00
parent 53198f2e9b
commit 441dbe6b02
1 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/osgTerrain/GeometryPool.cpp
View File

@@ -608,9 +608,6 @@ osg::ref_ptr<osg::Program> GeometryPool::getOrCreateProgram(LayerTypes& layerTyp
#endif
bool useLighting = true;
bool useTextures = true;
osg::ref_ptr<osg::Program> program = new osg::Program;
_programMap[layerTypes] = program;
@@ -622,17 +619,6 @@ osg::ref_ptr<osg::Program> GeometryPool::getOrCreateProgram(LayerTypes& layerTyp
{
#include "shaders/terrain_displacement_mapping_vert.cpp"
osg::ref_ptr<osg::Shader> 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<osg::Program> 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());
}