From 5f38374b7a602cf18fec7e5000b6b05a3a22fd37 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 20 Jun 2016 10:23:05 +0100 Subject: [PATCH] Build fixes for building with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF. Added spacing to make code more readable. --- examples/osgobjectcache/osgobjectcache.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/examples/osgobjectcache/osgobjectcache.cpp b/examples/osgobjectcache/osgobjectcache.cpp index 2e992a6e0..4fd6e6201 100644 --- a/examples/osgobjectcache/osgobjectcache.cpp +++ b/examples/osgobjectcache/osgobjectcache.cpp @@ -28,20 +28,24 @@ osg::Group* createObjectCache() if (osgDB::Registry::instance()->getOptions()==0) osgDB::Registry::instance()->setOptions(new osgDB::Options()); + osgDB::Registry::instance()->getOptions()->setObjectCacheHint(osgDB::Options::CACHE_ALL); - + osg::ref_ptr options1 = new osgDB::Options("a=1 b=2 c=3"); options1->setObjectCacheHint(osgDB::Options::CACHE_ALL); + osg::ref_ptr options2 = new osgDB::Options("a=6 b=7 c=8"); options2->setObjectCacheHint(osgDB::Options::CACHE_ALL); + osg::ref_ptr options3 = new osgDB::Options("b=7 a=6 c=8"); options3->setObjectCacheHint(osgDB::Options::CACHE_ALL); + osg::ref_ptr node1 = osgDB::readRefNodeFile("cessna.osg"); - osg::ref_ptr node2 = osgDB::readRefNodeFile("cessna.osg", options1); - osg::ref_ptr node3 = osgDB::readRefNodeFile("cessna.osg", options2); - osg::ref_ptr node4 = osgDB::readRefNodeFile("cessna.osg", options1); - osg::ref_ptr node5 = osgDB::readRefNodeFile("cessna.osg", options2); - osg::ref_ptr node6 = osgDB::readRefNodeFile("cessna.osg", options3); + osg::ref_ptr node2 = osgDB::readRefNodeFile("cessna.osg", options1.get()); + osg::ref_ptr node3 = osgDB::readRefNodeFile("cessna.osg", options2.get()); + osg::ref_ptr node4 = osgDB::readRefNodeFile("cessna.osg", options1.get()); + osg::ref_ptr node5 = osgDB::readRefNodeFile("cessna.osg", options2.get()); + osg::ref_ptr node6 = osgDB::readRefNodeFile("cessna.osg", options3.get()); group->addChild(node1); group->addChild(node2);