Changeset 1039 for branches/Carsten_PtrWork2/Source/Contrib/Manipulators/OSGMoveManipulatorBase.h

Timestamp:

01/16/08 16:07:40 (11 months ago)

Author:

cneumann

Message:

changed: - factory functions return a TransitPtr? that can not be implicitly

converted to C Ptr. Should help with porting.

added: - GlobalRefPtr?, needed for cases where upon return from main

a RefPtr? goes out of scope (it would attempt to access the
FCFactory which is already shutdown at that point).

status: - vrml loader does not compile (needs porting to ref ptr)

• tutorials compile, run and exit cleanly
  
• multithreading and cluster are untested, yet
  

Files:

• branches/Carsten_PtrWork2/Source/Contrib/Manipulators/OSGMoveManipulatorBase.h (modified) (4 diffs)

branches/Carsten_PtrWork2/Source/Contrib/Manipulators/OSGMoveManipulatorBase.h

@@ -93 +93 @@
-
-    typedef MTRefCountPtrBuilder      <MoveManipulator>::Ptr ObjMTRefPtr;
+    typedef GlobalMTRefCountPtrBuilder<MoveManipulator>::Ptr ObjGlobalMTRefPtr;
-    typedef RefCountPtrBuilder        <MoveManipulator>::Ptr ObjRefPtr;
+    typedef GlobalRefCountPtrBuilder  <MoveManipulator>::Ptr ObjGlobalRefPtr;
-    typedef ParentPtrBuilder          <MoveManipulator>::Ptr ObjParentPtr;
-    typedef WeakRefCountPtrBuilder    <MoveManipulator>::Ptr ObjWeakRefPtr;
-    typedef InternalRefCountPtrBuilder<MoveManipulator>::Ptr ObjInternalRefPtr;
+    typedef TransitPtrBuilder         <MoveManipulator>::Ptr ObjTransitPtr;
-    
-    /*! \}                                                                 */
@@ -138 +141 @@
-    /*! \{                                                                 */
-
-RefPtr    
+TransitPtr
-    static  MoveManipulatorPtr createEmpty(void);
-
@@ -146 +149 @@
-    /*! \{                                                                 */
-
-Ref
+Transit
-
-    /*! \}                                                                 */
@@ -227 +230 @@
-
-typedef MoveManipulatorBase::ObjRefPtr         MoveManipulatorRefPtr;
+typedef MoveManipulatorBase::ObjGlobalRefPtr   MoveManipulatorGlobalRefPtr;
-typedef MoveManipulatorBase::ObjMTRefPtr       MoveManipulatorMTRefPtr;
+typedef MoveManipulatorBase::ObjGlobalMTRefPtr MoveManipulatorGlobalMTRefPtr;
-typedef MoveManipulatorBase::ObjWeakRefPtr     MoveManipulatorWeakRefPtr;
-typedef MoveManipulatorBase::ObjParentPtr      MoveManipulatorParentPtr;
-typedef MoveManipulatorBase::ObjInternalRefPtr MoveManipulatorInternalRefPtr;
+typedef MoveManipulatorBase::ObjTransitPtr     MoveManipulatorTransitPtr;
-
-typedef boost::mpl::if_c<