Changeset 1072 for branches/Carsten_PtrWork2/Source/Base/Field/OSGMathFieldTraits.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/OSGMathFieldTraits.h (modified) (6 diffs)

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

@@ -45 +45 @@
-#include "OSGFieldTraits.h"
-#include "OSGDataType.h"
+#include "OSGSField.h"
+#include "OSGMField.h"
-
-#include "OSGMatrix.h"
@@ -76 +78 @@
-
-    typedef FieldTraits<Matrix>  Self;
+    
+    typedef SField<Matrix>       DataSField;
+    typedef MField<Matrix>       DataMField;
-
-    enum             { Convertible = (Self::FromStringConvertible |
@@ -193 +198 @@
-
-    typedef FieldTraits<Matrix4d>  Self;
+    
+    typedef SField<Matrix4d>       DataSField;
+    typedef MField<Matrix4d>       DataMField;
-
-    enum             { StringConvertable = (Self::FromStringConvertible |
@@ -310 +318 @@
-
-    typedef FieldTraits<Matrix4fx>  Self;
+    
+    typedef SField<Matrix4fx>       DataSField;
+    typedef MField<Matrix4fx>       DataMField;
-
-    enum             { Convertible = Self::NotConvertible           };
@@ -392 +403 @@
-
-    typedef FieldTraits<Quaternion>  Self;
+    
+    typedef SField<Quaternion>       DataSField;
+    typedef MField<Quaternion>       DataMField;
-
-    enum               { Convertible = Self::ToStreamConvertible    };
@@ -436 +450 @@
-
-    typedef FieldTraits<Quaternionfx>  Self;
+    
+    typedef SField<Quaternionfx>       DataSField;
+    typedef MField<Quaternionfx>       DataMField;
-
-    enum               { Convertible = Self::ToStreamConvertible    };