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

Added <display_broadcast_event> and <dismiss_broadcast_event> support to <timeout> to allow the different timeout statges to be broadcast.

Browse Source
This commit is contained in:
Robert Osfield
2013-01-17 13:51:52 +00:00
parent 7129fce278
commit e7e517f2d0
3 changed files with 101 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1483,6 +1483,24 @@ void ReaderWriterP3DXML::parseTimeout(osgPresentation::SlideShowConstructor& con
timeout->setActionKeyPosition(keyPosition);
}
}
else if (cur->name == "display_broadcast_event")
{
osgPresentation::KeyPosition keyPosition;
if (getKeyPositionInner( cur, keyPosition))
{
OSG_NOTICE<<"display broadcast event ["<<keyPosition._key<<"]"<<std::endl;
timeout->setDisplayBroadcastKeyPosition(keyPosition);
}
}
else if (cur->name == "dismiss_broadcast_event")
{
osgPresentation::KeyPosition keyPosition;
if (getKeyPositionInner( cur, keyPosition))
{
OSG_NOTICE<<"dismiss broadcast event ["<<keyPosition._key<<"]"<<std::endl;
timeout->setDismissBroadcastKeyPosition(keyPosition);
}
}
else if (cur->name == "timeout_broadcast_event")
{
osgPresentation::KeyPosition keyPosition;
@@ -1492,7 +1510,7 @@ void ReaderWriterP3DXML::parseTimeout(osgPresentation::SlideShowConstructor& con
timeout->setActionBroadcastKeyPosition(keyPosition);
}
}
else if (cur->name == "idle_duration_before_timeout")
else if (cur->name == "idle_duration_before_timeout_display")
{
std::istringstream iss(cur->getTrimmedContents());
double duration;
@@ -1503,7 +1521,7 @@ void ReaderWriterP3DXML::parseTimeout(osgPresentation::SlideShowConstructor& con
timeout->setIdleDurationBeforeTimeoutDisplay(duration);
}
}
else if (cur->name == "idle_duration_before_action")
else if (cur->name == "idle_duration_before_timeout_action")
{
std::istringstream iss(cur->getTrimmedContents());
double duration;