Show
Ignore:
Timestamp:
11/28/08 15:36:39 (6 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/osgwidgetlabel/osgwidgetlabel.cpp

    r8867 r9289  
    4848        1024.0f, 
    4949        MASK_2D, 
    50         osgWidget::WindowManager::WM_PICK_DEBUG | 
    51         osgWidget::WindowManager::WM_NO_INVERT_Y 
     50        // osgWidget::WindowManager::WM_USE_RENDERBINS | 
     51        osgWidget::WindowManager::WM_PICK_DEBUG 
    5252    ); 
    5353     
     
    6565 
    6666    label1->setColor(1.0f, 0.5f, 0.0f, 0.0f); 
    67     label2->setColor(1.0f, 0.5f, 0.0f, 0.0f); 
     67    label2->setColor(1.0f, 0.5f, 0.0f, 0.5f); 
     68 
     69    label2->setImage("Images/Brick-Norman-Brown.TGA", true); 
    6870 
    6971    box->addWidget(label1); 
     
    8688    label5->setColor(0.0f, 0.0f, 0.5f, 0.5f); 
    8789     
    88     label5->setAlignHorizontal(osgWidget::Widget::HA_LEFT); 
    89     label5->setAlignVertical(osgWidget::Widget::VA_BOTTOM); 
     90    //label5->setAlignHorizontal(osgWidget::Widget::HA_LEFT); 
     91    //label5->setAlignVertical(osgWidget::Widget::VA_BOTTOM); 
    9092 
    9193    // Test our label copy construction... 
    92     osgWidget::Label* label6 = osg::clone(label5,"label6"); 
     94    osgWidget::Label* label6 = osg::clone(label5, "label6", osg::CopyOp::DEEP_COPY_ALL); 
    9395 
    9496    label6->setLabel("abcdefghijklmnopqrs"); 
     
    109111 
    110112    // Test our label-in-window copy construction... 
    111     osgWidget::Box* clonedBox = osg::clone(box,"HBOX-new"); 
     113    osgWidget::Box* clonedBox = osg::clone(box, "HBOX-new", osg::CopyOp::DEEP_COPY_ALL); 
    112114     
    113115    clonedBox->getBackground()->setColor(0.0f, 1.0f, 0.0f, 0.5f);