Show
Ignore:
Timestamp:
05/05/08 06:58:23 (2 months ago)
Author:
vossg
Message:

changed: base rebuild interface clean up (removal ptr typedef / NullFC)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Source/System/Material/Simple/OSGSimpleTexturedMaterialBase.cpp

    r1193 r1197  
    100100\***************************************************************************/ 
    101101 
    102 /*! \var ImagePtr        SimpleTexturedMaterialBase::_sfImage 
     102/*! \var Image *         SimpleTexturedMaterialBase::_sfImage 
    103103    Defines the texture image. 
    104104*/ 
    …… 
    510510    SimpleTexturedMaterialTransitPtr fc; 
    511511 
    512     if(getClassType().getPrototype() != NullFC) 
     512    if(getClassType().getPrototype() != NULL) 
    513513    { 
    514514        FieldContainerTransitPtr tmpPtr = 
    …… 
    526526    SimpleTexturedMaterialTransitPtr fc; 
    527527 
    528     if(getClassType().getPrototype() != NullFC) 
     528    if(getClassType().getPrototype() != NULL) 
    529529    { 
    530530        FieldContainerTransitPtr tmpPtr = 
    …… 
    538538 
    539539//! create an empty new instance of the class, do not copy the prototype 
    540 SimpleTexturedMaterialPtr SimpleTexturedMaterialBase::createEmpty(void) 
    541 { 
    542     SimpleTexturedMaterialPtr returnValue; 
     540SimpleTexturedMaterial *SimpleTexturedMaterialBase::createEmpty(void) 
     541{ 
     542    SimpleTexturedMaterial *returnValue; 
    543543 
    544544    newPtr<SimpleTexturedMaterial>(returnValue, Thread::getCurrentLocalFlags()); 
    …… 
    550550} 
    551551 
    552 SimpleTexturedMaterialPtr SimpleTexturedMaterialBase::createEmptyLocal(BitVector bFlags) 
    553 { 
    554     SimpleTexturedMaterialPtr returnValue; 
     552SimpleTexturedMaterial *SimpleTexturedMaterialBase::createEmptyLocal(BitVector bFlags) 
     553{ 
     554    SimpleTexturedMaterial *returnValue; 
    555555 
    556556    newPtr<SimpleTexturedMaterial>(returnValue, bFlags); 
    …… 
    563563FieldContainerTransitPtr SimpleTexturedMaterialBase::shallowCopy(void) const 
    564564{ 
    565     SimpleTexturedMaterialPtr tmpPtr; 
     565    SimpleTexturedMaterial *tmpPtr; 
    566566 
    567567    newPtr(tmpPtr,  
    …… 
    579579    BitVector bFlags) const 
    580580{ 
    581     SimpleTexturedMaterialPtr tmpPtr; 
     581    SimpleTexturedMaterial *tmpPtr; 
    582582 
    583583    newPtr(tmpPtr, dynamic_cast<const SimpleTexturedMaterial *>(this), bFlags); 
    …… 
    596596SimpleTexturedMaterialBase::SimpleTexturedMaterialBase(void) : 
    597597    Inherited(), 
    598     _sfImage                  (NullFC), 
     598    _sfImage                  (NULL), 
    599599    _sfMinFilter              (GLenum(GL_LINEAR_MIPMAP_LINEAR)), 
    600600    _sfMagFilter              (GLenum(GL_LINEAR)), 
    …… 
    606606SimpleTexturedMaterialBase::SimpleTexturedMaterialBase(const SimpleTexturedMaterialBase &source) : 
    607607    Inherited(source), 
    608     _sfImage                  (NullFC), 
     608    _sfImage                  (NULL), 
    609609    _sfMinFilter              (source._sfMinFilter              ), 
    610610    _sfMagFilter              (source._sfMagFilter              ), 
    …… 
    764764 
    765765#ifdef OSG_MT_CPTR_ASPECT 
    766 FieldContainerPtr SimpleTexturedMaterialBase::createAspectCopy(void) const 
    767 { 
    768     SimpleTexturedMaterialPtr returnValue; 
     766FieldContainer *SimpleTexturedMaterialBase::createAspectCopy(void) const 
     767{ 
     768    SimpleTexturedMaterial *returnValue; 
    769769 
    770770    newAspectCopy(returnValue, 
    …… 
    779779    Inherited::resolveLinks(); 
    780780 
    781     static_cast<SimpleTexturedMaterial *>(this)->setImage(NullFC); 
     781    static_cast<SimpleTexturedMaterial *>(this)->setImage(NULL); 
    782782 
    783783 
    …… 
    786786 
    787787#if !defined(OSG_DO_DOC) || defined(OSG_DOC_DEV) 
    788 DataType FieldTraits<SimpleTexturedMaterialPtr>::_type("SimpleTexturedMaterialPtr", "SimpleMaterialPtr"); 
     788DataType FieldTraits<SimpleTexturedMaterial *>::_type("SimpleTexturedMaterialPtr", "SimpleMaterialPtr"); 
    789789#endif 
    790790 
    791 OSG_FIELDTRAITS_GETTYPE(SimpleTexturedMaterialPtr) 
     791OSG_FIELDTRAITS_GETTYPE(SimpleTexturedMaterial *) 
    792792 
    793793OSG_EXPORT_PTR_SFIELD_FULL(PointerSField,  
    794                            SimpleTexturedMaterialPtr,  
     794                           SimpleTexturedMaterial *,  
    795795                           0); 
    796796 
    797797OSG_EXPORT_PTR_MFIELD_FULL(PointerMField,  
    798                            SimpleTexturedMaterialPtr,  
     798                           SimpleTexturedMaterial *,  
    799799                           0); 
    800800