Show
Ignore:
Timestamp:
04/15/08 04:48:53 (5 months ago)
Author:
vossg
Message:

changed: renamed fields, base rebuild

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Source/System/NodeCores/Drawables/Geometry/Base/ES/OSGGeometryBase.cpp

    r1158 r1161  
    121121 
    122122 
    123     pDesc = new SFUnrecFieldContainerChildGeoIntegralPropertyPtr::Description( 
    124         SFUnrecFieldContainerChildGeoIntegralPropertyPtr::getClassType(), 
     123    pDesc = new SFUnrecChildGeoIntegralPropertyPtr::Description( 
     124        SFUnrecChildGeoIntegralPropertyPtr::getClassType(), 
    125125        "types", 
    126126        "The types property contains the primitive's types. Legal values are \n" 
    …… 
    135135    oType.addInitialDesc(pDesc); 
    136136 
    137     pDesc = new SFUnrecFieldContainerChildGeoIntegralPropertyPtr::Description( 
    138         SFUnrecFieldContainerChildGeoIntegralPropertyPtr::getClassType(), 
     137    pDesc = new SFUnrecChildGeoIntegralPropertyPtr::Description( 
     138        SFUnrecChildGeoIntegralPropertyPtr::getClassType(), 
    139139        "lengths", 
    140140        "The lengths property contains the number of vertices to use for the \n" 
    …… 
    148148    oType.addInitialDesc(pDesc); 
    149149 
    150     pDesc = new MFUnrecFieldContainerChildGeoVectorPropertyPtr::Description( 
    151         MFUnrecFieldContainerChildGeoVectorPropertyPtr::getClassType(), 
     150    pDesc = new MFUnrecChildGeoVectorPropertyPtr::Description( 
     151        MFUnrecChildGeoVectorPropertyPtr::getClassType(), 
    152152        "properties", 
    153153        "The attributes used to render the geometry. The order is based on the \n" 
    …… 
    161161    oType.addInitialDesc(pDesc); 
    162162 
    163     pDesc = new MFUnrecFieldContainerChildGeoIntegralPropertyPtr::Description( 
    164         MFUnrecFieldContainerChildGeoIntegralPropertyPtr::getClassType(), 
     163    pDesc = new MFUnrecChildGeoIntegralPropertyPtr::Description( 
     164        MFUnrecChildGeoIntegralPropertyPtr::getClassType(), 
    165165        "propIndices", 
    166166        "The indices property contains the index data. See \\ref \n" 
    …… 
    321321 
    322322//! Get the Geometry::_sfTypes field. 
    323 const SFUnrecFieldContainerChildGeoIntegralPropertyPtr *GeometryBase::getSFTypes(void) const 
     323const SFUnrecChildGeoIntegralPropertyPtr *GeometryBase::getSFTypes(void) const 
    324324{ 
    325325    return &_sfTypes; 
    …… 
    327327 
    328328//! Get the Geometry::_sfLengths field. 
    329 const SFUnrecFieldContainerChildGeoIntegralPropertyPtr *GeometryBase::getSFLengths(void) const 
     329const SFUnrecChildGeoIntegralPropertyPtr *GeometryBase::getSFLengths(void) const 
    330330{ 
    331331    return &_sfLengths; 
    …… 
    333333 
    334334//! Get the Geometry::_mfProperties field. 
    335 const MFUnrecFieldContainerChildGeoVectorPropertyPtr *GeometryBase::getMFProperties(void) const 
     335const MFUnrecChildGeoVectorPropertyPtr *GeometryBase::getMFProperties(void) const 
    336336{ 
    337337    return &_mfProperties; 
    …… 
    339339 
    340340//! Get the Geometry::_mfPropIndices field. 
    341 const MFUnrecFieldContainerChildGeoIntegralPropertyPtr *GeometryBase::getMFPropIndices(void) const 
     341const MFUnrecChildGeoIntegralPropertyPtr *GeometryBase::getMFPropIndices(void) const 
    342342{ 
    343343    return &_mfPropIndices; 
    …… 
    396396} 
    397397 
    398 void GeometryBase::assignProperties(const MFUnrecFieldContainerChildGeoVectorPropertyPtr &value) 
    399 { 
    400     MFUnrecFieldContainerChildGeoVectorPropertyPtr::const_iterator elemIt  = 
     398void GeometryBase::assignProperties(const MFUnrecChildGeoVectorPropertyPtr &value) 
     399{ 
     400    MFUnrecChildGeoVectorPropertyPtr::const_iterator elemIt  = 
    401401        value.begin(); 
    402     MFUnrecFieldContainerChildGeoVectorPropertyPtr::const_iterator elemEnd = 
     402    MFUnrecChildGeoVectorPropertyPtr::const_iterator elemEnd = 
    403403        value.end  (); 
    404404 
    …… 
    418418    editMField(PropertiesFieldMask, _mfProperties); 
    419419 
    420     MFUnrecFieldContainerChildGeoVectorPropertyPtr::iterator fieldIt = _mfProperties.begin_nc(); 
     420    MFUnrecChildGeoVectorPropertyPtr::iterator fieldIt = _mfProperties.begin_nc(); 
    421421 
    422422    //addRef(value); 
    …… 
    476476        editMField(PropertiesFieldMask, _mfProperties); 
    477477 
    478         MFUnrecFieldContainerChildGeoVectorPropertyPtr::iterator fieldIt = _mfProperties.begin_nc(); 
     478        MFUnrecChildGeoVectorPropertyPtr::iterator fieldIt = _mfProperties.begin_nc(); 
    479479 
    480480        fieldIt += uiIndex; 
    …… 
    494494        editMField(PropertiesFieldMask, _mfProperties); 
    495495 
    496         MFUnrecFieldContainerChildGeoVectorPropertyPtr::iterator fieldIt = _mfProperties.begin_nc(); 
     496        MFUnrecChildGeoVectorPropertyPtr::iterator fieldIt = _mfProperties.begin_nc(); 
    497497 
    498498        fieldIt += iElemIdx; 
    …… 
    523523} 
    524524 
    525 void GeometryBase::assignPropIndices(const MFUnrecFieldContainerChildGeoIntegralPropertyPtr &value) 
    526 { 
    527     MFUnrecFieldContainerChildGeoIntegralPropertyPtr::const_iterator elemIt  = 
     525void GeometryBase::assignPropIndices(const MFUnrecChildGeoIntegralPropertyPtr &value) 
     526{ 
     527    MFUnrecChildGeoIntegralPropertyPtr::const_iterator elemIt  = 
    528528        value.begin(); 
    529     MFUnrecFieldContainerChildGeoIntegralPropertyPtr::const_iterator elemEnd = 
     529    MFUnrecChildGeoIntegralPropertyPtr::const_iterator elemEnd = 
    530530        value.end  (); 
    531531 
    …… 
    545545    editMField(PropIndicesFieldMask, _mfPropIndices); 
    546546 
    547     MFUnrecFieldContainerChildGeoIntegralPropertyPtr::iterator fieldIt = _mfPropIndices.begin_nc(); 
     547    MFUnrecChildGeoIntegralPropertyPtr::iterator fieldIt = _mfPropIndices.begin_nc(); 
    548548 
    549549    //addRef(value); 
    …… 
    603603        editMField(PropIndicesFieldMask, _mfPropIndices); 
    604604 
    605         MFUnrecFieldContainerChildGeoIntegralPropertyPtr::iterator fieldIt = _mfPropIndices.begin_nc(); 
     605        MFUnrecChildGeoIntegralPropertyPtr::iterator fieldIt = _mfPropIndices.begin_nc(); 
    606606 
    607607        fieldIt += uiIndex; 
    …… 
    621621        editMField(PropIndicesFieldMask, _mfPropIndices); 
    622622 
    623         MFUnrecFieldContainerChildGeoIntegralPropertyPtr::iterator fieldIt = _mfPropIndices.begin_nc(); 
     623        MFUnrecChildGeoIntegralPropertyPtr::iterator fieldIt = _mfPropIndices.begin_nc(); 
    624624 
    625625        fieldIt += iElemIdx; 
    …… 
    934934        if(pTypedChild != NullFC) 
    935935        { 
    936             MFUnrecFieldContainerChildGeoVectorPropertyPtr::iterator pI = 
     936            MFUnrecChildGeoVectorPropertyPtr::iterator pI = 
    937937                _mfProperties.find_nc(pTypedChild); 
    938938                 
    …… 
    962962        if(pTypedChild != NullFC) 
    963963        { 
    964             MFUnrecFieldContainerChildGeoIntegralPropertyPtr::iterator pI = 
     964            MFUnrecChildGeoIntegralPropertyPtr::iterator pI = 
    965965                _mfPropIndices.find_nc(pTypedChild); 
    966966                 
    …… 
    998998        this->setLengths(source->getLengths()); 
    999999 
    1000         MFUnrecFieldContainerChildGeoVectorPropertyPtr::const_iterator PropertiesIt  = 
     1000        MFUnrecChildGeoVectorPropertyPtr::const_iterator PropertiesIt  = 
    10011001            source->_mfProperties.begin(); 
    1002         MFUnrecFieldContainerChildGeoVectorPropertyPtr::const_iterator PropertiesEnd = 
     1002        MFUnrecChildGeoVectorPropertyPtr::const_iterator PropertiesEnd = 
    10031003            source->_mfProperties.end  (); 
    10041004 
    …… 
    10101010        } 
    10111011 
    1012         MFUnrecFieldContainerChildGeoIntegralPropertyPtr::const_iterator PropIndicesIt  = 
     1012        MFUnrecChildGeoIntegralPropertyPtr::const_iterator PropIndicesIt  = 
    10131013            source->_mfPropIndices.begin(); 
    1014         MFUnrecFieldContainerChildGeoIntegralPropertyPtr::const_iterator PropIndicesEnd = 
     1014        MFUnrecChildGeoIntegralPropertyPtr::const_iterator PropIndicesEnd = 
    10151015            source->_mfPropIndices.end  (); 
    10161016 
    …… 
    10261026GetFieldHandlePtr GeometryBase::getHandleTypes           (void) const 
    10271027{ 
    1028     SFUnrecFieldContainerChildGeoIntegralPropertyPtr::GetHandlePtr returnValue( 
    1029         new  SFUnrecFieldContainerChildGeoIntegralPropertyPtr::GetHandle( 
     1028    SFUnrecChildGeoIntegralPropertyPtr::GetHandlePtr returnValue( 
     1029        new  SFUnrecChildGeoIntegralPropertyPtr::GetHandle( 
    10301030             &_sfTypes,  
    10311031             this->getType().getFieldDesc(TypesFieldId))); 
    …… 
    10361036EditFieldHandlePtr GeometryBase::editHandleTypes          (void) 
    10371037{ 
    1038     SFUnrecFieldContainerChildGeoIntegralPropertyPtr::EditHandlePtr returnValue( 
    1039         new  SFUnrecFieldContainerChildGeoIntegralPropertyPtr::EditHandle( 
     1038    SFUnrecChildGeoIntegralPropertyPtr::EditHandlePtr returnValue( 
     1039        new  SFUnrecChildGeoIntegralPropertyPtr::EditHandle( 
    10401040             &_sfTypes,  
    10411041             this->getType().getFieldDesc(TypesFieldId))); 
    …… 
    10511051GetFieldHandlePtr GeometryBase::getHandleLengths         (void) const 
    10521052{ 
    1053     SFUnrecFieldContainerChildGeoIntegralPropertyPtr::GetHandlePtr returnValue( 
    1054         new  SFUnrecFieldContainerChildGeoIntegralPropertyPtr::GetHandle( 
     1053    SFUnrecChildGeoIntegralPropertyPtr::GetHandlePtr returnValue( 
     1054        new  SFUnrecChildGeoIntegralPropertyPtr::GetHandle( 
    10551055             &_sfLengths,  
    10561056             this->getType().getFieldDesc(LengthsFieldId))); 
    …… 
    10611061EditFieldHandlePtr GeometryBase::editHandleLengths        (void) 
    10621062{ 
    1063     SFUnrecFieldContainerChildGeoIntegralPropertyPtr::EditHandlePtr returnValue( 
    1064         new  SFUnrecFieldContainerChildGeoIntegralPropertyPtr::EditHandle( 
     1063    SFUnrecChildGeoIntegralPropertyPtr::EditHandlePtr returnValue( 
     1064        new  SFUnrecChildGeoIntegralPropertyPtr::EditHandle( 
    10651065             &_sfLengths,  
    10661066             this->getType().getFieldDesc(LengthsFieldId))); 
    …… 
    10761076GetFieldHandlePtr GeometryBase::getHandleProperties      (void) const 
    10771077{ 
    1078     MFUnrecFieldContainerChildGeoVectorPropertyPtr::GetHandlePtr returnValue( 
    1079         new  MFUnrecFieldContainerChildGeoVectorPropertyPtr::GetHandle( 
     1078    MFUnrecChildGeoVectorPropertyPtr::GetHandlePtr returnValue( 
     1079        new  MFUnrecChildGeoVectorPropertyPtr::GetHandle( 
    10801080             &_mfProperties,  
    10811081             this->getType().getFieldDesc(PropertiesFieldId))); 
    …… 
    10861086EditFieldHandlePtr GeometryBase::editHandleProperties     (void) 
    10871087{ 
    1088     MFUnrecFieldContainerChildGeoVectorPropertyPtr::EditHandlePtr returnValue( 
    1089         new  MFUnrecFieldContainerChildGeoVectorPropertyPtr::EditHandle( 
     1088    MFUnrecChildGeoVectorPropertyPtr::EditHandlePtr returnValue( 
     1089        new  MFUnrecChildGeoVectorPropertyPtr::EditHandle( 
    10901090             &_mfProperties,  
    10911091             this->getType().getFieldDesc(PropertiesFieldId))); 
    …… 
    11011101GetFieldHandlePtr GeometryBase::getHandlePropIndices     (void) const 
    11021102{ 
    1103     MFUnrecFieldContainerChildGeoIntegralPropertyPtr::GetHandlePtr returnValue( 
    1104         new  MFUnrecFieldContainerChildGeoIntegralPropertyPtr::GetHandle( 
     1103    MFUnrecChildGeoIntegralPropertyPtr::GetHandlePtr returnValue( 
     1104        new  MFUnrecChildGeoIntegralPropertyPtr::GetHandle( 
    11051105             &_mfPropIndices,  
    11061106             this->getType().getFieldDesc(PropIndicesFieldId))); 
    …… 
    11111111EditFieldHandlePtr GeometryBase::editHandlePropIndices    (void) 
    11121112{ 
    1113     MFUnrecFieldContainerChildGeoIntegralPropertyPtr::EditHandlePtr returnValue( 
    1114         new  MFUnrecFieldContainerChildGeoIntegralPropertyPtr::EditHandle( 
     1113    MFUnrecChildGeoIntegralPropertyPtr::EditHandlePtr returnValue( 
     1114        new  MFUnrecChildGeoIntegralPropertyPtr::EditHandle( 
    11151115             &_mfPropIndices,  
    11161116             this->getType().getFieldDesc(PropIndicesFieldId))); 
    …… 
    12171217OSG_FIELDTRAITS_GETTYPE(GeometryPtr) 
    12181218 
    1219 OSG_EXPORT_PTR_SFIELD_FULL(FieldContainerPtrSField,  
     1219OSG_EXPORT_PTR_SFIELD_FULL(PointerSField,  
    12201220                           GeometryPtr,  
    12211221                           0); 
    12221222 
    1223 OSG_EXPORT_PTR_MFIELD_FULL(FieldContainerPtrMField,  
     1223OSG_EXPORT_PTR_MFIELD_FULL(PointerMField,  
    12241224                           GeometryPtr,  
    12251225                           0);