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

Added support for <properties> tag for <presentation>, <slide> and <layer> scope to compliment the scope of <property_animation>

Browse Source
This commit is contained in:
Robert Osfield
2012-11-27 16:00:43 +00:00
parent 42529ca415
commit 694e603d15
1 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/osgPlugins/p3d/ReaderWriterP3D.cpp
View File

@@ -1662,6 +1662,18 @@ void ReaderWriterP3DXML::parseLayer(osgPresentation::SlideShowConstructor& const
constructor.addPropertyAnimation(osgPresentation::SlideShowConstructor::CURRENT_LAYER, pa.get());
}
}
else if (cur->name == "properties")
{
if (!constructor.getCurrentLayer()) constructor.addLayer();
if (constructor.getCurrentLayer())
{
osg::ref_ptr<osg::UserDataContainer> udc = constructor.getCurrentLayer()->getOrCreateUserDataContainer();
if (parseProperties(cur, *udc))
{
OSG_NOTICE<<"Assigned properties to Layer"<<std::endl;
}
}
}
else if (getKeyPosition(cur, keyPosition))
{
constructor.addLayerKey(keyPosition);
@@ -1936,6 +1948,18 @@ void ReaderWriterP3DXML::parseSlide (osgPresentation::SlideShowConstructor& cons
constructor.addPropertyAnimation(osgPresentation::SlideShowConstructor::CURRENT_SLIDE, pa.get());
}
}
else if (cur->name == "properties")
{
if (!constructor.getCurrentSlide()) constructor.addSlide();
if (constructor.getCurrentSlide())
{
osg::ref_ptr<osg::UserDataContainer> udc = constructor.getCurrentSlide()->getOrCreateUserDataContainer();
if (parseProperties(cur, *udc))
{
OSG_NOTICE<<"Assigned properties to Slide"<<std::endl;
}
}
}
else if (getKeyPosition(cur, keyPosition))
{
constructor.addSlideKey(keyPosition);
@@ -2640,6 +2664,18 @@ osg::Node* ReaderWriterP3DXML::parseXmlGraph(osgDB::XmlNode* root, bool readOnly
constructor.addPropertyAnimation(osgPresentation::SlideShowConstructor::CURRENT_PRESENTATION, pa.get());
}
}
else if (!readOnlyHoldingPage && cur->name == "properties")
{
if (!constructor.getPresentationSwitch()) constructor.createPresentation();
if (constructor.getPresentationSwitch())
{
osg::ref_ptr<osg::UserDataContainer> udc = constructor.getPresentationSwitch()->getOrCreateUserDataContainer();
if (parseProperties(cur, *udc))
{
OSG_NOTICE<<"Assigned properties to Presentation"<<std::endl;
}
}
}
}
osgDB::getDataFilePathList() = previousPaths;