Show
Ignore:
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:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/Carsten_PtrWork2/Source/System/FieldContainer/Fields/OSGContainerTypeInst.cpp

    r1031 r1072  
    5959#include <OSGMField.h> 
    6060#include <OSGMField.ins> 
    61 #include <OSGMChildFCPointerField.h> 
    62 #include <OSGMChildFCPointerField.ins> 
    63 #include <OSGMInternalFCPointerField.h> 
    64 #include <OSGMInternalFCPointerField.ins> 
    65 #include <OSGMParentFCPointerField.h> 
    66 #include <OSGMParentFCPointerField.ins> 
    67 #include <OSGMWeakFCPointerField.h> 
    68 #include <OSGMWeakFCPointerField.ins> 
     61#include <OSGChildPointerMField.h> 
     62#include <OSGChildPointerMField.ins> 
     63#include <OSGUnrecordedPointerMField.h> 
     64#include <OSGUnrecordedPointerMField.ins> 
     65#include <OSGParentPointerMField.h> 
     66#include <OSGParentPointerMField.ins> 
     67#include <OSGWeakPointerMField.h> 
     68#include <OSGWeakPointerMField.ins> 
    6969 
    7070#include <OSGSField.h> 
    7171#include <OSGSField.ins> 
    72 #include <OSGSChildFCPointerField.h> 
    73 #include <OSGSChildFCPointerField.ins> 
    74 #include <OSGSInternalFCPointerField.h> 
    75 #include <OSGSInternalFCPointerField.ins> 
    76 #include <OSGSParentFCPointerField.h> 
    77 #include <OSGSParentFCPointerField.ins> 
    78 #include <OSGSWeakFCPointerField.h> 
    79 #include <OSGSWeakFCPointerField.ins> 
     72#include <OSGChildPointerSField.h> 
     73#include <OSGChildPointerSField.ins> 
     74#include <OSGUnrecordedPointerSField.h> 
     75#include <OSGUnrecordedPointerSField.ins> 
     76#include <OSGParentPointerSField.h> 
     77#include <OSGParentPointerSField.ins> 
     78#include <OSGWeakPointerSField.h> 
     79#include <OSGWeakPointerSField.ins> 
    8080 
    8181OSG_BEGIN_NAMESPACE 
    …… 
    8787    "FieldContainerPtr", 
    8888    NULL); 
    89 DataType FieldTraits<FieldContainerParentPtr          >::_type( 
    90     "FieldContainerParentPtr", 
    91     NULL); 
    9289 
    9390DataType FieldTraits<FieldContainerAttachmentPtr      >::_type( 
    9491    "FieldContainerAttachmentPtr", 
    9592    "FieldContainerPtr"); 
    96 DataType FieldTraits<FieldContainerAttachmentParentPtr>::_type( 
    97     "FieldContainerAttachmentParentPtr", 
    98     "FieldContainerParentPtr"); 
    9993 
    10094DataType FieldTraits<AttachmentContainerPtr           >::_type( 
    10195    "AttachmentContainerPtr", 
    10296    "FieldContainerPtr"); 
    103 DataType FieldTraits<AttachmentContainerParentPtr     >::_type( 
    104     "AttachmentContainerParentPtr", 
    105     "FieldContainerParentPtr"); 
    10697     
    10798DataType FieldTraits<NodeCorePtr                      >::_type( 
    10899    "NodeCorePtr", 
    109100    "AttachmentContainerPtr"); 
    110 DataType FieldTraits<NodeCoreParentPtr                >::_type( 
    111     "NodeCoreParentPtr", 
    112     "AttachmentContainerParentPtr"); 
    113101 
    114102DataType FieldTraits<NodePtr                          >::_type( 
    115103    "NodePtr", 
    116104    "AttachmentContainerPtr"); 
    117 DataType FieldTraits<NodeParentPtr                    >::_type( 
    118     "NodeParentPtr", 
    119     "AttachmentContainerParentPtr"); 
    120105 
    121106DataType FieldTraits<ChangedFunctorCallback           >::_type( 
    …… 
    124109  
    125110OSG_FIELDTRAITS_GETTYPE   (FieldContainerPtr           ) 
    126 OSG_FIELDTRAITS_GETTYPE   (FieldContainerParentPtr     ) 
    127111 
    128112OSG_FIELDTRAITS_GETTYPE   (FieldContainerAttachmentPtr ) 
    129113OSG_FIELDTRAITS_GETTYPE   (AttachmentContainerPtr      ) 
    130 OSG_FIELDTRAITS_GETTYPE   (AttachmentContainerParentPtr) 
    131114OSG_FIELDTRAITS_GETTYPE   (NodeCorePtr                 ) 
    132 OSG_FIELDTRAITS_GETTYPE   (NodeCoreParentPtr           ) 
    133115OSG_FIELDTRAITS_GETTYPE   (NodePtr                     ) 
    134 OSG_FIELDTRAITS_GETTYPE   (NodeParentPtr               ) 
    135116OSG_FIELDTRAITS_GETTYPE   (ChangedFunctorCallback      ) 
    136117 
    137118#endif // !defined(OSG_DO_DOC) || (OSG_DOC_LEVEL >= 3) 
    138119 
    139 OSG_FIELD_DLLEXPORT_DEF1(SChildFCPointerField,    FieldContainerAttachment); 
    140 OSG_FIELD_DLLEXPORT_DEF1(SInternalFCPointerField, FieldContainerAttachment); 
    141 OSG_FIELD_DLLEXPORT_DEF1(SWeakFCPointerField,     FieldContainerAttachment);     
     120OSG_FIELD_DLLEXPORT_DEF1(ChildPointerSField,      FieldContainerAttachment); 
     121OSG_FIELD_DLLEXPORT_DEF1(UnrecordedPointerSField, FieldContainerAttachment); 
     122OSG_FIELD_DLLEXPORT_DEF1(WeakPointerSField,       FieldContainerAttachment);     
    142123 
    143 OSG_FIELD_DLLEXPORT_DEF1(MChildFCPointerField,    FieldContainerAttachment); 
    144 OSG_FIELD_DLLEXPORT_DEF1(MInternalFCPointerField, FieldContainerAttachment); 
    145 OSG_FIELD_DLLEXPORT_DEF1(MWeakFCPointerField,     FieldContainerAttachment); 
     124OSG_FIELD_DLLEXPORT_DEF1(ChildPointerMField,      FieldContainerAttachment); 
     125OSG_FIELD_DLLEXPORT_DEF1(UnrecordedPointerMField, FieldContainerAttachment); 
     126OSG_FIELD_DLLEXPORT_DEF1(WeakPointerMField,       FieldContainerAttachment); 
    146127 
    147128 
    148 OSG_FIELD_DLLEXPORT_DEF1(SChildFCPointerField,    FieldContainer); 
    149 OSG_FIELD_DLLEXPORT_DEF1(SInternalFCPointerField, FieldContainer); 
    150 OSG_FIELD_DLLEXPORT_DEF1(SParentFCPointerField,   FieldContainer); 
    151 OSG_FIELD_DLLEXPORT_DEF1(SWeakFCPointerField,     FieldContainer); 
     129OSG_FIELD_DLLEXPORT_DEF1(ChildPointerSField,      FieldContainer); 
     130OSG_FIELD_DLLEXPORT_DEF1(UnrecordedPointerSField, FieldContainer); 
     131OSG_FIELD_DLLEXPORT_DEF1(ParentPointerSField,     FieldContainer); 
     132OSG_FIELD_DLLEXPORT_DEF1(WeakPointerSField,       FieldContainer); 
    152133     
    153 OSG_FIELD_DLLEXPORT_DEF1(MChildFCPointerField,    FieldContainer); 
    154 OSG_FIELD_DLLEXPORT_DEF1(MInternalFCPointerField, FieldContainer); 
    155 OSG_FIELD_DLLEXPORT_DEF1(MParentFCPointerField,   FieldContainer); 
    156 OSG_FIELD_DLLEXPORT_DEF1(MWeakFCPointerField,     FieldContainer); 
     134OSG_FIELD_DLLEXPORT_DEF1(ChildPointerMField,      FieldContainer); 
     135OSG_FIELD_DLLEXPORT_DEF1(UnrecordedPointerMField, FieldContainer); 
     136OSG_FIELD_DLLEXPORT_DEF1(ParentPointerMField,     FieldContainer); 
     137OSG_FIELD_DLLEXPORT_DEF1(WeakPointerMField,       FieldContainer); 
    157138 
    158139 
    159 OSG_FIELD_DLLEXPORT_DEF1(SChildFCPointerField,    AttachmentContainer); 
    160 OSG_FIELD_DLLEXPORT_DEF1(SInternalFCPointerField, AttachmentContainer); 
    161 OSG_FIELD_DLLEXPORT_DEF1(SParentFCPointerField,   AttachmentContainer); 
    162 OSG_FIELD_DLLEXPORT_DEF1(SWeakFCPointerField,     AttachmentContainer); 
     140OSG_FIELD_DLLEXPORT_DEF1(ChildPointerSField,      AttachmentContainer); 
     141OSG_FIELD_DLLEXPORT_DEF1(UnrecordedPointerSField, AttachmentContainer); 
     142OSG_FIELD_DLLEXPORT_DEF1(ParentPointerSField,     AttachmentContainer); 
     143OSG_FIELD_DLLEXPORT_DEF1(WeakPointerSField,       AttachmentContainer); 
    163144     
    164 OSG_FIELD_DLLEXPORT_DEF1(MChildFCPointerField,    AttachmentContainer); 
    165 OSG_FIELD_DLLEXPORT_DEF1(MInternalFCPointerField, AttachmentContainer); 
    166 OSG_FIELD_DLLEXPORT_DEF1(MParentFCPointerField,   AttachmentContainer); 
    167 OSG_FIELD_DLLEXPORT_DEF1(MWeakFCPointerField,     AttachmentContainer); 
     145OSG_FIELD_DLLEXPORT_DEF1(ChildPointerMField,      AttachmentContainer); 
     146OSG_FIELD_DLLEXPORT_DEF1(UnrecordedPointerMField, AttachmentContainer); 
     147OSG_FIELD_DLLEXPORT_DEF1(ParentPointerMField,     AttachmentContainer); 
     148OSG_FIELD_DLLEXPORT_DEF1(WeakPointerMField,       AttachmentContainer); 
    168149 
    169150 
    170 OSG_FIELD_DLLEXPORT_DEF1(SChildFCPointerField,    NodeCore); 
    171 OSG_FIELD_DLLEXPORT_DEF1(SInternalFCPointerField, NodeCore); 
    172 OSG_FIELD_DLLEXPORT_DEF1(SParentFCPointerField,   NodeCore); 
    173 OSG_FIELD_DLLEXPORT_DEF1(SWeakFCPointerField,     NodeCore); 
     151OSG_FIELD_DLLEXPORT_DEF1(ChildPointerSField,      NodeCore); 
     152OSG_FIELD_DLLEXPORT_DEF1(UnrecordedPointerSField, NodeCore); 
     153OSG_FIELD_DLLEXPORT_DEF1(ParentPointerSField,     NodeCore); 
     154OSG_FIELD_DLLEXPORT_DEF1(WeakPointerSField,       NodeCore); 
    174155     
    175 OSG_FIELD_DLLEXPORT_DEF1(MChildFCPointerField,    NodeCore); 
    176 OSG_FIELD_DLLEXPORT_DEF1(MInternalFCPointerField, NodeCore); 
    177 OSG_FIELD_DLLEXPORT_DEF1(MParentFCPointerField,   NodeCore); 
    178 OSG_FIELD_DLLEXPORT_DEF1(MWeakFCPointerField,     NodeCore); 
     156OSG_FIELD_DLLEXPORT_DEF1(ChildPointerMField,      NodeCore); 
     157OSG_FIELD_DLLEXPORT_DEF1(UnrecordedPointerMField, NodeCore); 
     158OSG_FIELD_DLLEXPORT_DEF1(ParentPointerMField,     NodeCore); 
     159OSG_FIELD_DLLEXPORT_DEF1(WeakPointerMField,       NodeCore); 
    179160 
    180161 
    181 OSG_FIELD_DLLEXPORT_DEF1(SChildFCPointerField,    Node); 
    182 OSG_FIELD_DLLEXPORT_DEF1(SInternalFCPointerField, Node); 
    183 OSG_FIELD_DLLEXPORT_DEF1(SParentFCPointerField,   Node); 
    184 OSG_FIELD_DLLEXPORT_DEF1(SWeakFCPointerField,     Node); 
     162OSG_FIELD_DLLEXPORT_DEF1(ChildPointerSField,      Node); 
     163OSG_FIELD_DLLEXPORT_DEF1(UnrecordedPointerSField, Node); 
     164OSG_FIELD_DLLEXPORT_DEF1(ParentPointerSField,     Node); 
     165OSG_FIELD_DLLEXPORT_DEF1(WeakPointerSField,       Node); 
    185166     
    186 OSG_FIELD_DLLEXPORT_DEF1(MChildFCPointerField,    Node); 
    187 OSG_FIELD_DLLEXPORT_DEF1(MInternalFCPointerField, Node); 
    188 OSG_FIELD_DLLEXPORT_DEF1(MParentFCPointerField,   Node); 
    189 OSG_FIELD_DLLEXPORT_DEF1(MWeakFCPointerField,     Node); 
     167OSG_FIELD_DLLEXPORT_DEF1(ChildPointerMField,      Node); 
     168OSG_FIELD_DLLEXPORT_DEF1(UnrecordedPointerMField, Node); 
     169OSG_FIELD_DLLEXPORT_DEF1(ParentPointerMField,     Node); 
     170OSG_FIELD_DLLEXPORT_DEF1(WeakPointerMField,       Node); 
    190171 
    191172OSG_FIELD_DLLEXPORT_DEF1(SField, ChangedFunctorCallback);