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

4
src/osgVolume/VolumeScene.cpp
View File

@@ -141,7 +141,7 @@ VolumeScene::TileData* VolumeScene::tileVisited(osgUtil::CullVisitor* cv, osgVol
tileData->stateset->setTextureAttribute(2, tileData->depthTexture.get(), osg::StateAttribute::ON|osg::StateAttribute::OVERRIDE);
tileData->texgenUniform = new osg::Uniform("texgen",osg::Matrixf());
tileData->stateset->addUniform(tileData->texgenUniform);
tileData->stateset->addUniform(tileData->texgenUniform.get());
}
tileData->active = true;
@@ -305,7 +305,7 @@ void VolumeScene::traverse(osg::NodeVisitor& nv)
stateset->setRenderBinDetails(10,"DepthSortedBin");
osg::ref_ptr<osg::Program> program = new osg::Program;
stateset->setAttribute(program);
stateset->setAttribute(program.get());
// get vertex shaders from source
osg::ref_ptr<osg::Shader> vertexShader = osgDB::readRefShaderFile(osg::Shader::VERTEX, "shaders/volume_color_depth.vert");