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

Timestamp:

10/24/04 23:05:27 (9 years ago)

Author:

don

Message:

Namespaced Rect and Frame to osgfxbrowser::Rect/Frame, as this was causing
a namespace collision with CGL

Files:

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

OpenSceneGraph/trunk/examples/osgfxbrowser/osgfxbrowser.cpp

@@ -49 +49 @@
 
 
-class EffectPanel: public Frame {
+class EffectPanel: public osgfxbrowser::Frame {
 public:
 
@@ -152 +152 @@
 
 protected:
-        void rebuild_client_area(const Rect &client_rect)
+        void rebuild_client_area(const osgfxbrowser::Rect &client_rect)
         {
                 float zPos = -0.1; // note from Robert, was 0.1f, but now must be -0.1f to keep text visible??#!? due
@@ -253 +253 @@
         osg::ref_ptr<EffectPanel> effect_panel = new EffectPanel;
         effect_panel->setCaption("osgFX Effect Browser");
-        effect_panel->setRect(Rect(20, 20, 1000, 280)); 
+        effect_panel->setRect(osgfxbrowser::Rect(20, 20, 1000, 280));   
 
         hud->addChild(effect_panel.get());