Changeset 1041 for branches/Carsten_PtrWork2/Source/System/FieldContainer/Node/OSGNode.inl

Timestamp:

01/24/08 15:11:54 (1 year ago)

Author:

cneumann

Message:

fixed: aspect sync for child/parent fields

missing editSField/editMField calls

added: simple test program for MT

Files:

• branches/Carsten_PtrWork2/Source/System/FieldContainer/Node/OSGNode.inl (modified) (2 diffs)

branches/Carsten_PtrWork2/Source/System/FieldContainer/Node/OSGNode.inl

@@ -39 +39 @@
-OSG_BEGIN_NAMESPACE
-
+//! access the type of the class
+inline OSG::FieldContainerType &
+Node::getClassType(void)
+{
+    return _type;
+}
+
+//! access the numerical type of the class
+inline OSG::UInt32
+Node::getClassTypeId(void)
+{
+    return _type.getId();
+}
+
+inline OSG::UInt16
+Node::getClassGroupId(void)
+{
+    return _type.getGroupId();
+}
+
+/*-------------------------------------------------------------------------*/
+/* Field SFVolume                                                          */
+
+inline SFDynamicVolume *
+Node::editSFVolume(bool update)
+{
+    if(update == true)
+    {
+        updateVolume();
+    }
+    else
+    {
+        editSField(VolumeFieldMask);
+    }
+
+    return &_sfVolume;
+}
+
+inline SFDynamicVolume const *
+Node::getSFVolume(bool update)
+{
+    if(update == true)
+    {
+        updateVolume();
+    }
+    
+    return &_sfVolume;
+}
+
+#ifdef OSG_1_GET_COMPAT
+inline SFDynamicVolume *
+Node::getSFVolume(bool update)
+{
+    return this->editSFVolume();
+}
+#endif
+
+inline DynamicVolume &
+Node::editVolume(bool update)
+{
+    if(update == true)
+    {
+        updateVolume();
+    }
+    else
+    {
+        editSField(VolumeFieldMask);
+    }
+
+    return _sfVolume.getValue();
+}
+
+inline DynamicVolume const &
+Node::getVolume(bool update)
+{
+    if(update == true)
+    {
+        updateVolume();
+    }
+    
+    return _sfVolume.getValue();
+}
+#ifdef OSG_1_GET_COMPAT
+inline DynamicVolume &
+Node::getVolume(bool update)
+{
+    return this->editVolume(update);
+}
+#endif
+
+inline void
+Node::setVolume(
+    SFDynamicVolume::ArgumentType value)
+{
+    editSField(VolumeFieldMask);
+
+    _sfVolume.setValue(value);
+}
+
+/*-------------------------------------------------------------------------*/
+/* Field SFTravMask                                                        */
+
+inline SFUInt32 *
+Node::editSFTravMask(void)
+{
+    editSField(TravMaskFieldMask);
+
+    return &_sfTravMask;
+}
+
+inline SFUInt32 const *
+Node::getSFTravMask (void) const
+{
+    return &_sfTravMask;
+}
+
+#ifdef OSG_1_GET_COMPAT
+inline SFUInt32 *
+Node::getSFTravMask (void)
+{
+    return this->editSFTravMask();
+}
+#endif
+
+inline UInt32 &
+Node::editTravMask(void)
+{
+    editSField(TravMaskFieldMask);
+
+    return _sfTravMask.getValue();
+}
+
+inline UInt32 const &
+Node::getTravMask (void) const
+{
+    return _sfTravMask.getValue();
+}
+#ifdef OSG_1_GET_COMPAT
+inline UInt32 &
+Node::getTravMask (void)
+{
+    return this->editTravMask();
+}
+#endif
+
+inline void
+Node::setTravMask(
+    SFUInt32::ArgumentType value)
+{
+    editSField(TravMaskFieldMask);
+
+    _sfTravMask.setValue(value);
+}
+
+#ifdef OSG_1_COMPAT
+inline bool
+    Node::getActive(void) const
+{
+    return getTravMask() == TypeTraits<UInt32>::getMax();
+}
+
+inline void
+    Node::setActive(bool val)
+{
+    editSField(TravMaskFieldMask);
+
+    _sfTravMask.setValue(val ? TypeTraits<UInt32>::getMax()        :
+                               TypeTraits<UInt32>::getZeroElement() );
+}
+
+inline void
+    Node::setOcclusionMask(UInt8 val)
+{
+    _occlusionMask = val;
+}
+
+inline UInt8
+    Node::getOcclusionMask(void) const
+{
+    return _occlusionMask;
+}
+#endif
+
+/*-------------------------------------------------------------------------*/
+/* Field SFParent                                                          */
+
+inline SFNodeParentPtr const *
+Node::getSFParent(void) const
+{
+    return &_sfParent;
+}
+
+inline SFNodeParentPtr::const_reference
+Node::getParent(void) const
+{
+    return _sfParent.getValue();
+}
+
+/*-------------------------------------------------------------------------*/
+/* Field SFCore                                                            */
+
+inline SFNodeCoreChildPtr *
+Node::editSFCore(void)
+{
+    editSField(CoreFieldMask);
+
+    return &_sfCore;
+}
+
+inline SFNodeCoreChildPtr const *
+Node::getSFCore(void) const
+{
+    return &_sfCore;
+}
+
+inline SFNodeCoreChildPtr::reference
+Node::editCore(void)
+{
+    editSField(CoreFieldMask);
+
+    return _sfCore.editValue();
+}
+
+inline SFNodeCoreChildPtr::const_reference
+Node::getCore(void) const
+{
+    return _sfCore.getValue();
+}
+    
+inline void
+Node::setCore(SFNodeCoreChildPtr::ArgumentType value)
+{
+    editSField(CoreFieldMask);
+
+    _sfCore.setValue(value);
+}
+
+    
+/*-------------------------------------------------------------------------*/
+/* Field MFChildren                                        (Pointer field) */
+
+inline MFNodeChildPtr *
+Node::editMFChildren(void)
+{
+    editMField(ChildrenFieldMask, _mfChildren);
+    
+    return &_mfChildren;
+}
+
+inline MFNodeChildPtr const *
+Node::getMFChildren(void) const
+{
+    return &_mfChildren;
+}
+
+inline MFNodeChildPtr &
+Node::editChildren(void)
+{
+    editMField(ChildrenFieldMask, _mfChildren);
+
+    return _mfChildren;
+}
+
+inline MFNodeChildPtr const &
+Node::getChildren(void) const
+{
+    return _mfChildren;
+}
+
+inline MFNodeChildPtr::reference
+Node::editChildren(UInt32 const index)
+{
+    editMField(ChildrenFieldMask, _mfChildren);
+
+    return _mfChildren[index];
+}
+
+inline MFNodeChildPtr::const_reference
+Node::getChildren(UInt32 const index) const
+{
+    return _mfChildren[index];
+}
+
+
+#ifdef OSG_MT_CPTR_ASPECT
+inline
+void Node::execSync (Node *pFrom,
+                                  ConstFieldMaskArg  whichField,
+                                  AspectOffsetStore &oOffsets,
+                                  ConstFieldMaskArg  syncMode,
+                                  UInt32 const       uiSyncInfo)
+{
+    Inherited::execSync(pFrom, whichField, oOffsets, syncMode, uiSyncInfo);
+
+    if(FieldBits::NoField != (VolumeFieldMask & whichField))
+        _sfVolume.syncWith(pFrom->_sfVolume);
+
+    if(FieldBits::NoField != (TravMaskFieldMask & whichField))
+        _sfTravMask.syncWith(pFrom->_sfTravMask);
+
+    if(FieldBits::NoField != (ParentFieldMask & whichField))
+        _sfParent.syncWith(pFrom->_sfParent);
+
+    if(FieldBits::NoField != (ChildrenFieldMask & whichField))
+        _mfChildren.syncWith(pFrom->_mfChildren,
+                                syncMode,
+                                uiSyncInfo,
+                                oOffsets);
+
+    if(FieldBits::NoField != (CoreFieldMask & whichField))
+        _sfCore.syncWith(pFrom->_sfCore);
+}
+#endif
+
+
+inline Char8 const *
+Node::getClassname(void)
+{
+    return "Node";
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+#if 0
+
+
-OSG_FIELD_CONTAINER_INL_DEF(Node)
-
-inline
-NodeCorePtr Node::getCore(void)
-{
-    return _sfCore.getValue();
-}
-
-inline
-NodeCorePtr Node::getCore(void) const
-{
-    return _sfCore.getValue();
-}
-
-inline
@@ -202 +527 @@
-}
-
+#endif
+
-template <class CoreT>
-inline NodeTransitPtr