Changeset 11034 for OpenSceneGraph/trunk/src/osgPlugins/Inventor/ConvertFromInventor.cpp

Timestamp:

01/31/10 19:24:01 (3 years ago)

Author:

robert

Message:

Build fixes for build without ref_ptr<> automatic type conversion

Files:

• OpenSceneGraph/trunk/src/osgPlugins/Inventor/ConvertFromInventor.cpp (modified) (4 diffs)

OpenSceneGraph/trunk/src/osgPlugins/Inventor/ConvertFromInventor.cpp

@@ -281 +281 @@
     // (ivStateStack is used to track the state that is not accessible by
     // SoCallbackAction functions)
-    ivStateStack.push(IvStateItem(ivRootNode, osgRootNode));
+    ivStateStack.push(IvStateItem(ivRootNode, osgRootNode.get()));
 
     // Create callback actions for the inventor nodes
@@ -512 +512 @@
 
         // Get osgStateRoot (note: we HAVE TO reference it)
-        osg::Group *stateRoot = ivState.osgStateRoot;
-        osg::ref_ptr<osg::Group> r = stateRoot;
-/*    assert(strcmp(stateRoot->className(), "Group") == 0 &&
-           "IvStateStack osg graph is expected to be "
-           "headed by osg::Group");
-        if (stateRoot->getNumChildren() == 1) {
-            r = stateRoot->getChild(0)->asGroup();
-            osg::notify(osg::FATAL) << stateRoot->className() << std::endl;
-            osg::notify(osg::FATAL) << stateRoot->getChild(0)->className() << std::endl;
-            exit(0);
-            assert(r != NULL && "Node must be group.");
-        }*/
+        osg::ref_ptr<osg::Group> r = ivState.osgStateRoot;
 
         // Pop state
@@ -539 +528 @@
         // APPEND_AT_PUSH
         if (!(ivState.flags & IvStateItem::APPEND_AT_PUSH))
-            appendNode(r, action);
+            appendNode(r.get(), action);
 
     } while (multipop);
@@ -1229 +1218 @@
     }
 
-    return osgProgram->addShader(osgShader);
+    return osgProgram->addShader(osgShader.get());
 }
 #endif // INVENTOR_SHADERS_AVAILABLE