Changeset 1039 for branches/Carsten_PtrWork2/Source/System/FileIO/OSG/OSGOSGLoader.cpp

Timestamp:

01/16/08 16:07:40 (1 year ago)

Author:

cneumann

Message:

changed: - factory functions return a TransitPtr? that can not be implicitly

converted to C Ptr. Should help with porting.

added: - GlobalRefPtr?, needed for cases where upon return from main

a RefPtr? goes out of scope (it would attempt to access the
FCFactory which is already shutdown at that point).

status: - vrml loader does not compile (needs porting to ref ptr)

• tutorials compile, run and exit cleanly
  
• multithreading and cluster are untested, yet
  

Files:

• branches/Carsten_PtrWork2/Source/System/FileIO/OSG/OSGOSGLoader.cpp (modified) (5 diffs)

branches/Carsten_PtrWork2/Source/System/FileIO/OSG/OSGOSGLoader.cpp

@@ -366 +366 @@
-                          const Char8 *szNodename)
-{
-
+Ref
-
-    if(szNodeTypename == NULL)
@@ -414 +414 @@
-    if(_fcStack.size() == 1)
-    {
-Ptr pNode = NullFC
+RefPtr pNode
-
-        if(_pCurrentFC->getType().isNode())
-        {
-dynamic_cast<NodePtr
+boost::dynamic_pointer_cast<Node
-        }
-        else if(_pCurrentFC->getType().isNodeCore())
@@ -424 +424 @@
-            pNode = Node::create();
-
-dynamic_cast<NodeCorePtr
+boost::dynamic_pointer_cast<NodeCore
-        }
-        else
@@ -434 +434 @@
-        if(_pRootNode == NullFC)
-        {
-
+Ref
-
-            _pRootNode = Node::create();
@@ -461 +461 @@
-        if(_pCurrentFC->getType().isNode() == true)
-        {
-Ptr pNode = dynamic_cast<NodePtr
+RefPtr pNode = boost::dynamic_pointer_cast<Node
-
-            if(pNode->getCore() == NullFC)
-            {
-
+Ref
-
-                pNode->setCore(pGroup);