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

Refactored the click_to_run implementation to avoid bug associated with running the first click_to_run entry in a layer when

Browse Source 
subsequent click to run's are called.
This commit is contained in:
Robert Osfield
2012-01-24 14:27:17 +00:00
parent 76b1c8e20e
commit 6aa6e9a38c
2 changed files with 47 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/osgPresentation/SlideShowConstructor
View File

@@ -387,6 +387,8 @@ public:
void layerClickToDoOperation(const std::string& command, Operation operation, bool relativeJump=true, int slideNum=0, int layerNum=0);
void layerClickEventOperation(const KeyPosition& keyPos, bool relativeJump=true, int slideNum=0, int layerNum=0);
void addToCurrentLayer(osg::Node* subgraph);
void addBullet(const std::string& bullet, PositionData& positionData, FontData& fontData);
void addParagraph(const std::string& paragraph, PositionData& positionData, FontData& fontData);
@@ -511,6 +513,10 @@ protected:
osg::ref_ptr<FilePathData> _filePathData;
osg::ref_ptr<osg::Group> _layerToApplyEventCallbackTo;
osg::ref_ptr<osgGA::GUIEventHandler> _currentEventCallbackToApply;
std::string findFileAndRecordPath(const std::string& filename);
void recordOptionsFilePath(const osgDB::Options* options);

126
src/osgPresentation/SlideShowConstructor.cpp
View File

@@ -190,6 +190,9 @@ SlideShowConstructor::SlideShowConstructor(osgDB::Options* options):
_autoSteppingActive = false;
_slideBackgroundAsHUD = false;
_layerToApplyEventCallbackTo = 0;
_currentEventCallbackToApply = 0;
}
void SlideShowConstructor::setPresentationAspectRatio(float aspectRatio)
@@ -436,11 +439,11 @@ void SlideShowConstructor::addLayer(bool inheritPreviousLayers, bool defineAsBas
{
HUDTransform* hudTransform = new HUDTransform(_hudSettings.get());
hudTransform->addChild(background);
_currentLayer->addChild(hudTransform);
addToCurrentLayer(hudTransform);
}
else
{
_currentLayer->addChild(background);
addToCurrentLayer(background);
}
}
@@ -466,7 +469,7 @@ void SlideShowConstructor::addLayer(bool inheritPreviousLayers, bool defineAsBas
geode->addDrawable(text);
_currentLayer->addChild(decorateSubgraphForPosition(geode, _titlePositionData));
addToCurrentLayer(decorateSubgraphForPosition(geode, _titlePositionData));
}
}
@@ -475,7 +478,7 @@ void SlideShowConstructor::addLayer(bool inheritPreviousLayers, bool defineAsBas
// copy previous layer's children across into new layer.
for(unsigned int i=0;i<_previousLayer->getNumChildren();++i)
{
_currentLayer->addChild(_previousLayer->getChild(i));
addToCurrentLayer(_previousLayer->getChild(i));
}
}
@@ -517,90 +520,53 @@ void SlideShowConstructor::setLayerDuration(double duration)
}
}
void SlideShowConstructor::layerClickToDoOperation(Operation operation, bool relativeJump, int slideNum, int layerNum)
void SlideShowConstructor::addToCurrentLayer(osg::Node* subgraph)
{
if (!_currentLayer) addLayer();
if (!subgraph) return;
if (_currentLayer.valid())
if (!_currentLayer) addLayer();
if (_currentEventCallbackToApply.valid())
{
if (_previousLayer==_currentLayer)
if (subgraph->getEventCallback()==0)
{
if (_currentLayer->getNumChildren()>0)
if (_layerToApplyEventCallbackTo==0 || _currentLayer==_layerToApplyEventCallbackTo)
{
OSG_INFO<<"creating new group within layer"<<std::endl;
osg::Group* group = new osg::Group;
_currentLayer->addChild(group);
_currentLayer = group;
OSG_INFO<<"Assigning event callback."<<std::endl;
subgraph->setEventCallback(_currentEventCallbackToApply.get());
}
else
{
OSG_INFO<<"Ignoring event callback from previous layer."<<std::endl;
}
}
else
{
OSG_INFO<<"creating secondary group within layer"<<std::endl;
osg::Group* group = new osg::Group;
_previousLayer->addChild(group);
_currentLayer = group;
}
_currentLayer->setEventCallback(new PickEventHandler(operation, relativeJump, slideNum, layerNum));
OSG_NOTICE<<"Warning: subgraph already has event callback assigned, cannot add second event callback."<<std::endl;
}
_currentEventCallbackToApply = 0;
}
_currentLayer->addChild(subgraph);
}
void SlideShowConstructor::layerClickToDoOperation(Operation operation, bool relativeJump, int slideNum, int layerNum)
{
_layerToApplyEventCallbackTo = _currentLayer;
_currentEventCallbackToApply = new PickEventHandler(operation, relativeJump, slideNum, layerNum);
}
void SlideShowConstructor::layerClickToDoOperation(const std::string& command, Operation operation, bool relativeJump, int slideNum, int layerNum)
{
if (!_currentLayer) addLayer();
if (_currentLayer.valid())
{
if (_previousLayer==_currentLayer)
{
if (_currentLayer->getNumChildren()>0)
{
OSG_INFO<<"creating new group within layer"<<std::endl;
osg::Group* group = new osg::Group;
_currentLayer->addChild(group);
_currentLayer = group;
}
}
else
{
OSG_INFO<<"creating secondary group within layer"<<std::endl;
osg::Group* group = new osg::Group;
_previousLayer->addChild(group);
_currentLayer = group;
}
_currentLayer->setEventCallback(new PickEventHandler(command, operation, relativeJump, slideNum, layerNum));
}
{
_layerToApplyEventCallbackTo = _currentLayer;
_currentEventCallbackToApply = new PickEventHandler(command, operation, relativeJump, slideNum, layerNum);
}
void SlideShowConstructor::layerClickEventOperation(const KeyPosition& keyPos, bool relativeJump, int slideNum, int layerNum)
{
if (!_currentLayer) addLayer();
if (_currentLayer.valid())
{
if (_previousLayer==_currentLayer)
{
if (_currentLayer->getNumChildren()>0)
{
OSG_INFO<<"creating new group within layer"<<std::endl;
osg::Group* group = new osg::Group;
_currentLayer->addChild(group);
_currentLayer = group;
}
}
else
{
OSG_INFO<<"creating secondary group within layer"<<std::endl;
osg::Group* group = new osg::Group;
_previousLayer->addChild(group);
_currentLayer = group;
}
_currentLayer->setEventCallback(new PickEventHandler(keyPos, relativeJump, slideNum, layerNum));
}
_layerToApplyEventCallbackTo = _currentLayer;
_currentEventCallbackToApply = new PickEventHandler(keyPos, relativeJump, slideNum, layerNum);
}
@@ -638,8 +604,6 @@ osg::Node* SlideShowConstructor::decorateSubgraphForPosition(osg::Node* node, Po
void SlideShowConstructor::addBullet(const std::string& bullet, PositionData& positionData, FontData& fontData)
{
if (!_currentLayer) addLayer();
osg::Geode* geode = new osg::Geode;
osgText::Text* text = new osgText::Text;
@@ -677,7 +641,7 @@ void SlideShowConstructor::addBullet(const std::string& bullet, PositionData& po
geode->addDrawable(text);
_currentLayer->addChild( decorateSubgraphForPosition(geode, positionData) );
addToCurrentLayer( decorateSubgraphForPosition(geode, positionData) );
bool needToApplyPosition = (_textPositionData.position == positionData.position);
if (needToApplyPosition)
@@ -688,8 +652,6 @@ void SlideShowConstructor::addBullet(const std::string& bullet, PositionData& po
void SlideShowConstructor::addParagraph(const std::string& paragraph, PositionData& positionData, FontData& fontData)
{
if (!_currentLayer) addLayer();
osg::Geode* geode = new osg::Geode;
osg::Vec3 localPosition = computePositionInModelCoords(positionData);
@@ -726,7 +688,7 @@ void SlideShowConstructor::addParagraph(const std::string& paragraph, PositionDa
geode->addDrawable(text);
_currentLayer->addChild( decorateSubgraphForPosition(geode, positionData) );
addToCurrentLayer( decorateSubgraphForPosition(geode, positionData) );
bool needToApplyPosition = (_textPositionData.position == positionData.position);
if (needToApplyPosition)
@@ -877,8 +839,6 @@ osg::Geometry* SlideShowConstructor::createTexturedQuadGeometry(const osg::Vec3&
void SlideShowConstructor::addImage(const std::string& filename, const PositionData& positionData, const ImageData& imageData)
{
if (!_currentLayer) addLayer();
osg::ref_ptr<osgDB::Options> options = _options;
if (!imageData.options.empty())
{
@@ -1016,13 +976,11 @@ void SlideShowConstructor::addImage(const std::string& filename, const PositionD
subgraph = hudTransform;
}
_currentLayer->addChild(subgraph);
addToCurrentLayer(subgraph);
}
void SlideShowConstructor::addStereoImagePair(const std::string& filenameLeft, const ImageData& imageDataLeft, const std::string& filenameRight, const ImageData& imageDataRight,const PositionData& positionData)
{
if (!_currentLayer) addLayer();
osg::ref_ptr<osgDB::Options> optionsLeft = _options;
if (!imageDataLeft.options.empty())
{
@@ -1226,7 +1184,7 @@ void SlideShowConstructor::addStereoImagePair(const std::string& filenameLeft, c
subgraph = hudTransform;
}
_currentLayer->addChild(subgraph);
addToCurrentLayer(subgraph);
}
void SlideShowConstructor::addGraph(const std::string& contents, const PositionData& positionData, const ImageData& imageData)
@@ -1345,8 +1303,6 @@ public:
osg::Image* SlideShowConstructor::addInteractiveImage(const std::string& filename, const PositionData& positionData, const ImageData& imageData)
{
if (!_currentLayer) addLayer();
osg::ref_ptr<osgDB::Options> options = _options;
if (!imageData.options.empty())
{
@@ -1468,7 +1424,7 @@ osg::Image* SlideShowConstructor::addInteractiveImage(const std::string& filenam
subgraph = hudTransform;
}
_currentLayer->addChild(subgraph);
addToCurrentLayer(subgraph);
osgWidget::PdfImage* pdfImage = dynamic_cast<osgWidget::PdfImage*>(image);
if (pdfImage && imageData.page>=0)
@@ -1723,7 +1679,7 @@ void SlideShowConstructor::addModel(osg::Node* subgraph, const PositionData& pos
findImageStreamsAndAddCallbacks(subgraph);
_currentLayer->addChild(subgraph);
addToCurrentLayer(subgraph);
}
class DraggerVolumeTileCallback : public osgManipulator::DraggerCallback