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

Replaced deprecated osg::Shader::reaDShaderFile()/loadShaderFromSource() usage

Browse Source
This commit is contained in:
Robert Osfield
2017-11-27 18:38:37 +00:00
parent 5f13a3aa11
commit 284f91b3e0
11 changed files with 64 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
examples/osgshaders/GL2Scene.cpp
View File

@@ -37,7 +37,6 @@
#include <osg/Texture2D>
#include <osg/Texture3D>
#include <osgDB/ReadFile>
#include <osgDB/FileUtils>
#include <osgUtil/Optimizer>
#include <osg/Program>
@@ -141,10 +140,10 @@ ModelInstance()
static void
LoadShaderSource( osg::Shader* shader, const std::string& fileName )
{
std::string fqFileName = osgDB::findDataFile(fileName);
if( fqFileName.length() != 0 )
osg::ref_ptr<osg::Shader> loaded_shader = osgDB::readRefShaderFile(fileName);
if (loaded_shader)
{
shader->loadShaderSourceFromFile( fqFileName.c_str() );
shader->setShaderSource( loaded_shader->getShaderSource() );
}
else
{