Changeset 9289 for OpenSceneGraph/trunk/examples/osgwidgetbox/osgwidgetbox.cpp

Timestamp:

11/28/08 15:36:39 (5 years ago)

Author:

robert

Message:

From Jeremy Moles, updates to osgwidget examples.

Merged by Robert Osfield from OpenSceneGraph-osgWidget-dev

Files:

• OpenSceneGraph/trunk/examples/osgwidgetbox/osgwidgetbox.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/examples/osgwidgetbox/osgwidgetbox.cpp

@@ -56 +56 @@
 };
 
-osgWidget::Box* createBox(const std::string& name, osgWidget::Box::BOX_TYPE bt) {
+osgWidget::Box* createBox(const std::string& name, osgWidget::Box::BoxType bt) {
         osgWidget::Box*    box     = new osgWidget::Box(name, bt, true);
         osgWidget::Widget* widget1 = new osgWidget::Widget(name + "_widget1", 100.0f, 100.0f);
@@ -79 +79 @@
 
 int main(int argc, char** argv) {
-        osgViewer::CompositeViewer viewer;
-
-        osgViewer::View* view = new osgViewer::View();
+        osgViewer::Viewer viewer;
 
         osgWidget::WindowManager* wm = new osgWidget::WindowManager(
-                view,
+                &viewer,
                 1280.0f,
                 1024.0f,
                 MASK_2D,
-                osgWidget::WindowManager::WM_PICK_DEBUG |
-                osgWidget::WindowManager::WM_NO_INVERT_Y
+                osgWidget::WindowManager::WM_PICK_DEBUG
         );
         
@@ -119 +116 @@
         model->setNodeMask(MASK_3D);
 
-        return osgWidget::createCompositeExample(viewer, view, wm, model);
+        return osgWidget::createExample(viewer, wm, model);
 }