Show
Ignore:
Timestamp:
04/06/07 00:00:32 (2 years ago)
Author:
vossg
Message:

fixed : improved multi aspect value field deletion

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/mixin-collappse/Source/System/NodeCores/Drawables/Terrain/QuadTree/OSGQuadTreeTerrainBase.cpp

    r658 r660  
    21032103#endif 
    21042104 
    2105 void QuadTreeTerrainBase::resolveLinks(UInt32             uiCurrentAspect, 
    2106                                      AspectOffsetStore &oOffsets) 
    2107 { 
    2108     Inherited::resolveLinks(uiCurrentAspect, oOffsets); 
     2105void QuadTreeTerrainBase::resolveLinks(void) 
     2106{ 
     2107    Inherited::resolveLinks(); 
    21092108 
    21102109    static_cast<QuadTreeTerrain *>(this)->setHeightData(NullFC); 
    …… 
    21122111    static_cast<QuadTreeTerrain *>(this)->setHeightVertices(NullFC); 
    21132112 
    2114     _mfHeightError.terminateShare(uiCurrentAspect, oOffsets); 
    2115  
    2116     _mfHeightQuad.terminateShare(uiCurrentAspect, oOffsets); 
     2113#ifdef OSG_MT_CPTR_ASPECT 
     2114    AspectOffsetStore oOffsets; 
     2115 
     2116    _pAspectStore->fillOffsetArray(oOffsets, this); 
     2117#endif 
     2118 
     2119 
     2120#ifdef OSG_MT_CPTR_ASPECT 
     2121    _mfHeightError.terminateShare(Thread::getCurrentAspect(),  
     2122                                      oOffsets); 
     2123#endif 
     2124 
     2125#ifdef OSG_MT_CPTR_ASPECT 
     2126    _mfHeightQuad.terminateShare(Thread::getCurrentAspect(),  
     2127                                      oOffsets); 
     2128#endif 
    21172129} 
    21182130