Changeset 969 for branches/Carsten_PtrWork/Source/Contrib/Manipulators/OSGManipulatorFields.h

Timestamp:

10/05/07 19:12:52 (1 year ago)

Author:

cneumann

Message:

added: typedefs for Parent@!Classname!@Ptr fields
removed: calls to ref counting functions

Still does NOT compile

Files:

• branches/Carsten_PtrWork/Source/Contrib/Manipulators/OSGManipulatorFields.h (modified) (7 diffs)

branches/Carsten_PtrWork/Source/Contrib/Manipulators/OSGManipulatorFields.h

@@ -58 +58 @@
-#include "OSGContribGUIDef.h"
-
+#include "OSGParentContainer.h"
-#include "OSGInternalRefPtr.h"
-
@@ -69 +70 @@
-
-class Manipulator;
+
+OSG_GEN_CONTAINERPTR(Manipulator);
-
-typedef RefPtr<Manipulator>         ManipulatorRefPtr;
@@ -76 +79 @@
-typedef InternalRefPtr<Manipulator> const ManipulatorInternalRefPtrConst;
-typedef InternalRefPtr<Manipulator> const ManipulatorInternalRefPtrConstArg;
+
+typedef PtrWrapper<Manipulator,
+                   ManipulatorPtr>        ParentManipulatorPtr;
+typedef PtrWrapper<Manipulator,
+                   ManipulatorPtr> const  ParentManipulatorPtrConst;
-
-#if !defined(OSG_DO_DOC) // created as a dummy class, remove to prevent doubles
@@ -143 +151 @@
-
-    static const char *getSName(void) { return "SFManipulatorInternalRefPtr"; }
-et
+te
-};
-
@@ -154 +162 @@
-#endif // !defined(OSG_DO_DOC) || (OSG_DOC_LEVEL >= 3)
-
+#if !defined(OSG_DO_DOC) || (OSG_DOC_LEVEL >= 3)
+/*! \ingroup GrpContribGUIFieldTraits
+ */
+#if !defined(OSG_DOC_DEV_TRAITS)
+/*! \hideinhierarchy */
+#endif
+
+template <>
+struct FieldTraits<ParentManipulatorPtr> :
+    public FieldTraitsFCPtrBase<ParentManipulatorPtr>
+{
+  private:
+
+    static DataType             _type;
+
+  public:
+
+    typedef FieldTraits<ParentManipulatorPtr>  Self;
+
+    enum                        { Convertible = NotConvertible };
+
+    static OSG_CONTRIBGUI_DLLMAPPING DataType &getType(void);
+
+    static const char *getSName(void) { return "SFParentManipulatorPtr"; }
+    static const char *getMName(void) { return "MFParentManipulatorPtr"; }
+};
+
+#if !defined(OSG_DOC_DEV_TRAITS)
+/*! \class  FieldTraitsTemplateBase<ManipulatorPtr, 0>
+    \hideinhierarchy
+ */
+#endif
+
+#endif // !defined(OSG_DO_DOC) || (OSG_DOC_LEVEL >= 3)
+
-#if !defined(OSG_DO_DOC) || defined(OSG_DOC_FIELD_TYPEDEFS)
-/*! \ingroup GrpContribGUIFieldSingle */
@@ -160 +203 @@
-
-typedef SFieldAdaptor<ManipulatorInternalRefPtr, SFFieldContainerPtr> SFManipulatorInternalRefPtr;
+
+typedef SFieldAdaptor<ParentManipulatorPtr, SFParentFieldContainerPtr> SFParentManipulatorPtr;
-#endif
-
@@ -169 +214 @@
-
-typedef MFieldAdaptor<ManipulatorInternalRefPtr, MFFieldContainerPtr> MFManipulatorInternalRefPtr;
-
-
+
+
+
-
-OSG_END_NAMESPACE