Show
Ignore:
Timestamp:
01/27/10 18:09:05 (5 years ago)
Author:
robert
Message:

From Wang Rui, "Changes:

1. Rewrite the reading/writing exception handlers to work like the ive
plugin exceptions.
2. Write a header writing/checking function in ReaderWriterOSG2.cpp,
which may help decide if the stream is ascii or binary. The
readInputIterator() function will return null pointer if the input
file is nither osgb nor osgt format, which indicates that the old .osg
format could be used here, in case we've merged the two plugins
together.
3. Add a new ForceReadingImage? option in the InputStream?, which will
allocate an empty image object with the filename if specifed external
image file is missed. It may be useful for format converting in some
cases.
4. Add new osgParticle wrappers, as well as some modification to the
osgParticle headers, for instance, change isEnabled() to getEnabled().
5. Some fixes to the osg serialization wrappers."

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgDB/ObjectWrapper.cpp

    r10982 r11018  
    449449            return findWrapper(name); 
    450450 
    451         std::string pluginLib = osgDB::Registry::instance()->createLibraryNameForExtension(libName); 
     451        std::string pluginLib = osgDB::Registry::instance()->createLibraryNameForExtension(std::string("serializers_")+libName); 
     452        if ( osgDB::Registry::instance()->loadLibrary(pluginLib)==osgDB::Registry::LOADED ) 
     453            return findWrapper(name); 
     454 
     455        pluginLib = osgDB::Registry::instance()->createLibraryNameForExtension(libName); 
    452456        if ( osgDB::Registry::instance()->loadLibrary(pluginLib)==osgDB::Registry::LOADED ) 
    453457            return findWrapper(name); 
     
    492496            return findCompressor(name); 
    493497 
    494         std::string pluginLib = osgDB::Registry::instance()->createLibraryNameForExtension(libName); 
     498        std::string pluginLib = osgDB::Registry::instance()->createLibraryNameForExtension(std::string("compressor_")+libName); 
    495499        if ( osgDB::Registry::instance()->loadLibrary(pluginLib)==osgDB::Registry::LOADED ) 
    496500            return findCompressor(name); 
     501 
     502        pluginLib = osgDB::Registry::instance()->createLibraryNameForExtension(libName); 
     503        if ( osgDB::Registry::instance()->loadLibrary(pluginLib)==osgDB::Registry::LOADED ) 
     504            return findCompressor(name); 
    497505    } 
    498506    return NULL;