Show
Ignore:
Timestamp:
09/19/14 12:35:23 (11 days ago)
Author:
robert
Message:

Moved widgets from VolumeEditorWidget? to TransferFunctionWidget?, and widget utilities into WidgetUtils?.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgPlugins/vrml/Primitives.cpp

    r13497 r13557  
    1717osg::ref_ptr<osg::Geometry> ReaderWriterVRML2::convertVRML97IndexedLineSet(openvrml::node *vrml_ifs) const 
    1818{ 
    19     osg::ref_ptr<osg::Geometry> osg_geom = new osg::Geometry(); 
     19    osg::ref_ptr<deprecated_osg::Geometry> osg_geom = new deprecated_osg::Geometry(); 
    2020 
    2121    osg_geom->addPrimitiveSet(new osg::DrawArrayLengths(osg::PrimitiveSet::LINE_STRIP)); 
     
    118118            if (vrml_color_per_vertex->value()) 
    119119            { 
    120                 osg_geom->setColorBinding(osg::Geometry::BIND_PER_VERTEX); 
     120                osg_geom->setColorBinding(deprecated_osg::Geometry::BIND_PER_VERTEX); 
    121121            } else 
    122122            { 
    123                 osg_geom->setColorBinding(osg::Geometry::BIND_PER_PRIMITIVE); 
     123                osg_geom->setColorBinding(deprecated_osg::Geometry::BIND_PER_PRIMITIVE); 
    124124            } 
    125125        } 
     
    144144    } 
    145145 
    146     osg::ref_ptr<osg::Geometry> osg_geom = new osg::Geometry(); 
     146    osg::ref_ptr<deprecated_osg::Geometry> osg_geom = new deprecated_osg::Geometry(); 
    147147    osg::ref_ptr<osg::Vec3Array> osg_vertices = new osg::Vec3Array(); 
    148148    osg::ref_ptr<osg::Vec2Array> osg_texcoords = new osg::Vec2Array(); 
     
    203203    osg_geom->setTexCoordArray(0, osg_texcoords.get()); 
    204204    osg_geom->setNormalArray(osg_normals.get()); 
    205     osg_geom->setNormalBinding(osg::Geometry::BIND_PER_PRIMITIVE); 
     205    osg_geom->setNormalBinding(deprecated_osg::Geometry::BIND_PER_PRIMITIVE); 
    206206 
    207207    osg_geom->getOrCreateStateSet()->setAttributeAndModes(new osg::CullFace(osg::CullFace::BACK));