Changeset 12212 for OpenSceneGraph/trunk/examples/osgQtWidgets/osgQtWidgets.cpp

Timestamp:

03/09/11 11:35:00 (2 years ago)

Author:

robert

Message:

Changed the use of a viewer thread to be off by default because it was causing the application to crash when any users input was recieved

Files:

• OpenSceneGraph/trunk/examples/osgQtWidgets/osgQtWidgets.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/examples/osgQtWidgets/osgQtWidgets.cpp

@@ -138 +138 @@
     // true = run osgViewer in a separate thread than Qt
     // false = interleave osgViewer and Qt in the main thread
-    bool useFrameLoopThread = true;
-    if (arguments.read("--noFrameThread")) useFrameLoopThread = false;
+    bool useFrameLoopThread = false;
+    if (arguments.read("--no-frame-thread")) useFrameLoopThread = false;
+    if (arguments.read("--frame-thread")) useFrameLoopThread = true;
 
     // true = use QWidgetImage
@@ -377 +378 @@
 
             osg::MatrixTransform* mt = new osg::MatrixTransform;
+
+            osg::Texture2D* texture = new osg::Texture2D(widgetImage.get());
+            texture->setResizeNonPowerOfTwoHint(false);
+            texture->setFilter(osg::Texture::MIN_FILTER,osg::Texture::LINEAR);
+            texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
+            texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
+            mt->getOrCreateStateSet()->setTextureAttributeAndModes(0, texture, osg::StateAttribute::ON);
+
+            osgViewer::InteractiveImageHandler* handler; 
             if (inScene)
             {
                 mt->setMatrix(osg::Matrix::rotate(osg::Vec3(0,1,0), osg::Vec3(0,0,1)));
                 mt->addChild(geode);
+
+                handler = new osgViewer::InteractiveImageHandler(widgetImage.get());
             }
             else    // fullscreen
@@ -402 +414 @@
 
                 mt->addChild(camera);
+
+                handler = new osgViewer::InteractiveImageHandler(widgetImage.get(), texture, camera);
             }
 
@@ -409 +423 @@
             mt->getOrCreateStateSet()->setAttribute(new osg::Program);
 
-            osg::Texture2D* texture = new osg::Texture2D(widgetImage.get());
-            texture->setResizeNonPowerOfTwoHint(false);
-            texture->setFilter(osg::Texture::MIN_FILTER,osg::Texture::LINEAR);
-            texture->setWrap(osg::Texture::WRAP_S, osg::Texture::CLAMP_TO_EDGE);
-            texture->setWrap(osg::Texture::WRAP_T, osg::Texture::CLAMP_TO_EDGE);
-            mt->getOrCreateStateSet()->setTextureAttributeAndModes(0, texture, osg::StateAttribute::ON);
-
             osg::Group* overlay = new osg::Group;
             overlay->addChild(mt);
 
             root->addChild(overlay);
-
-            osgViewer::InteractiveImageHandler* handler = new osgViewer::InteractiveImageHandler(widgetImage.get(), texture, camera);
+            
             quad->setEventCallback(handler);
             quad->setCullCallback(handler);