Show
Ignore:
Timestamp:
09/19/14 12:35:23 (12 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/ive/Geometry.cpp

    r13497 r13557  
    1313 **********************************************************************/ 
    1414 
    15 #include <osg/Config> 
    16 #ifndef OSG_USE_DEPRECATED_GEOMETRY_METHODS  
    17 #define OSG_USE_DEPRECATED_GEOMETRY_METHODS 1 
    18 #endif 
     15#include "Geometry.h" 
    1916 
    2017#include "Exception.h" 
    21 #include "Geometry.h" 
    2218#include "Drawable.h" 
    2319#include "DrawArrays.h" 
     
    145141            out->writeArray(tcal[j].get()); 
    146142        } 
    147          
     143 
    148144        // Write indices if valid 
    149145        const osg::IndexArray* indices = getTexCoordIndices(j); 
     
    163159        if (array) 
    164160        { 
    165             out->writeBinding(static_cast<osg::Geometry::AttributeBinding>(array->getBinding())); 
     161            out->writeBinding(static_cast<deprecated_osg::Geometry::AttributeBinding>(array->getBinding())); 
    166162            out->writeBool(array->getNormalize()); 
    167163            out->writeBool(true); 
    168164            out->writeArray(array); 
    169          
     165 
    170166            // Write indices if valid 
    171167            const osg::IndexArray* indices = getVertexAttribIndices(j); 
     
    254250            bool na =in->readBool(); 
    255251            if(na){ 
    256                 osg::Geometry::AttributeBinding binding = in->readBinding(); 
     252                deprecated_osg::Geometry::AttributeBinding binding = in->readBinding(); 
    257253                setNormalArray(in->readVec3Array()); 
    258254                setNormalBinding(binding); 
     
    263259            bool na =in->readBool(); 
    264260            if(na){ 
    265                 osg::Geometry::AttributeBinding binding = in->readBinding(); 
     261                deprecated_osg::Geometry::AttributeBinding binding = in->readBinding(); 
    266262                setNormalArray(in->readArray()); 
    267263                setNormalBinding(binding); 
     
    276272        // Read color array if any. 
    277273        if(in->readBool()){ 
    278             osg::Geometry::AttributeBinding binding = in->readBinding(); 
     274            deprecated_osg::Geometry::AttributeBinding binding = in->readBinding(); 
    279275            setColorArray(in->readArray()); 
    280276            setColorBinding(binding); 
     
    286282        // Read secondary color array if any 
    287283        if(in->readBool()){ 
    288             osg::Geometry::AttributeBinding binding = in->readBinding(); 
     284            deprecated_osg::Geometry::AttributeBinding binding = in->readBinding(); 
    289285            setSecondaryColorArray(in->readArray()); 
    290286            setSecondaryColorBinding(binding); 
     
    296292        // Read fog coord array if any 
    297293        if(in->readBool()){ 
    298             osg::Geometry::AttributeBinding binding = in->readBinding(); 
     294            deprecated_osg::Geometry::AttributeBinding binding = in->readBinding(); 
    299295            setFogCoordArray(in->readArray()); 
    300296            setFogCoordBinding(binding); 
     
    322318        for(i =0;i<size;i++) 
    323319        { 
    324             osg::Geometry::AttributeBinding binding = in->readBinding(); 
     320            deprecated_osg::Geometry::AttributeBinding binding = in->readBinding(); 
    325321            bool normalize = in->readBool(); 
    326322