From 968f19f324aa066675a0e0f4f91bf64be6fae3c0 Mon Sep 17 00:00:00 2001
From: scttgs0 <scttgs0@30fe4595-0a0c-4342-8851-515496e4dcbd>
Date: Thu, 28 May 2020 17:18:43 +0000
Subject: [PATCH] Deprecated: loadShaderSourceFromFile()

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
---
 src/modules/graphic/osggraph/Render/OsgShader.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/modules/graphic/osggraph/Render/OsgShader.cpp b/src/modules/graphic/osggraph/Render/OsgShader.cpp
index 5eff652b1..1785bb906 100644
--- a/src/modules/graphic/osggraph/Render/OsgShader.cpp
+++ b/src/modules/graphic/osggraph/Render/OsgShader.cpp
@@ -21,6 +21,9 @@
 #include <osg/Program>
 #include <osg/Node>
 #include <osg/Uniform>
+#include <osgDB/ReadFile>
+#include <osgDB/FileUtils>
+
 #include <tgf.h>
 
 #include "OsgMain.h"
@@ -31,13 +34,12 @@
 SDCarShader::SDCarShader(osg::Node *car, SDCar *c)
 {
     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->addShader( vertShader.get() );
-    program->addShader( fragShader.get() );
+    program->addShader(osgDB::readShaderFile(osg::Shader::VERTEX,
+        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 = car;