Show
Ignore:
Timestamp:
11/14/07 17:11:26 (1 year ago)
Author:
cneumann
Message:

changed: started to use new pointer fields
added: ReferenceCountPointer? template
removed: EditHandle? for parent pointer fields

NOTE: Does not compile yet.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/Carsten_PtrWork2/Source/Contrib/Manipulators/OSGMoveManipulatorBase.cpp

    r862 r1016  
    5757#include <cstdio> 
    5858#include <boost/assign/list_of.hpp> 
     59#include <boost/bind.hpp> 
    5960 
    6061#include <OSGConfig.h> 
    …… 
    6667#include "OSGMoveManipulator.h" 
    6768 
    68 #include "boost/bind.hpp" 
    6969 
    7070OSG_BEGIN_NAMESPACE 
    …… 
    8484    "NULL", 
    8585    0, 
    86     (PrototypeCreateF) &MoveManipulatorBase::createEmpty, 
     86    (ProtoContainerCreateF) &MoveManipulatorBase::createEmpty, 
    8787    MoveManipulator::initMethod, 
    8888    NULL, 
    …… 
    109109/*------------------------------ get -----------------------------------*/ 
    110110 
    111 FieldContainerType &MoveManipulatorBase::getType(void) 
     111FieldContainerType & 
     112MoveManipulatorBase::getType(void) 
    112113{ 
    113114    return _type; 
    114115} 
    115116 
    116 const FieldContainerType &MoveManipulatorBase::getType(void) const 
     117FieldContainerType const & 
     118MoveManipulatorBase::getType(void) const 
    117119{ 
    118120    return _type; 
    119121} 
    120122 
    121 UInt32 MoveManipulatorBase::getContainerSize(void) const 
     123UInt32 
     124MoveManipulatorBase::getContainerSize(void) const 
    122125{ 
    123126    return sizeof(MoveManipulator); 
    124127} 
    125128 
    126 /*------------------------- decorator get ------------------------------*/ 
    127  
    128  
    129  
    130  
     129     
    131130 
    132131 
    …… 
    248247 
    249248#if !defined(OSG_DO_DOC) || defined(OSG_DOC_DEV) 
    250 DataType FieldTraits<MoveManipulatorPtr>::_type("MoveManipulatorPtr", "ManipulatorPtr"); 
     249DataType FieldTraits<MoveManipulatorInternalRefPtr>::_type( 
     250    "MoveManipulatorInternalRefPtr", 
     251    "ManipulatorInternalRefPtr"); 
     252DataType FieldTraits<MoveManipulatorWeakRefPtr>::_type( 
     253    "MoveManipulatorWeakRefPtr", 
     254    "ManipulatorWeakRefPtr"); 
     255DataType FieldTraits<MoveManipulatorParentPtr>::_type( 
     256    "MoveManipulatorParentPtr", 
     257    "ManipulatorParentPtr"); 
    251258#endif 
    252259