Show
Ignore:
Timestamp:
08/22/14 21:00:53 (5 hours ago)
Author:
robert
Message:

Improved handling of setting of the depth of the UI.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgSim/ScalarBar.cpp

    r13502 r13557  
    1 #include <osg/Config> 
    2 #ifndef OSG_USE_DEPRECATED_GEOMETRY_METHODS  
    3 #define OSG_USE_DEPRECATED_GEOMETRY_METHODS 1 
    4 #endif 
    5  
    61#include <osgSim/ScalarBar> 
    72#include <osgText/Text> 
     
    143138    // 1. First the bar 
    144139    // ================= 
    145     osg::ref_ptr<osg::Geometry> bar = new osg::Geometry(); 
     140    osg::ref_ptr<deprecated_osg::Geometry> bar = new deprecated_osg::Geometry(); 
    146141 
    147142    // Create the bar - created in 'real' coordinate space the moment, 
     
    178173    } 
    179174    bar->setColorArray(cs.get()); 
    180     bar->setColorBinding(osg::Geometry::BIND_PER_PRIMITIVE); 
     175    bar->setColorBinding(deprecated_osg::Geometry::BIND_PER_PRIMITIVE); 
    181176 
    182177    // Normal 
     
    184179    ns->push_back(osg::Matrix::transform3x3(osg::Vec3(0.0f,0.0f,1.0f),matrix)); 
    185180    bar->setNormalArray(ns.get()); 
    186     bar->setNormalBinding(osg::Geometry::BIND_OVERALL); 
     181    bar->setNormalBinding(deprecated_osg::Geometry::BIND_OVERALL); 
    187182 
    188183    // The Quad strip that represents the bar