Changeset 6835 for OpenSceneGraph/trunk/examples/osgfxbrowser/osgfxbrowser.cpp

Timestamp:

06/04/07 21:33:59 (6 years ago)

Author:

robert

Message:

Removed setting of font resolutions and added control of threading, with the default
theading set to SingleThreading? to avoid crashes associated with non thread safe
sections of osgFX - the need to be fixed!!!

Files:

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

OpenSceneGraph/trunk/examples/osgfxbrowser/osgfxbrowser.cpp

@@ -165 +165 @@
         hints->setAlignment(osgText::Text::CENTER_BOTTOM);
         hints->setCharacterSize(13);
-        hints->setFontResolution(13, 13);
         hints->setPosition(osg::Vec3((client_rect.x0+client_rect.x1)/2, client_rect.y0 + 4, zPos));
         hints->setText("<RETURN> show/hide this panel      <LEFT> previous effect      <RIGHT> next effect      <DEL> enable/disable effects      'x' save to file      'r' rotate/stop");
@@ -197 +196 @@
         ename->setAlignment(osgText::Text::CENTER_TOP);
         ename->setCharacterSize(32);
-        ename->setFontResolution(32, 32);
         ename->setPosition(osg::Vec3((client_rect.x0 + client_rect.x1) / 2, client_rect.y1 - 22, zPos));
         ename->setText(effect_name);
@@ -208 +206 @@
         edesc->setAlignment(osgText::Text::LEFT_TOP);
         edesc->setCharacterSize(16);
-        edesc->setFontResolution(16, 16);
         edesc->setPosition(osg::Vec3(client_rect.x0 + 8, client_rect.y1 - 60, zPos));
         edesc->setText(effect_description);
@@ -298 +295 @@
     }
 
+    osgViewer::Viewer::ThreadingModel threading = osgViewer::Viewer::SingleThreaded;
+    while (arguments.read("--SingleThreaded")) threading = osgViewer::Viewer::SingleThreaded;
+    while (arguments.read("--CullDrawThreadPerContext")) threading = osgViewer::Viewer::CullDrawThreadPerContext;
+    while (arguments.read("--DrawThreadPerContext")) threading = osgViewer::Viewer::DrawThreadPerContext;
+    while (arguments.read("--CullThreadPerCameraDrawThreadPerContext")) threading = osgViewer::Viewer::CullThreadPerCameraDrawThreadPerContext;
+
+    viewer.setThreadingModel(threading);
+
     // any option left unread are converted into errors to write out later.
     arguments.reportRemainingOptionsAsUnrecognized();