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

Commented out the Scene Stats entry as its not implemented yet.

Browse Source
This commit is contained in:
Robert Osfield 2007-06-07 20:26:29 +00:00
parent db86ea2d3f
commit 5a8ec8f470
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/osgViewer/ViewerEventHandlers
View File

@ -77,8 +77,7 @@ class OSGVIEWER_EXPORT StatsHandler : public osgGA::GUIEventHandler
NO_STATS = 0, NO_STATS = 0,
FRAME_RATE = 1, FRAME_RATE = 1,
VIEWER_STATS = 2, VIEWER_STATS = 2,
SCENE_STATS = 3, LAST = 3
LAST = 4
}; };
void setKeyEventTogglesOnScreenStats(int key) { _keyEventTogglesOnScreenStats = key; } void setKeyEventTogglesOnScreenStats(int key) { _keyEventTogglesOnScreenStats = key; }

5
src/osgViewer/StatsHandler.cpp
View File

@ -111,12 +111,14 @@ bool StatsHandler::handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdap
_switch->setValue(_viewerChildNum, true); _switch->setValue(_viewerChildNum, true);
break; break;
} }
#if 0
case(SCENE_STATS): case(SCENE_STATS):
{ {
_switch->setValue(_sceneChildNum, true); _switch->setValue(_sceneChildNum, true);
_camera->setNodeMask(0xffffffff); _camera->setNodeMask(0xffffffff);
break; break;
} }
#endif
default: default:
break; break;
} }
@ -672,7 +674,7 @@ void StatsHandler::setUpScene(osgViewer::Viewer* viewer)
} }
} }
#if 0
// scene stats // scene stats
{ {
pos.x() = leftPos; pos.x() = leftPos;
@ -694,6 +696,7 @@ void StatsHandler::setUpScene(osgViewer::Viewer* viewer)
_sceneChildNum = _switch->getNumChildren(); _sceneChildNum = _switch->getNumChildren();
_switch->addChild(geode, false); _switch->addChild(geode, false);
} }
#endif
} }
osg::Node* StatsHandler::createCameraStats(const std::string& font, osg::Vec3& pos, float startBlocks, bool aquireGPUStats, float characterSize, osg::Stats* viewerStats, osg::Camera* camera) osg::Node* StatsHandler::createCameraStats(const std::string& font, osg::Vec3& pos, float startBlocks, bool aquireGPUStats, float characterSize, osg::Stats* viewerStats, osg::Camera* camera)

2
src/osgViewer/Viewer.cpp
View File

@ -594,8 +594,6 @@ struct ViewerDoubleBufferedRenderingOperation : public osg::Operation, public Vi
Viewer::Viewer() Viewer::Viewer()
{ {
constructorInit(); constructorInit();
osg::notify(osg::NOTICE)<<"Here22"<<std::endl;
} }
Viewer::Viewer(osg::ArgumentParser& arguments) Viewer::Viewer(osg::ArgumentParser& arguments)