Show
Ignore:
Timestamp:
10/21/14 17:10:27 (34 hours ago)
Author:
robert
Message:

Added shaders to support experimental shader based displacement mapping technique osgTerrain::ShaderTerrain?.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgPlugins/pfb/ConvertFromPerformer.cpp

    r13497 r13557  
    11// -*-c++-*- 
    2  
    3 #include <osg/Config> 
    4 #ifndef OSG_USE_DEPRECATED_GEOMETRY_METHODS  
    5 #define OSG_USE_DEPRECATED_GEOMETRY_METHODS 1 
    6 #endif 
    72 
    83#include "ConvertFromPerformer.h" 
     
    8580    _osgRoot = NULL; 
    8681 
    87     _gsetBindMap[PFGS_OFF] = osg::Geometry::BIND_OFF; 
    88     _gsetBindMap[PFGS_OVERALL] = osg::Geometry::BIND_OVERALL; 
    89     _gsetBindMap[PFGS_PER_PRIM] = osg::Geometry::BIND_PER_PRIMITIVE; 
    90     _gsetBindMap[PFGS_PER_VERTEX] = osg::Geometry::BIND_PER_VERTEX; 
     82    _gsetBindMap[PFGS_OFF] = deprecated_osg::Geometry::BIND_OFF; 
     83    _gsetBindMap[PFGS_OVERALL] = deprecated_osg::Geometry::BIND_OVERALL; 
     84    _gsetBindMap[PFGS_PER_PRIM] = deprecated_osg::Geometry::BIND_PER_PRIMITIVE; 
     85    _gsetBindMap[PFGS_PER_VERTEX] = deprecated_osg::Geometry::BIND_PER_VERTEX; 
    9186 
    9287    _saveImagesAsRGB = false; 
     
    547542 
    548543    // we'll make it easy to convert by using the Performer style osg::GeoSet, 
    549     // and then convert back to a osg::Geometry afterwards. 
     544    // and then convert back to a deprecated_osg::Geometry afterwards. 
    550545    //osg::ref_ptr<osg::GeoSet> geom = new osg::GeoSet; 
    551     osg::Geometry* geom = new osg::Geometry; 
     546    deprecated_osg::Geometry* geom = new deprecated_osg::Geometry; 
    552547 
    553548    int i;