speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
7
1
Fork 3
Code Issues 8 Pull requests Projects Releases 1 Packages Wiki Activity Actions

Deprecated: loadShaderSourceFromFile()

Browse source 
Upgrade to osgDB::readShaderFile()

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@7112 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 8687665a6b5a6e660ca4fec3408104242ea4411c
Former-commit-id: 9e7a3ceb03eb9209893d8e61b02f7d6e97f880b9
This commit is contained in:
scttgs0 2020-05-28 17:18:43 +00:00
parent 7a6243875d
commit 968f19f324
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/modules/graphic/osggraph/Render/OsgShader.cpp
View file

@ -21,6 +21,9 @@
#include <osg/Program> #include <osg/Program>
#include <osg/Node> #include <osg/Node>
#include <osg/Uniform> #include <osg/Uniform>
#include <osgDB/ReadFile>
#include <osgDB/FileUtils>
#include <tgf.h> #include <tgf.h>
#include "OsgMain.h" #include "OsgMain.h"
@ -31,13 +34,12 @@
SDCarShader::SDCarShader(osg::Node *car, SDCar *c) SDCarShader::SDCarShader(osg::Node *car, SDCar *c)
{ {
std::string TmpPath = GetDataDir(); std::string TmpPath = GetDataDir();
osg::ref_ptr<osg::Shader> vertShader = new osg::Shader( osg::Shader::VERTEX);
osg::ref_ptr<osg::Shader> fragShader = new osg::Shader( osg::Shader::FRAGMENT);
vertShader->loadShaderSourceFromFile(TmpPath+"data/shaders/car.vert");
fragShader->loadShaderSourceFromFile(TmpPath+"data/shaders/car.frag");
program = new osg::Program; program = new osg::Program;
program->addShader( vertShader.get() ); program->addShader(osgDB::readShaderFile(osg::Shader::VERTEX,
program->addShader( fragShader.get() ); osgDB::findDataFile(TmpPath + "data/shaders/car.vert")));
program->addShader(osgDB::readShaderFile(osg::Shader::FRAGMENT,
osgDB::findDataFile(TmpPath + "data/shaders/car.frag")));
//pCar= dynamic_cast<osg::Group *> (car); //pCar= dynamic_cast<osg::Group *> (car);
pCar = car; pCar = car;