Changeset 969 for branches/Carsten_PtrWork/Source/Contrib/VTK/OSGVTKMapperFields.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/VTK/OSGVTKMapperFields.h (modified) (7 diffs)

branches/Carsten_PtrWork/Source/Contrib/VTK/OSGVTKMapperFields.h

@@ -58 +58 @@
-#include "OSGContribVTKDef.h"
-
+#include "OSGParentContainer.h"
-#include "OSGInternalRefPtr.h"
-
@@ -69 +70 @@
-
-class VTKMapper;
+
+OSG_GEN_CONTAINERPTR(VTKMapper);
-
-typedef RefPtr<VTKMapper>         VTKMapperRefPtr;
@@ -76 +79 @@
-typedef InternalRefPtr<VTKMapper> const VTKMapperInternalRefPtrConst;
-typedef InternalRefPtr<VTKMapper> const VTKMapperInternalRefPtrConstArg;
+
+typedef PtrWrapper<VTKMapper,
+                   VTKMapperPtr>        ParentVTKMapperPtr;
+typedef PtrWrapper<VTKMapper,
+                   VTKMapperPtr> const  ParentVTKMapperPtrConst;
-
-#if !defined(OSG_DO_DOC) // created as a dummy class, remove to prevent doubles
@@ -143 +151 @@
-
-    static const char *getSName(void) { return "SFVTKMapperInternalRefPtr"; }
-et
+te
-};
-
@@ -154 +162 @@
-#endif // !defined(OSG_DO_DOC) || (OSG_DOC_LEVEL >= 3)
-
+#if !defined(OSG_DO_DOC) || (OSG_DOC_LEVEL >= 3)
+/*! \ingroup GrpContribVTKFieldTraits
+ */
+#if !defined(OSG_DOC_DEV_TRAITS)
+/*! \hideinhierarchy */
+#endif
+
+template <>
+struct FieldTraits<ParentVTKMapperPtr> :
+    public FieldTraitsFCPtrBase<ParentVTKMapperPtr>
+{
+  private:
+
+    static DataType             _type;
+
+  public:
+
+    typedef FieldTraits<ParentVTKMapperPtr>  Self;
+
+    enum                        { Convertible = NotConvertible };
+
+    static OSG_CONTRIBVTK_DLLMAPPING DataType &getType(void);
+
+    static const char *getSName(void) { return "SFParentVTKMapperPtr"; }
+    static const char *getMName(void) { return "MFParentVTKMapperPtr"; }
+};
+
+#if !defined(OSG_DOC_DEV_TRAITS)
+/*! \class  FieldTraitsTemplateBase<VTKMapperPtr, 0>
+    \hideinhierarchy
+ */
+#endif
+
+#endif // !defined(OSG_DO_DOC) || (OSG_DOC_LEVEL >= 3)
+
-#if !defined(OSG_DO_DOC) || defined(OSG_DOC_FIELD_TYPEDEFS)
-/*! \ingroup GrpContribVTKFieldSingle */
@@ -160 +203 @@
-
-typedef SFieldAdaptor<VTKMapperInternalRefPtr, SFFieldContainerPtr> SFVTKMapperInternalRefPtr;
+
+typedef SFieldAdaptor<ParentVTKMapperPtr, SFParentFieldContainerPtr> SFParentVTKMapperPtr;
-#endif
-
@@ -169 +214 @@
-
-typedef MFieldAdaptor<VTKMapperInternalRefPtr, MFFieldContainerPtr> MFVTKMapperInternalRefPtr;
-
-
+
+
+
-
-OSG_END_NAMESPACE