Changeset 660 for branches/mixin-collappse/Source/System/FieldContainer/Base/OSGFieldContainer.inl

Timestamp:

04/06/07 00:00:32 (2 years ago)

Author:

vossg

Message:

fixed : improved multi aspect value field deletion

Files:

• branches/mixin-collappse/Source/System/FieldContainer/Base/OSGFieldContainer.inl (modified) (1 diff)

branches/mixin-collappse/Source/System/FieldContainer/Base/OSGFieldContainer.inl

@@ -100 +100 @@
-    if(_iRefCount <= 0)
-    {
-        AspectOffsetStore oOffsets;
-
-        Thread::getCurrentChangeList()->incSubRefLevel();
-
-
-
-
-
+
-
-        Thread::getCurrentChangeList()->decSubRefLevel();
-
-        Thread::getCurrentChangeList()->addSubRefd(Inherited::getId());
+
+#ifdef OSG_MT_CPTR_ASPECT
+        _pAspectStore->removePtrForAspect(Thread::getCurrentAspect());
+
+        if(_pAspectStore->getRefCount() == 1)
+        {
+            this->deregister(Inherited::getId());
+            this->onDestroy (Inherited::getId());
+        }
+
+        OSG::subRef(_pAspectStore);
+#else
+        this->deregister(Inherited::getId());
+        this->onDestroy (Inherited::getId());
+#endif
+
+        delete this;
+    }
+    else
+    {
+        Thread::getCurrentChangeList()->addSubRefd(Inherited::getId());
+    }
+
+}
+
+
+inline
+void FieldContainer::subReferenceLocalVar(void)
+{
+    --_iRefCount;
+
+    if(_iRefCount <= 0)
+    {
+
+        Thread::getCurrentChangeList()->incSubRefLevel();
+
+        this->resolveLinks();
+
+        Thread::getCurrentChangeList()->decSubRefLevel();
+
+        Thread::getCurrentChangeList()->addSubRefd(Inherited::getId(),
+                                                   true);
-
-#ifdef OSG_MT_CPTR_ASPECT