diff --git a/include/osgViewer/ViewerEventHandlers b/include/osgViewer/ViewerEventHandlers index a17c8f737..4c67808bc 100644 --- a/include/osgViewer/ViewerEventHandlers +++ b/include/osgViewer/ViewerEventHandlers @@ -77,8 +77,7 @@ class OSGVIEWER_EXPORT StatsHandler : public osgGA::GUIEventHandler NO_STATS = 0, FRAME_RATE = 1, VIEWER_STATS = 2, - SCENE_STATS = 3, - LAST = 4 + LAST = 3 }; void setKeyEventTogglesOnScreenStats(int key) { _keyEventTogglesOnScreenStats = key; } diff --git a/src/osgViewer/StatsHandler.cpp b/src/osgViewer/StatsHandler.cpp index baccaf5d7..f80ff0f68 100644 --- a/src/osgViewer/StatsHandler.cpp +++ b/src/osgViewer/StatsHandler.cpp @@ -111,12 +111,14 @@ bool StatsHandler::handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdap _switch->setValue(_viewerChildNum, true); break; } +#if 0 case(SCENE_STATS): { _switch->setValue(_sceneChildNum, true); _camera->setNodeMask(0xffffffff); break; } +#endif default: break; } @@ -672,7 +674,7 @@ void StatsHandler::setUpScene(osgViewer::Viewer* viewer) } } - +#if 0 // scene stats { pos.x() = leftPos; @@ -694,6 +696,7 @@ void StatsHandler::setUpScene(osgViewer::Viewer* viewer) _sceneChildNum = _switch->getNumChildren(); _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) diff --git a/src/osgViewer/Viewer.cpp b/src/osgViewer/Viewer.cpp index 78ab3c719..835106641 100644 --- a/src/osgViewer/Viewer.cpp +++ b/src/osgViewer/Viewer.cpp @@ -594,8 +594,6 @@ struct ViewerDoubleBufferedRenderingOperation : public osg::Operation, public Vi Viewer::Viewer() { constructorInit(); - - osg::notify(osg::NOTICE)<<"Here22"<