From 0b451491b00e13c6fcb23ddf435928932d23f3f0 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 27 Oct 2008 19:59:05 +0000 Subject: [PATCH] From Chris Denham, changed nested Camera intersection test so that it requires the command line --relative-camera-scene to enable it --- examples/osgpick/osgpick.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/osgpick/osgpick.cpp b/examples/osgpick/osgpick.cpp index fb4f8ff5a..61c2c5f2d 100644 --- a/examples/osgpick/osgpick.cpp +++ b/examples/osgpick/osgpick.cpp @@ -252,8 +252,9 @@ int main( int argc, char **argv ) // read the scene from the list of file specified commandline args. osg::ref_ptr scene = osgDB::readNodeFiles(arguments); - if (!scene) + if (!scene && arguments.read("--relative-camera-scene")) { + // Create a test scene with a camera that has a relative reference frame. osg::Group* group = new osg::Group(); osg::Geode* sphere = new osg::Geode(); @@ -267,7 +268,7 @@ int main( int argc, char **argv ) osg::Camera* camera = new osg::Camera(); camera->setRenderOrder(osg::Camera::POST_RENDER); camera->setClearMask(GL_DEPTH_BUFFER_BIT); - //camera->setReferenceFrame(osg::Transform::ABSOLUTE_RF); + camera->setReferenceFrame(osg::Transform::RELATIVE_RF); group->addChild(sphere); group->addChild(camera);