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

Timestamp:

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

Author:

robert

Message:

From Jeremy Moles, updates to osgwidget examples.

Merged by Robert Osfield from OpenSceneGraph-osgWidget-dev

Files:

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

OpenSceneGraph/trunk/examples/osgwidgetlabel/osgwidgetlabel.cpp

@@ -48 +48 @@
         1024.0f,
         MASK_2D,
-        osgWidget::WindowManager::WM_PICK_DEBUG |
-        osgWidget::WindowManager::WM_NO_INVERT_Y
+        // osgWidget::WindowManager::WM_USE_RENDERBINS |
+        osgWidget::WindowManager::WM_PICK_DEBUG
     );
     
@@ -65 +65 @@
 
     label1->setColor(1.0f, 0.5f, 0.0f, 0.0f);
-    label2->setColor(1.0f, 0.5f, 0.0f, 0.0f);
+    label2->setColor(1.0f, 0.5f, 0.0f, 0.5f);
+
+    label2->setImage("Images/Brick-Norman-Brown.TGA", true);
 
     box->addWidget(label1);
@@ -86 +88 @@
     label5->setColor(0.0f, 0.0f, 0.5f, 0.5f);
     
-    label5->setAlignHorizontal(osgWidget::Widget::HA_LEFT);
-    label5->setAlignVertical(osgWidget::Widget::VA_BOTTOM);
+    //label5->setAlignHorizontal(osgWidget::Widget::HA_LEFT);
+    //label5->setAlignVertical(osgWidget::Widget::VA_BOTTOM);
 
     // Test our label copy construction...
-    osgWidget::Label* label6 = osg::clone(label5,"label6");
+    osgWidget::Label* label6 = osg::clone(label5, "label6", osg::CopyOp::DEEP_COPY_ALL);
 
     label6->setLabel("abcdefghijklmnopqrs");
@@ -109 +111 @@
 
     // Test our label-in-window copy construction...
-    osgWidget::Box* clonedBox = osg::clone(box,"HBOX-new");
+    osgWidget::Box* clonedBox = osg::clone(box, "HBOX-new", osg::CopyOp::DEEP_COPY_ALL);
     
     clonedBox->getBackground()->setColor(0.0f, 1.0f, 0.0f, 0.5f);