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

Fixed build issues when building with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF

Browse Source
This commit is contained in:
Robert Osfield
2018-03-19 14:08:47 +00:00
parent b38a37c3bb
commit b563f1bd78
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/osgsampler/osgSampler.cpp
View File

@@ -104,7 +104,7 @@ int main(int argc, char* argv[])
osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFiles(arguments);
osg::ref_ptr<osg::Node> geode ;
osg::ref_ptr<osg::Sampler > sampler1, sampler2;
osg::ref_ptr<osg::Sampler > sampler1, sampler2;
if (loadedModel)
{
///ensure loaded have Sampler
@@ -121,7 +121,7 @@ int main(int argc, char* argv[])
}
if(sampler1.valid()&&sampler2.valid()){
OSG_WARN<<"2samplers manipulator setted"<<std::endl;
viewer.addEventHandler(new SamplersKeyboardEventHandler(sampler1, sampler2));
viewer.addEventHandler(new SamplersKeyboardEventHandler(sampler1.get(), sampler2.get()));
}
}
else
@@ -222,7 +222,7 @@ int main(int argc, char* argv[])
ss->addUniform(new osg::Uniform("tex2",(int)1));
ss->setAttribute(program.get());
viewer.addEventHandler(new SamplersKeyboardEventHandler(sampler1, sampler2));
viewer.addEventHandler(new SamplersKeyboardEventHandler(sampler1.get(), sampler2.get()));
}
viewer.addEventHandler(new osgViewer::StatsHandler);