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

Moved property code from ImageLayer into Layer where it belongs

Browse Source
This commit is contained in:
Robert Osfield 2009-05-07 18:32:36 +00:00
parent 24c19fa17e
commit 622e7a6611
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,12 +35,6 @@ bool ImageLayer_readLocalData(osg::Object& obj, osgDB::Input &fr)
bool itrAdvanced = false; bool itrAdvanced = false;
osg::ref_ptr<osg::Object> readObject = fr.readObjectOfType(osgDB::type_wrapper<osgVolume::Property>());
if (readObject.valid()) itrAdvanced = true;
osgVolume::Property* property = dynamic_cast<osgVolume::Property*>(readObject.get());
if (property) layer.addProperty(property);
if (fr.matchSequence("file %w") || fr.matchSequence("file %s")) if (fr.matchSequence("file %w") || fr.matchSequence("file %s"))
{ {
std::string filename = fr[1].getStr(); std::string filename = fr[1].getStr();
@ -93,11 +87,6 @@ bool ImageLayer_writeLocalData(const osg::Object& obj, osgDB::Output& fw)
{ {
const osgVolume::ImageLayer& layer = static_cast<const osgVolume::ImageLayer&>(obj); const osgVolume::ImageLayer& layer = static_cast<const osgVolume::ImageLayer&>(obj);
if (layer.getProperty())
{
fw.writeObject(*layer.getProperty());
}
if (!layer.getFileName().empty()) if (!layer.getFileName().empty())
{ {
fw.indent()<<"file "<< layer.getFileName() << std::endl; fw.indent()<<"file "<< layer.getFileName() << std::endl;

19
src/osgPlugins/osgVolume/Layer.cpp
View File

@ -34,23 +34,34 @@ bool Layer_readLocalData(osg::Object& obj, osgDB::Input &fr)
osgVolume::Layer& layer = static_cast<osgVolume::Layer&>(obj); osgVolume::Layer& layer = static_cast<osgVolume::Layer&>(obj);
bool itrAdvanced = false; bool itrAdvanced = false;
osg::ref_ptr<osg::Object> readObject = fr.readObjectOfType(osgDB::type_wrapper<osgVolume::Locator>()); osg::ref_ptr<osg::Object> readObject = fr.readObjectOfType(osgDB::type_wrapper<osgVolume::Locator>());
osgVolume::Locator* locator = dynamic_cast<osgVolume::Locator*>(readObject.get()); osgVolume::Locator* locator = dynamic_cast<osgVolume::Locator*>(readObject.get());
if (locator) layer.setLocator(locator); if (locator) layer.setLocator(locator);
readObject = fr.readObjectOfType(osgDB::type_wrapper<osgVolume::Property>());
if (readObject.valid()) itrAdvanced = true;
osgVolume::Property* property = dynamic_cast<osgVolume::Property*>(readObject.get());
if (property) layer.addProperty(property);
return itrAdvanced; return itrAdvanced;
} }
bool Layer_writeLocalData(const osg::Object& obj, osgDB::Output& fw) bool Layer_writeLocalData(const osg::Object& obj, osgDB::Output& fw)
{ {
const osgVolume::Layer& layer = static_cast<const osgVolume::Layer&>(obj); const osgVolume::Layer& layer = static_cast<const osgVolume::Layer&>(obj);
if (layer.getLocator()) if (layer.getLocator())
{ {
fw.writeObject(*layer.getLocator()); fw.writeObject(*layer.getLocator());
} }
if (layer.getProperty())
{
fw.writeObject(*layer.getProperty());
}
return true; return true;
} }