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

Build fixes for when ref_ptr<> has no auto type conversion

Browse Source
This commit is contained in:
Robert Osfield
2014-01-21 18:31:20 +00:00
parent 504b42aa61
commit e48d6812fa
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/osgVolume/RayTracedTechnique.cpp
View File

@@ -165,7 +165,7 @@ void RayTracedTechnique::init()
osg::ref_ptr<osg::Shader> vertexShader = osgDB::readRefShaderFile(osg::Shader::VERTEX, "shaders/volume.vert");
if (vertexShader.valid())
{
program->addShader(vertexShader);
program->addShader(vertexShader.get());
}
else
{
@@ -285,7 +285,7 @@ void RayTracedTechnique::init()
osg::ref_ptr<osg::Shader> fragmentShader = osgDB::readRefShaderFile(osg::Shader::FRAGMENT, "shaders/volume_tf_iso.frag");
if (fragmentShader.valid())
{
program->addShader(fragmentShader);
program->addShader(fragmentShader.get());
}
else
{
@@ -300,7 +300,7 @@ void RayTracedTechnique::init()
{
OSG_INFO<<"Shader found"<<std::endl;
program->addShader(fragmentShader);
program->addShader(fragmentShader.get());
}
else
{
@@ -320,7 +320,7 @@ void RayTracedTechnique::init()
osg::ref_ptr<osg::Shader> fragmentShader = osgDB::readRefShaderFile(osg::Shader::FRAGMENT, "shaders/volume_lit_tf.frag");
if (fragmentShader.valid())
{
program->addShader(fragmentShader);
program->addShader(fragmentShader.get());
}
else
{
@@ -334,7 +334,7 @@ void RayTracedTechnique::init()
osg::ref_ptr<osg::Shader> fragmentShader = osgDB::readRefShaderFile(osg::Shader::FRAGMENT, "shaders/volume_lit.frag");
if (fragmentShader.valid())
{
program->addShader(fragmentShader);
program->addShader(fragmentShader.get());
}
else
{
@@ -352,7 +352,7 @@ void RayTracedTechnique::init()
osg::ref_ptr<osg::Shader> fragmentShader = osgDB::readRefShaderFile(osg::Shader::FRAGMENT, "shaders/volume_tf.frag");
if (fragmentShader.valid())
{
program->addShader(fragmentShader);
program->addShader(fragmentShader.get());
}
else
{
@@ -366,7 +366,7 @@ void RayTracedTechnique::init()
osg::ref_ptr<osg::Shader> fragmentShader = osgDB::readRefShaderFile(osg::Shader::FRAGMENT, "shaders/volume.frag");
if (fragmentShader.valid())
{
program->addShader(fragmentShader);
program->addShader(fragmentShader.get());
}
else
{