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

Legend:

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

    r3528 r3529  
    4949 
    5050 
    51 class EffectPanel: public Frame { 
     51class EffectPanel: public osgfxbrowser::Frame { 
    5252public: 
    5353 
     
    152152 
    153153protected: 
    154         void rebuild_client_area(const Rect &client_rect) 
     154        void rebuild_client_area(const osgfxbrowser::Rect &client_rect) 
    155155        { 
    156156                float zPos = -0.1; // note from Robert, was 0.1f, but now must be -0.1f to keep text visible??#!? due 
     
    253253        osg::ref_ptr<EffectPanel> effect_panel = new EffectPanel; 
    254254        effect_panel->setCaption("osgFX Effect Browser"); 
    255         effect_panel->setRect(Rect(20, 20, 1000, 280));  
     255        effect_panel->setRect(osgfxbrowser::Rect(20, 20, 1000, 280));    
    256256 
    257257        hud->addChild(effect_panel.get());