FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed handling of files with event callbacks on them.

Browse Source
This commit is contained in:
Robert Osfield
2009-01-29 17:19:47 +00:00
parent 04631ff9ae
commit 4c75313ced
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgPlugins/osgVolume/ImageLayer.cpp
View File

@@ -65,7 +65,7 @@ bool ImageLayer_readLocalData(osg::Object& obj, osgDB::Input &fr)
image = osgDB::readRefImageFile( filename );
}
osg::notify(osg::NOTICE)<<"image "<<filename<<" pixelFormat "<<std::hex<<image->getPixelFormat()<<" textureFormat "<<image->getInternalTextureFormat()<<" dataType "<<image->getDataType()<<std::endl;
osg::notify(osg::INFO)<<"osgVolume::ImageLyaer image read: "<<filename<<" pixelFormat "<<std::hex<<image->getPixelFormat()<<" textureFormat "<<image->getInternalTextureFormat()<<" dataType "<<image->getDataType()<<std::endl;
if (image.valid())
{

21
src/osgPlugins/osgVolume/VolumeTile.cpp
View File

@@ -124,16 +124,12 @@ bool VolumeTile_readLocalData(osg::Object& obj, osgDB::Input &fr)
osgVolume::Locator* locator = dynamic_cast<osgVolume::Locator*>(readObject.get());
if (locator) volumeTile.setLocator(locator);
{
osg::ref_ptr<osg::Object> readObject = fr.readObjectOfType(osgDB::type_wrapper<osgVolume::Layer>());
osgVolume::Layer* readLayer = dynamic_cast<osgVolume::Layer*>(readObject.get());
if (readLayer)
{
volumeTile.setLayer(readLayer);
}
itrAdvanced = true;
}
readObject = fr.readObjectOfType(osgDB::type_wrapper<osgVolume::Layer>());
if (readObject.valid()) itrAdvanced = true;
osgVolume::Layer* readLayer = dynamic_cast<osgVolume::Layer*>(readObject.get());
if (readLayer) volumeTile.setLayer(readLayer);
readObject = fr.readObjectOfType(osgDB::type_wrapper<osgVolume::VolumeTechnique>());
@@ -158,12 +154,9 @@ bool VolumeTile_writeLocalData(const osg::Object& obj, osgDB::Output& fw)
fw.writeObject(*volumeTile.getLocator());
}
if (volumeTile.getLayer())
{
const osgVolume::Layer* layer = volumeTile.getLayer();
if (layer)
{
fw.writeObject(*layer);
}
fw.writeObject(*volumeTile.getLayer());
}
if (volumeTile.getVolumeTechnique())