Changeset 10932 for OpenSceneGraph/trunk/src/osgPlugins/3ds/ReaderWriter3DS.cpp

Timestamp:

01/08/10 11:52:03 (3 years ago)

Author:

robert

Message:

From Sukender, "ReaderWriter?3DS.cpp fixes:
- Fixed creation of useless intermediate nodes

WriterNodeVisitor?.cpp fixes:
- Fixed naming of textures (path and extension)
"

Note from Robert Osfield, this submission also came with changes to use of ref_ptr<> and removal of delete[]'s, but these were not merged as they didn't actually fix any memory leaks, and in once instance introduced one.

Files:

• OpenSceneGraph/trunk/src/osgPlugins/3ds/ReaderWriter3DS.cpp (modified) (3 diffs)

OpenSceneGraph/trunk/src/osgPlugins/3ds/ReaderWriter3DS.cpp

@@ -349 +349 @@
     {
         if (mesh->faces[i].material>=0) {
-            //std::stringstream materialStr;
-            //materialStr << mesh->faces[i].material;
-            //materialFaceMap[materialStr.str()].push_back(i);
             materialFaceMap[mesh->faces[i].material].push_back(i);
         }
@@ -454 +451 @@
 
 
-    if (node->childs != NULL || pivoted || (!isOsgNodeMatrixIdentity && !noMatrixTransforms)) {
+    //if (node->childs != NULL || pivoted || (!isOsgNodeMatrixIdentity && !noMatrixTransforms)) {
+    if (node->childs != NULL || (!isOsgNodeMatrixIdentity && !noMatrixTransforms)) {
         if (isOsgNodeMatrixIdentity || noMatrixTransforms) {
             group = new osg::Group;
@@ -889 +887 @@
         osg::notify(osg::DEBUG_INFO) << "    LIB3DS_TEXTURE_RGB_TINT     "<<((texture->flags)&LIB3DS_TEXTURE_RGB_TINT)<< std::endl;
 
-        bool noTexture = false;
-        if (options)
-        {
-            std::istringstream iss(options->getOptionString());
-            std::string opt;
-            while (iss >> opt)
-            {
-                if (opt == "noTexture")
-                    noTexture = true;
-            }
-        }
-
-        osg::ref_ptr<osg::Image> osg_image = NULL;
-        if(noTexture)
-            osg_image = new osg::Image();
-        else
-            osg_image = osgDB::readRefImageFile(fileName.c_str(), options); //Absolute Path
-        if (!osg_image)
+        osg::ref_ptr<osg::Image> osg_image = osgDB::readRefImageFile(fileName.c_str(), options); //Absolute Path
+        if (!osg_image.valid())
         {
             osg::notify(osg::NOTICE) << "Warning: Cannot create texture "<<texture->name<< std::endl;