Show
Ignore:
Timestamp:
10/04/07 19:11:34 (1 year ago)
Author:
cneumann
Message:

Work in progress commit.

NOTE: it does NOT compile at this point.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/Carsten_PtrWork/Source/System/Action/RenderTraversal/OSGScreenLODBase.cpp

    r864 r965  
    110110        false, 
    111111        Field::MFDefaultFlags, 
    112         static_cast<FieldEditMethodSig>(&ScreenLODBase::editHandleCoverageOverride), 
    113         static_cast<FieldGetMethodSig >(&ScreenLODBase::getHandleCoverageOverride)); 
     112        static_cast<FieldEditMethodSig>(&ScreenLODBase::invalidEditField), 
     113        static_cast<FieldGetMethodSig >(&ScreenLODBase::invalidGetField)); 
    114114 
    115115    oType.addInitialDesc(pDesc); 
    …… 
    180180} 
    181181 
    182 /*------------------------- decorator get ------------------------------*/ 
    183  
    184  
    185 MFReal32 *ScreenLODBase::editMFCoverageOverride(void) 
     182     
     183/*-------------------------------------------------------------------------*/ 
     184/* Field MFCoverageOverride                                                */ 
     185 
     186void 
     187ScreenLODBase::addCoverageOverride(Real32 const &value) 
    186188{ 
    187189    editMField(CoverageOverrideFieldMask, _mfCoverageOverride); 
    188  
    189     return &_mfCoverageOverride; 
    190 } 
    191  
    192 const MFReal32 *ScreenLODBase::getMFCoverageOverride(void) const 
    193 { 
    194     return &_mfCoverageOverride; 
    195 } 
    196  
    197 #ifdef OSG_1_GET_COMPAT 
    198 MFReal32            *ScreenLODBase::getMFCoverageOverride(void) 
    199 { 
    200     return this->editMFCoverageOverride(); 
    201 } 
    202 #endif 
    203  
    204  
    205  
    206 /*********************************** Non-ptr code ********************************/ 
    207 void ScreenLODBase::pushToCoverageOverride(const Real32& value) 
     190    _mfCoverageOverride.push_back(Real32(value)); 
     191} 
     192 
     193void  
     194ScreenLODBase::assignCoverageOverride( 
     195    MFReal32 const &value) 
     196{ 
     197    _mfCoverageOverride = value; 
     198} 
     199void 
     200ScreenLODBase::insertCoverageOverride( 
     201    UInt32 const uiIndex, 
     202    Real32 const &value) 
    208203{ 
    209204    editMField(CoverageOverrideFieldMask, _mfCoverageOverride); 
    210     _mfCoverageOverride.push_back(value); 
    211 } 
    212  
    213 void ScreenLODBase::insertIntoCoverageOverride(UInt32                uiIndex, 
    214                                                    const Real32& value   ) 
    215 { 
    216     editMField(CoverageOverrideFieldMask, _mfCoverageOverride); 
    217205 
    218206    MFReal32::iterator fieldIt = _mfCoverageOverride.begin(); 
    …… 
    220208    fieldIt += uiIndex; 
    221209 
    222     _mfCoverageOverride.insert(fieldIt, value); 
    223 } 
    224  
    225 void ScreenLODBase::replaceInCoverageOverride(UInt32                uiIndex, 
    226                                                        const Real32& value   ) 
     210    _mfCoverageOverride.insert(fieldIt, Real32(value)); 
     211} 
     212 
     213void 
     214ScreenLODBase::replaceCoverageOverride( 
     215    UInt32 const uiIndex,  
     216    Real32 const &value) 
    227217{ 
    228218    if(uiIndex >= _mfCoverageOverride.size()) 
    …… 
    234224} 
    235225 
    236 void ScreenLODBase::replaceInCoverageOverride(const Real32& pOldElem, 
    237                                                         const Real32& pNewElem) 
    238 { 
    239     Int32  elemIdx = _mfCoverageOverride.findIndex(pOldElem); 
     226void 
     227ScreenLODBase::replaceCoverageOverride( 
     228    Real32 const &pOldElem, 
     229    Real32 const &pNewElem ) 
     230{ 
     231    Int32  elemIdx = _mfCoverageOverride.findIndex(Real32(pOldElem)); 
    240232 
    241233    if(elemIdx != -1) 
    …… 
    251243} 
    252244 
    253 void ScreenLODBase::removeFromCoverageOverride(UInt32 uiIndex) 
     245void 
     246ScreenLODBase::subCoverageOverride(UInt32 const uiIndex) 
    254247{ 
    255248    if(uiIndex < _mfCoverageOverride.size()) 
    …… 
    264257} 
    265258 
    266 void ScreenLODBase::removeFromCoverageOverride(const Real32& value) 
    267 { 
    268     Int32 iElemIdx = _mfCoverageOverride.findIndex(value); 
     259void 
     260ScreenLODBase::subCoverageOverride(Real32 const &value) 
     261{ 
     262    Int32 iElemIdx = _mfCoverageOverride.findIndex(Real32(value)); 
    269263 
    270264    if(iElemIdx != -1) 
    …… 
    280274} 
    281275 
    282 void ScreenLODBase::clearCoverageOverride(void) 
     276void 
     277ScreenLODBase::clearCoverageOverride(void) 
    283278{ 
    284279    editMField(CoverageOverrideFieldMask, _mfCoverageOverride); 
    …… 
    286281    _mfCoverageOverride.clear(); 
    287282} 
     283 
    288284 
    289285 
    …… 
    390386    return returnValue; 
    391387} 
    392  
    393388EditFieldHandlePtr ScreenLODBase::editHandleCoverageOverride(void) 
    394389{