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/Particles/OSGParticlesBase.cpp

    r1158 r1161  
    172172    oType.addInitialDesc(pDesc); 
    173173 
    174     pDesc = new SFUnrecFieldContainerChildGeoVectorPropertyPtr::Description( 
    175         SFUnrecFieldContainerChildGeoVectorPropertyPtr::getClassType(), 
     174    pDesc = new SFUnrecChildGeoVectorPropertyPtr::Description( 
     175        SFUnrecChildGeoVectorPropertyPtr::getClassType(), 
    176176        "positions", 
    177177        "The positions of the particles. This is the primary defining\n" 
     
    201201    oType.addInitialDesc(pDesc); 
    202202 
    203     pDesc = new SFUnrecFieldContainerChildGeoVectorPropertyPtr::Description( 
    204         SFUnrecFieldContainerChildGeoVectorPropertyPtr::getClassType(), 
     203    pDesc = new SFUnrecChildGeoVectorPropertyPtr::Description( 
     204        SFUnrecChildGeoVectorPropertyPtr::getClassType(), 
    205205        "secPositions", 
    206206        "The secondary position of the particle. This information is only used\n" 
     
    215215    oType.addInitialDesc(pDesc); 
    216216 
    217     pDesc = new SFUnrecFieldContainerChildGeoVectorPropertyPtr::Description( 
    218         SFUnrecFieldContainerChildGeoVectorPropertyPtr::getClassType(), 
     217    pDesc = new SFUnrecChildGeoVectorPropertyPtr::Description( 
     218        SFUnrecChildGeoVectorPropertyPtr::getClassType(), 
    219219        "colors", 
    220220        "The particle colors (optional).\n", 
     
    227227    oType.addInitialDesc(pDesc); 
    228228 
    229     pDesc = new SFUnrecFieldContainerChildGeoVectorPropertyPtr::Description( 
    230         SFUnrecFieldContainerChildGeoVectorPropertyPtr::getClassType(), 
     229    pDesc = new SFUnrecChildGeoVectorPropertyPtr::Description( 
     230        SFUnrecChildGeoVectorPropertyPtr::getClassType(), 
    231231        "normals", 
    232232        "Most particles will be automatically aligned to the view\n" 
     
    549549 
    550550//! Get the Particles::_sfPositions field. 
    551 const SFUnrecFieldContainerChildGeoVectorPropertyPtr *ParticlesBase::getSFPositions(void) const 
     551const SFUnrecChildGeoVectorPropertyPtr *ParticlesBase::getSFPositions(void) const 
    552552{ 
    553553    return &_sfPositions; 
     
    574574 
    575575//! Get the Particles::_sfSecPositions field. 
    576 const SFUnrecFieldContainerChildGeoVectorPropertyPtr *ParticlesBase::getSFSecPositions(void) const 
     576const SFUnrecChildGeoVectorPropertyPtr *ParticlesBase::getSFSecPositions(void) const 
    577577{ 
    578578    return &_sfSecPositions; 
     
    580580 
    581581//! Get the Particles::_sfColors field. 
    582 const SFUnrecFieldContainerChildGeoVectorPropertyPtr *ParticlesBase::getSFColors(void) const 
     582const SFUnrecChildGeoVectorPropertyPtr *ParticlesBase::getSFColors(void) const 
    583583{ 
    584584    return &_sfColors; 
     
    586586 
    587587//! Get the Particles::_sfNormals field. 
    588 const SFUnrecFieldContainerChildGeoVectorPropertyPtr *ParticlesBase::getSFNormals(void) const 
     588const SFUnrecChildGeoVectorPropertyPtr *ParticlesBase::getSFNormals(void) const 
    589589{ 
    590590    return &_sfNormals; 
     
    12081208GetFieldHandlePtr ParticlesBase::getHandlePositions       (void) const 
    12091209{ 
    1210     SFUnrecFieldContainerChildGeoVectorPropertyPtr::GetHandlePtr returnValue( 
    1211         new  SFUnrecFieldContainerChildGeoVectorPropertyPtr::GetHandle( 
     1210    SFUnrecChildGeoVectorPropertyPtr::GetHandlePtr returnValue( 
     1211        new  SFUnrecChildGeoVectorPropertyPtr::GetHandle( 
    12121212             &_sfPositions,  
    12131213             this->getType().getFieldDesc(PositionsFieldId))); 
     
    12181218EditFieldHandlePtr ParticlesBase::editHandlePositions      (void) 
    12191219{ 
    1220     SFUnrecFieldContainerChildGeoVectorPropertyPtr::EditHandlePtr returnValue( 
    1221         new  SFUnrecFieldContainerChildGeoVectorPropertyPtr::EditHandle( 
     1220    SFUnrecChildGeoVectorPropertyPtr::EditHandlePtr returnValue( 
     1221        new  SFUnrecChildGeoVectorPropertyPtr::EditHandle( 
    12221222             &_sfPositions,  
    12231223             this->getType().getFieldDesc(PositionsFieldId))); 
     
    12551255GetFieldHandlePtr ParticlesBase::getHandleSecPositions    (void) const 
    12561256{ 
    1257     SFUnrecFieldContainerChildGeoVectorPropertyPtr::GetHandlePtr returnValue( 
    1258         new  SFUnrecFieldContainerChildGeoVectorPropertyPtr::GetHandle( 
     1257    SFUnrecChildGeoVectorPropertyPtr::GetHandlePtr returnValue( 
     1258        new  SFUnrecChildGeoVectorPropertyPtr::GetHandle( 
    12591259             &_sfSecPositions,  
    12601260             this->getType().getFieldDesc(SecPositionsFieldId))); 
     
    12651265EditFieldHandlePtr ParticlesBase::editHandleSecPositions   (void) 
    12661266{ 
    1267     SFUnrecFieldContainerChildGeoVectorPropertyPtr::EditHandlePtr returnValue( 
    1268         new  SFUnrecFieldContainerChildGeoVectorPropertyPtr::EditHandle( 
     1267    SFUnrecChildGeoVectorPropertyPtr::EditHandlePtr returnValue( 
     1268        new  SFUnrecChildGeoVectorPropertyPtr::EditHandle( 
    12691269             &_sfSecPositions,  
    12701270             this->getType().getFieldDesc(SecPositionsFieldId))); 
     
    12801280GetFieldHandlePtr ParticlesBase::getHandleColors          (void) const 
    12811281{ 
    1282     SFUnrecFieldContainerChildGeoVectorPropertyPtr::GetHandlePtr returnValue( 
    1283         new  SFUnrecFieldContainerChildGeoVectorPropertyPtr::GetHandle( 
     1282    SFUnrecChildGeoVectorPropertyPtr::GetHandlePtr returnValue( 
     1283        new  SFUnrecChildGeoVectorPropertyPtr::GetHandle( 
    12841284             &_sfColors,  
    12851285             this->getType().getFieldDesc(ColorsFieldId))); 
     
    12901290EditFieldHandlePtr ParticlesBase::editHandleColors         (void) 
    12911291{ 
    1292     SFUnrecFieldContainerChildGeoVectorPropertyPtr::EditHandlePtr returnValue( 
    1293         new  SFUnrecFieldContainerChildGeoVectorPropertyPtr::EditHandle( 
     1292    SFUnrecChildGeoVectorPropertyPtr::EditHandlePtr returnValue( 
     1293        new  SFUnrecChildGeoVectorPropertyPtr::EditHandle( 
    12941294             &_sfColors,  
    12951295             this->getType().getFieldDesc(ColorsFieldId))); 
     
    13051305GetFieldHandlePtr ParticlesBase::getHandleNormals         (void) const 
    13061306{ 
    1307     SFUnrecFieldContainerChildGeoVectorPropertyPtr::GetHandlePtr returnValue( 
    1308         new  SFUnrecFieldContainerChildGeoVectorPropertyPtr::GetHandle( 
     1307    SFUnrecChildGeoVectorPropertyPtr::GetHandlePtr returnValue( 
     1308        new  SFUnrecChildGeoVectorPropertyPtr::GetHandle( 
    13091309             &_sfNormals,  
    13101310             this->getType().getFieldDesc(NormalsFieldId))); 
     
    13151315EditFieldHandlePtr ParticlesBase::editHandleNormals        (void) 
    13161316{ 
    1317     SFUnrecFieldContainerChildGeoVectorPropertyPtr::EditHandlePtr returnValue( 
    1318         new  SFUnrecFieldContainerChildGeoVectorPropertyPtr::EditHandle( 
     1317    SFUnrecChildGeoVectorPropertyPtr::EditHandlePtr returnValue( 
     1318        new  SFUnrecChildGeoVectorPropertyPtr::EditHandle( 
    13191319             &_sfNormals,  
    13201320             this->getType().getFieldDesc(NormalsFieldId))); 
     
    15501550OSG_FIELDTRAITS_GETTYPE(ParticlesPtr) 
    15511551 
    1552 OSG_EXPORT_PTR_SFIELD_FULL(FieldContainerPtrSField,  
     1552OSG_EXPORT_PTR_SFIELD_FULL(PointerSField,  
    15531553                           ParticlesPtr,  
    15541554                           0); 
    15551555 
    1556 OSG_EXPORT_PTR_MFIELD_FULL(FieldContainerPtrMField,  
     1556OSG_EXPORT_PTR_MFIELD_FULL(PointerMField,  
    15571557                           ParticlesPtr,  
    15581558                           0);