Changeset 1072 for branches/Carsten_PtrWork2/Source/Base/Field/OSGBaseFieldTraits.h

Timestamp:

04/02/08 14:18:07 (8 months ago)

Author:

cneumann

Message:

replaced pointer field implementation
split FieldContainer/Fields? directory into Base and Handle subdir

Status: - ref counting seems to work (mt, cluster)

• new OSB loader works (well, the unittest does)
  
• VRML loader is deactivated
  
• get/edit handle for dynamic (pointer) fields missing
  
• need to remove some more old files - they get moved in this commit
  
• generated (i.e. base) code in following commit
  

Files:

• branches/Carsten_PtrWork2/Source/Base/Field/OSGBaseFieldTraits.h (modified) (14 diffs)

branches/Carsten_PtrWork2/Source/Base/Field/OSGBaseFieldTraits.h

@@ -45 +45 @@
-#include "OSGFieldTraits.h"
-#include "OSGDataType.h"
+#include "OSGSField.h"
+#include "OSGMField.h"
-
-#include "OSGColor.h"
@@ -83 +85 @@
-
-    typedef FieldTraits<Color3f>  Self;
+    
+    typedef SField<Color3f>       DataSField;
+    typedef MField<Color3f>       DataMField;
-
-    enum             { Convertible = (Self::ToStreamConvertible  |
@@ -118 +123 @@
-
-    typedef FieldTraits<Color3fx>  Self;
+    
+    typedef SField<Color3fx>       DataSField;
+    typedef MField<Color3fx>       DataMField;
-
-    enum             { Convertible = (Self::ToStreamConvertible  |
@@ -154 +162 @@
-    typedef FieldTraits<Color4f>  Self;
-
+    typedef SField<Color4f>       DataSField;
+    typedef MField<Color4f>       DataMField;
+    
-    enum             { Convertible = (Self::ToStreamConvertible  |
-                                      Self::FromStringConvertible)     };
@@ -188 +199 @@
-
-    typedef FieldTraits<Color4fx>  Self;
+    
+    typedef SField<Color4fx>       DataSField;
+    typedef MField<Color4fx>       DataMField;
-
-    enum             { Convertible = (Self::ToStreamConvertible  |
@@ -222 +236 @@
-
-    typedef FieldTraits<Color3ub>  Self;
+    
+    typedef SField<Color3ub>       DataSField;
+    typedef MField<Color3ub>       DataMField;
-
-    enum             { Convertible = (Self::ToStreamConvertible  |
@@ -256 +273 @@
-
-    typedef FieldTraits<Color4ub>  Self;
+    
+    typedef SField<Color4ub>       DataSField;
+    typedef MField<Color4ub>       DataMField;
-
-    enum             { Convertible = (Self::ToStreamConvertible  |
@@ -290 +310 @@
-
-    typedef FieldTraits<std::string>  Self;
+    
+    typedef SField<std::string>       DataSField;
+    typedef MField<std::string>       DataMField;
-
-    enum             { Convertible = (Self::FromStringConvertible |
@@ -392 +415 @@
-    typedef FieldTraits<Time, 1>  Self;
-
+    typedef SField<Time, 1>       DataSField;
+    typedef MField<Time, 1>       DataMField;
+    
-    enum             { Convertible = (Self::ToStreamConvertible  |
-                                      Self::FromStringConvertible)     };
@@ -426 +452 @@
-
-    typedef FieldTraits<DynamicVolume>  Self;
+    
+    typedef SField<DynamicVolume>       DataSField;
+    typedef MField<DynamicVolume>       DataMField;
-
-    enum                  { Convertible = (Self::FromStringConvertible |
@@ -755 +784 @@
-
-    typedef FieldTraits<BoxVolume>  Self;
+    
+    typedef SField<BoxVolume>       DataSField;
+    typedef MField<BoxVolume>       DataMField;
-
-    enum                  { Convertible = (Self::FromStringConvertible |
@@ -947 +979 @@
-
-    typedef FieldTraits<BitVector, 1>  Self;
+    
+    typedef SField<BitVector, 1>       DataSField;
+    typedef MField<BitVector, 1>       DataMField;
-
-    enum              { Convertible = Self::NotConvertible             };
@@ -980 +1015 @@
-
-    typedef FieldTraits<GLenum, 1>  Self;
+    
+    typedef SField<GLenum, 1>       DataSField;
+    typedef MField<GLenum, 1>       DataMField;
-
-    enum             { Convertible = (Self::ToStreamConvertible  |
@@ -1025 +1063 @@
-
-    typedef FieldTraits<Plane>  Self;
+    
+    typedef SField<Plane>       DataSField;
+    typedef MField<Plane>       DataMField;
-
-    enum             { Convertible = Self::NotConvertible               };