Changeset 11056 for OpenSceneGraph/trunk/src/osgPlugins/3ds/WriterNodeVisitor.h

Timestamp:

02/11/10 12:56:43 (3 years ago)

Author:

robert

Message:

From Sukender, "- Added support for extended filenames (=not 8.3) for images: reads without crashing, optionnally write extended filenames (correctly truncate names if option is OFF). Write option is OFF by default.
- Improved identifiers generation in duplicate name handling (was limited to 1000 name collisions, which can be very short for some usages).
- Set all read/write operations use a custom log function that will redirect lib3DS log to osg::notify() (was only used for streams)
- Removed custom code (now uses osgDB::getFilePath())
- Added missing supportsOption() calls
- Cleaned a few minor things"

Files:

• OpenSceneGraph/trunk/src/osgPlugins/3ds/WriterNodeVisitor.h (modified) (5 diffs)

OpenSceneGraph/trunk/src/osgPlugins/3ds/WriterNodeVisitor.h

@@ -42 +42 @@
 #include "lib3ds/lib3ds.h"
 #include "WriterCompareTriangle.h"
+#include <set>
 
 void copyOsgMatrixToLib3dsMatrix(Lib3dsMatrix lib3ds_matrix, const osg::Matrix& osg_matrix);
@@ -50 +51 @@
 class WriterNodeVisitor: public osg::NodeVisitor
 {
-
     public:
         static const unsigned int MAX_VERTICES = 65000;
@@ -57 +57 @@
         WriterNodeVisitor(Lib3dsFile * file3ds, const std::string & fileName, 
                         const osgDB::ReaderWriter::Options* options, 
-                        const std::string & srcDirectory) :
-            osg::NodeVisitor(osg::NodeVisitor::TRAVERSE_ALL_CHILDREN),
-            _suceedLastApply(true),
-            _srcDirectory(srcDirectory),
-            file3ds(file3ds),
-            _currentStateSet(new osg::StateSet()),
-            _lastGeneratedNumberedName(0),
-            _lastMaterialIndex(0),
-            _lastMeshIndex(0),
-            _cur3dsNode(NULL),
-            options(options),
-            _imageCount(0)
-        {
-            //supportsOption("flipTexture", "flip texture upside-down");
-            if (!fileName.empty())
-                _directory = options->getDatabasePathList().empty() ? osgDB::getFilePath(fileName) : options->getDatabasePathList().front();
-        }
+                        const std::string & srcDirectory);
 
         bool        suceedLastApply() const;
@@ -216 +200 @@
         StateSetStack                       _stateSetStack;
         osg::ref_ptr<osg::StateSet>         _currentStateSet;
-        std::map<std::string, unsigned int> _mapPrefix;
+        std::map<std::string, unsigned int> _mapPrefix;            ///< List of next number to use in unique name generation, for each prefix
         std::set<std::string>                _nameMap;
         MaterialMap                         _materialMap;
-        unsigned int                        _lastGeneratedNumberedName;
         unsigned int                        _lastMaterialIndex;
         unsigned int                        _lastMeshIndex;
@@ -225 +208 @@
         const osgDB::ReaderWriter::Options* options;
         unsigned int                        _imageCount;
+        bool                                _extendedFilePaths;
+        std::set<osg::Image *>              _imageSet;
 };