Show
Ignore:
Timestamp:
11/09/15 17:13:03 (2 years ago)
Author:
robert
Message:

Release OpenSceneGraph-3.5.1

Files:
1 modified

Legend:

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

    r13502 r13557  
    3333// example uses a NodeVisitor to try to find worthwhile locations 
    3434// for OcclusionQueryNodes in your the scene graph. 
    35  
    36 #include <osg/Config> 
    37 #ifndef OSG_USE_DEPRECATED_GEOMETRY_METHODS  
    38 #define OSG_USE_DEPRECATED_GEOMETRY_METHODS 1 
    39 #endif 
    40  
    4135 
    4236#include <osg/NodeVisitor> 
     
    573567        osg::StateAttribute::ON | osg::StateAttribute::PROTECTED ); 
    574568 
    575     osg::ref_ptr<osg::Geometry> geom = new osg::Geometry; 
     569    osg::ref_ptr<deprecated_osg::Geometry> geom = new deprecated_osg::Geometry; 
    576570    osg::ref_ptr<osg::Vec3Array> v = new osg::Vec3Array; 
    577571    geom->setVertexArray( v.get() ); 
     
    611605    osg::ref_ptr<osg::Vec4Array> c = new osg::Vec4Array; 
    612606    geom->setColorArray( c.get() ); 
    613     geom->setColorBinding( osg::Geometry::BIND_OVERALL ); 
     607    geom->setColorBinding( deprecated_osg::Geometry::BIND_OVERALL ); 
    614608    c->push_back( osg::Vec4( 0.f, 1.f, 1.f, 1.f ) ); 
    615609 
    616610    osg::ref_ptr<osg::Vec3Array> n = new osg::Vec3Array; 
    617611    geom->setNormalArray( n.get() ); 
    618     geom->setNormalBinding( osg::Geometry::BIND_PER_PRIMITIVE ); 
     612    geom->setNormalBinding( deprecated_osg::Geometry::BIND_PER_PRIMITIVE ); 
    619613    n->push_back( osg::Vec3( -1.f, 0.f, 0.f ) ); 
    620614    n->push_back( osg::Vec3( 1.f, 0.f, 0.f ) ); 
     
    651645        osg::StateAttribute::PROTECTED); 
    652646 
    653     osg::ref_ptr<osg::Geometry> geom = new osg::Geometry; 
     647    osg::ref_ptr<deprecated_osg::Geometry> geom = new deprecated_osg::Geometry; 
    654648    // Disable display lists to decrease performance. 
    655649    geom->setUseDisplayList( false ); 
     
    675669    geom->setColorArray( c.get() ); 
    676670    // Bind per primitive to force slow glBegin/glEnd path. 
    677     geom->setColorBinding( osg::Geometry::BIND_PER_PRIMITIVE ); 
     671    geom->setColorBinding( deprecated_osg::Geometry::BIND_PER_PRIMITIVE ); 
    678672    c->resize( num ); 
    679673