From c72530d2fd46a07b387a2e2fd2f88211f6c9a346 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 6 Jul 2006 11:40:41 +0000 Subject: [PATCH] Added setting of name from the .obj goup name and object names. --- src/osgPlugins/obj/ReaderWriterOBJ.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/osgPlugins/obj/ReaderWriterOBJ.cpp b/src/osgPlugins/obj/ReaderWriterOBJ.cpp index 4a1a80692..a6c5c2b8a 100644 --- a/src/osgPlugins/obj/ReaderWriterOBJ.cpp +++ b/src/osgPlugins/obj/ReaderWriterOBJ.cpp @@ -23,7 +23,6 @@ #include #include #include -#include #include #include @@ -522,7 +521,19 @@ osg::Node* ReaderWriterOBJ::convertModelToSceneGraph(obj::Model& model, bool& ro osg::Geode* geode = new osg::Geode; geode->addDrawable(geometry); - geode->setName(es.objectName); + + if (es.objectName.empty()) + { + geode->setName(es.groupName); + } + else if (es.groupName.empty()) + { + geode->setName(es.objectName); + } + else + { + geode->setName(es.groupName + std::string(":") + es.objectName); + } group->addChild(geode);