Show
Ignore:
Timestamp:
04/15/08 04:48:53 (6 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/WS/OSGGeometryBase.cpp

    r1158 r1161  
    125125 
    126126 
    127     pDesc = new SFUnrecFieldContainerChildGeoIntegralPropertyPtr::Description( 
    128         SFUnrecFieldContainerChildGeoIntegralPropertyPtr::getClassType(), 
     127    pDesc = new SFUnrecChildGeoIntegralPropertyPtr::Description( 
     128        SFUnrecChildGeoIntegralPropertyPtr::getClassType(), 
    129129        "types", 
    130130        "The types property contains the primitive's types. Legal values are \n" 
    …… 
    139139    oType.addInitialDesc(pDesc); 
    140140 
    141     pDesc = new SFUnrecFieldContainerChildGeoIntegralPropertyPtr::Description( 
    142         SFUnrecFieldContainerChildGeoIntegralPropertyPtr::getClassType(), 
     141    pDesc = new SFUnrecChildGeoIntegralPropertyPtr::Description( 
     142        SFUnrecChildGeoIntegralPropertyPtr::getClassType(), 
    143143        "lengths", 
    144144        "The lengths property contains the number of vertices to use for the \n" 
    …… 
    152152    oType.addInitialDesc(pDesc); 
    153153 
    154     pDesc = new MFUnrecFieldContainerChildGeoVectorPropertyPtr::Description( 
    155         MFUnrecFieldContainerChildGeoVectorPropertyPtr::getClassType(), 
     154    pDesc = new MFUnrecChildGeoVectorPropertyPtr::Description( 
     155        MFUnrecChildGeoVectorPropertyPtr::getClassType(), 
    156156        "properties", 
    157157        "The attributes used to render the geometry. The order is based on the \n" 
    …… 
    165165    oType.addInitialDesc(pDesc); 
    166166 
    167     pDesc = new MFUnrecFieldContainerChildGeoIntegralPropertyPtr::Description( 
    168         MFUnrecFieldContainerChildGeoIntegralPropertyPtr::getClassType(), 
     167    pDesc = new MFUnrecChildGeoIntegralPropertyPtr::Description( 
     168        MFUnrecChildGeoIntegralPropertyPtr::getClassType(), 
    169169        "propIndices", 
    170170        "The indices property contains the index data. See \\ref \n" 
    …… 
    351351 
    352352//! Get the Geometry::_sfTypes field. 
    353 const SFUnrecFieldContainerChildGeoIntegralPropertyPtr *GeometryBase::getSFTypes(void) const 
     353const SFUnrecChildGeoIntegralPropertyPtr *GeometryBase::getSFTypes(void) const 
    354354{ 
    355355    return &_sfTypes; 
    …… 
    357357 
    358358//! Get the Geometry::_sfLengths field. 
    359 const SFUnrecFieldContainerChildGeoIntegralPropertyPtr *GeometryBase::getSFLengths(void) const 
     359const SFUnrecChildGeoIntegralPropertyPtr *GeometryBase::getSFLengths(void) const 
    360360{ 
    361361    return &_sfLengths; 
    …… 
    363363 
    364364//! Get the Geometry::_mfProperties field. 
    365 const MFUnrecFieldContainerChildGeoVectorPropertyPtr *GeometryBase::getMFProperties(void) const 
     365const MFUnrecChildGeoVectorPropertyPtr *GeometryBase::getMFProperties(void) const 
    366366{ 
    367367    return &_mfProperties; 
    …… 
    369369 
    370370//! Get the Geometry::_mfPropIndices field. 
    371 const MFUnrecFieldContainerChildGeoIntegralPropertyPtr *GeometryBase::getMFPropIndices(void) const 
     371const MFUnrecChildGeoIntegralPropertyPtr *GeometryBase::getMFPropIndices(void) const 
    372372{ 
    373373    return &_mfPropIndices; 
    …… 
    445445} 
    446446 
    447 void GeometryBase::assignProperties(const MFUnrecFieldContainerChildGeoVectorPropertyPtr &value) 
    448 { 
    449     MFUnrecFieldContainerChildGeoVectorPropertyPtr::const_iterator elemIt  = 
     447void GeometryBase::assignProperties(const MFUnrecChildGeoVectorPropertyPtr &value) 
     448{ 
     449    MFUnrecChildGeoVectorPropertyPtr::const_iterator elemIt  = 
    450450        value.begin(); 
    451     MFUnrecFieldContainerChildGeoVectorPropertyPtr::const_iterator elemEnd = 
     451    MFUnrecChildGeoVectorPropertyPtr::const_iterator elemEnd = 
    452452        value.end  (); 
    453453 
    …… 
    467467    editMField(PropertiesFieldMask, _mfProperties); 
    468468 
    469     MFUnrecFieldContainerChildGeoVectorPropertyPtr::iterator fieldIt = _mfProperties.begin_nc(); 
     469    MFUnrecChildGeoVectorPropertyPtr::iterator fieldIt = _mfProperties.begin_nc(); 
    470470 
    471471    //addRef(value); 
    …… 
    525525        editMField(PropertiesFieldMask, _mfProperties); 
    526526 
    527         MFUnrecFieldContainerChildGeoVectorPropertyPtr::iterator fieldIt = _mfProperties.begin_nc(); 
     527        MFUnrecChildGeoVectorPropertyPtr::iterator fieldIt = _mfProperties.begin_nc(); 
    528528 
    529529        fieldIt += uiIndex; 
    …… 
    543543        editMField(PropertiesFieldMask, _mfProperties); 
    544544 
    545         MFUnrecFieldContainerChildGeoVectorPropertyPtr::iterator fieldIt = _mfProperties.begin_nc(); 
     545        MFUnrecChildGeoVectorPropertyPtr::iterator fieldIt = _mfProperties.begin_nc(); 
    546546 
    547547        fieldIt += iElemIdx; 
    …… 
    572572} 
    573573 
    574 void GeometryBase::assignPropIndices(const MFUnrecFieldContainerChildGeoIntegralPropertyPtr &value) 
    575 { 
    576     MFUnrecFieldContainerChildGeoIntegralPropertyPtr::const_iterator elemIt  = 
     574void GeometryBase::assignPropIndices(const MFUnrecChildGeoIntegralPropertyPtr &value) 
     575{ 
     576    MFUnrecChildGeoIntegralPropertyPtr::const_iterator elemIt  = 
    577577        value.begin(); 
    578     MFUnrecFieldContainerChildGeoIntegralPropertyPtr::const_iterator elemEnd = 
     578    MFUnrecChildGeoIntegralPropertyPtr::const_iterator elemEnd = 
    579579        value.end  (); 
    580580 
    …… 
    594594    editMField(PropIndicesFieldMask, _mfPropIndices); 
    595595 
    596     MFUnrecFieldContainerChildGeoIntegralPropertyPtr::iterator fieldIt = _mfPropIndices.begin_nc(); 
     596    MFUnrecChildGeoIntegralPropertyPtr::iterator fieldIt = _mfPropIndices.begin_nc(); 
    597597 
    598598    //addRef(value); 
    …… 
    652652        editMField(PropIndicesFieldMask, _mfPropIndices); 
    653653 
    654         MFUnrecFieldContainerChildGeoIntegralPropertyPtr::iterator fieldIt = _mfPropIndices.begin_nc(); 
     654        MFUnrecChildGeoIntegralPropertyPtr::iterator fieldIt = _mfPropIndices.begin_nc(); 
    655655 
    656656        fieldIt += uiIndex; 
    …… 
    670670        editMField(PropIndicesFieldMask, _mfPropIndices); 
    671671 
    672         MFUnrecFieldContainerChildGeoIntegralPropertyPtr::iterator fieldIt = _mfPropIndices.begin_nc(); 
     672        MFUnrecChildGeoIntegralPropertyPtr::iterator fieldIt = _mfPropIndices.begin_nc(); 
    673673 
    674674        fieldIt += iElemIdx; 
    …… 
    997997        if(pTypedChild != NullFC) 
    998998        { 
    999             MFUnrecFieldContainerChildGeoVectorPropertyPtr::iterator pI = 
     999            MFUnrecChildGeoVectorPropertyPtr::iterator pI = 
    10001000                _mfProperties.find_nc(pTypedChild); 
    10011001                 
    …… 
    10251025        if(pTypedChild != NullFC) 
    10261026        { 
    1027             MFUnrecFieldContainerChildGeoIntegralPropertyPtr::iterator pI = 
     1027            MFUnrecChildGeoIntegralPropertyPtr::iterator pI = 
    10281028                _mfPropIndices.find_nc(pTypedChild); 
    10291029                 
    …… 
    10611061        this->setLengths(source->getLengths()); 
    10621062 
    1063         MFUnrecFieldContainerChildGeoVectorPropertyPtr::const_iterator PropertiesIt  = 
     1063        MFUnrecChildGeoVectorPropertyPtr::const_iterator PropertiesIt  = 
    10641064            source->_mfProperties.begin(); 
    1065         MFUnrecFieldContainerChildGeoVectorPropertyPtr::const_iterator PropertiesEnd = 
     1065        MFUnrecChildGeoVectorPropertyPtr::const_iterator PropertiesEnd = 
    10661066            source->_mfProperties.end  (); 
    10671067 
    …… 
    10731073        } 
    10741074 
    1075         MFUnrecFieldContainerChildGeoIntegralPropertyPtr::const_iterator PropIndicesIt  = 
     1075        MFUnrecChildGeoIntegralPropertyPtr::const_iterator PropIndicesIt  = 
    10761076            source->_mfPropIndices.begin(); 
    1077         MFUnrecFieldContainerChildGeoIntegralPropertyPtr::const_iterator PropIndicesEnd = 
     1077        MFUnrecChildGeoIntegralPropertyPtr::const_iterator PropIndicesEnd = 
    10781078            source->_mfPropIndices.end  (); 
    10791079 
    …… 
    10891089GetFieldHandlePtr GeometryBase::getHandleTypes           (void) const 
    10901090{ 
    1091     SFUnrecFieldContainerChildGeoIntegralPropertyPtr::GetHandlePtr returnValue( 
    1092         new  SFUnrecFieldContainerChildGeoIntegralPropertyPtr::GetHandle( 
     1091    SFUnrecChildGeoIntegralPropertyPtr::GetHandlePtr returnValue( 
     1092        new  SFUnrecChildGeoIntegralPropertyPtr::GetHandle( 
    10931093             &_sfTypes,  
    10941094             this->getType().getFieldDesc(TypesFieldId))); 
    …… 
    10991099EditFieldHandlePtr GeometryBase::editHandleTypes          (void) 
    11001100{ 
    1101     SFUnrecFieldContainerChildGeoIntegralPropertyPtr::EditHandlePtr returnValue( 
    1102         new  SFUnrecFieldContainerChildGeoIntegralPropertyPtr::EditHandle( 
     1101    SFUnrecChildGeoIntegralPropertyPtr::EditHandlePtr returnValue( 
     1102        new  SFUnrecChildGeoIntegralPropertyPtr::EditHandle( 
    11031103             &_sfTypes,  
    11041104             this->getType().getFieldDesc(TypesFieldId))); 
    …… 
    11141114GetFieldHandlePtr GeometryBase::getHandleLengths         (void) const 
    11151115{ 
    1116     SFUnrecFieldContainerChildGeoIntegralPropertyPtr::GetHandlePtr returnValue( 
    1117         new  SFUnrecFieldContainerChildGeoIntegralPropertyPtr::GetHandle( 
     1116    SFUnrecChildGeoIntegralPropertyPtr::GetHandlePtr returnValue( 
     1117        new  SFUnrecChildGeoIntegralPropertyPtr::GetHandle( 
    11181118             &_sfLengths,  
    11191119             this->getType().getFieldDesc(LengthsFieldId))); 
    …… 
    11241124EditFieldHandlePtr GeometryBase::editHandleLengths        (void) 
    11251125{ 
    1126     SFUnrecFieldContainerChildGeoIntegralPropertyPtr::EditHandlePtr returnValue( 
    1127         new  SFUnrecFieldContainerChildGeoIntegralPropertyPtr::EditHandle( 
     1126    SFUnrecChildGeoIntegralPropertyPtr::EditHandlePtr returnValue( 
     1127        new  SFUnrecChildGeoIntegralPropertyPtr::EditHandle( 
    11281128             &_sfLengths,  
    11291129             this->getType().getFieldDesc(LengthsFieldId))); 
    …… 
    11391139GetFieldHandlePtr GeometryBase::getHandleProperties      (void) const 
    11401140{ 
    1141     MFUnrecFieldContainerChildGeoVectorPropertyPtr::GetHandlePtr returnValue( 
    1142         new  MFUnrecFieldContainerChildGeoVectorPropertyPtr::GetHandle( 
     1141    MFUnrecChildGeoVectorPropertyPtr::GetHandlePtr returnValue( 
     1142        new  MFUnrecChildGeoVectorPropertyPtr::GetHandle( 
    11431143             &_mfProperties,  
    11441144             this->getType().getFieldDesc(PropertiesFieldId))); 
    …… 
    11491149EditFieldHandlePtr GeometryBase::editHandleProperties     (void) 
    11501150{ 
    1151     MFUnrecFieldContainerChildGeoVectorPropertyPtr::EditHandlePtr returnValue( 
    1152         new  MFUnrecFieldContainerChildGeoVectorPropertyPtr::EditHandle( 
     1151    MFUnrecChildGeoVectorPropertyPtr::EditHandlePtr returnValue( 
     1152        new  MFUnrecChildGeoVectorPropertyPtr::EditHandle( 
    11531153             &_mfProperties,  
    11541154             this->getType().getFieldDesc(PropertiesFieldId))); 
    …… 
    11641164GetFieldHandlePtr GeometryBase::getHandlePropIndices     (void) const 
    11651165{ 
    1166     MFUnrecFieldContainerChildGeoIntegralPropertyPtr::GetHandlePtr returnValue( 
    1167         new  MFUnrecFieldContainerChildGeoIntegralPropertyPtr::GetHandle( 
     1166    MFUnrecChildGeoIntegralPropertyPtr::GetHandlePtr returnValue( 
     1167        new  MFUnrecChildGeoIntegralPropertyPtr::GetHandle( 
    11681168             &_mfPropIndices,  
    11691169             this->getType().getFieldDesc(PropIndicesFieldId))); 
    …… 
    11741174EditFieldHandlePtr GeometryBase::editHandlePropIndices    (void) 
    11751175{ 
    1176     MFUnrecFieldContainerChildGeoIntegralPropertyPtr::EditHandlePtr returnValue( 
    1177         new  MFUnrecFieldContainerChildGeoIntegralPropertyPtr::EditHandle( 
     1176    MFUnrecChildGeoIntegralPropertyPtr::EditHandlePtr returnValue( 
     1177        new  MFUnrecChildGeoIntegralPropertyPtr::EditHandle( 
    11781178             &_mfPropIndices,  
    11791179             this->getType().getFieldDesc(PropIndicesFieldId))); 
    …… 
    13021302OSG_FIELDTRAITS_GETTYPE(GeometryPtr) 
    13031303 
    1304 OSG_EXPORT_PTR_SFIELD_FULL(FieldContainerPtrSField,  
     1304OSG_EXPORT_PTR_SFIELD_FULL(PointerSField,  
    13051305                           GeometryPtr,  
    13061306                           0); 
    13071307 
    1308 OSG_EXPORT_PTR_MFIELD_FULL(FieldContainerPtrMField,  
     1308OSG_EXPORT_PTR_MFIELD_FULL(PointerMField,  
    13091309                           GeometryPtr,  
    13101310                           0);