Show
Ignore:
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:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/examples/osgwidgetbox/osgwidgetbox.cpp

    r8588 r9289  
    5656}; 
    5757 
    58 osgWidget::Box* createBox(const std::string& name, osgWidget::Box::BOX_TYPE bt) { 
     58osgWidget::Box* createBox(const std::string& name, osgWidget::Box::BoxType bt) { 
    5959        osgWidget::Box*    box     = new osgWidget::Box(name, bt, true); 
    6060        osgWidget::Widget* widget1 = new osgWidget::Widget(name + "_widget1", 100.0f, 100.0f); 
     
    7979 
    8080int main(int argc, char** argv) { 
    81         osgViewer::CompositeViewer viewer; 
    82  
    83         osgViewer::View* view = new osgViewer::View(); 
     81        osgViewer::Viewer viewer; 
    8482 
    8583        osgWidget::WindowManager* wm = new osgWidget::WindowManager( 
    86                 view, 
     84                &viewer, 
    8785                1280.0f, 
    8886                1024.0f, 
    8987                MASK_2D, 
    90                 osgWidget::WindowManager::WM_PICK_DEBUG | 
    91                 osgWidget::WindowManager::WM_NO_INVERT_Y 
     88                osgWidget::WindowManager::WM_PICK_DEBUG 
    9289        ); 
    9390         
     
    119116        model->setNodeMask(MASK_3D); 
    120117 
    121         return osgWidget::createCompositeExample(viewer, view, wm, model); 
     118        return osgWidget::createExample(viewer, wm, model); 
    122119}