Added osgViewer::HelpHandler

include/osg/ApplicationUsage

@@ -14,7 +14,7 @@
 #ifndef OSG_APPLICATIONUSAGE
 #define OSG_APPLICATIONUSAGE 1
 
-#include <osg/Export>
+#include <osg/Referenced>
 
 #include <map>
 #include <string>
@@ -22,7 +22,7 @@
 
 namespace osg {
 
-class OSG_EXPORT ApplicationUsage
+class OSG_EXPORT ApplicationUsage : public osg::Referenced
 {
     public:
         
@@ -88,6 +88,8 @@ class OSG_EXPORT ApplicationUsage
 
     protected:
     
+        virtual ~ApplicationUsage() {}
+
         std::string _applicationName;
         std::string _description;
         std::string _commandLineUsage;

include/osg/ArgumentParser

@@ -15,6 +15,8 @@
 #define OSG_ARGUMENTPARSER 1
 
 #include <osg/Export>
+#include <osg/ref_ptr>
+#include <osg/ApplicationUsage>
 
 #include <map>
 #include <string>
@@ -22,9 +24,6 @@
 
 namespace osg {
 
-// forward declare
-class ApplicationUsage;
-
 class OSG_EXPORT ArgumentParser
 {
     public:
@@ -89,8 +88,8 @@ class OSG_EXPORT ArgumentParser
         ArgumentParser(int* argc,char **argv);
 
         void setApplicationUsage(ApplicationUsage* usage) { _usage = usage; }
-        ApplicationUsage* getApplicationUsage() { return _usage; }
-        const ApplicationUsage* getApplicationUsage() const { return _usage; }
+        ApplicationUsage* getApplicationUsage() { return _usage.get(); }
+        const ApplicationUsage* getApplicationUsage() const { return _usage.get(); }
 
         /** Return the argument count. */
         int& argc() { return *_argc; }
@@ -187,10 +186,10 @@ class OSG_EXPORT ArgumentParser
   
   protected:
         
-        int*                _argc;
-        char**              _argv;
-        ErrorMessageMap     _errorMessageMap;
-        ApplicationUsage*   _usage;
+        int*                            _argc;
+        char**                          _argv;
+        ErrorMessageMap                 _errorMessageMap;
+        ref_ptr<ApplicationUsage>       _usage;
         
 };
 

include/osgViewer/HelpHandler

@@ -0,0 +1,59 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield 
+ *
+ * This library is open source and may be redistributed and/or modified under  
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or 
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ * 
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * OpenSceneGraph Public License for more details.
+*/
+
+#ifndef OSGVIEWER_HELPHANDLER
+#define OSGVIEWER_HELPHANDLER 1
+
+#include <osgViewer/Viewer>
+
+#include <osg/ApplicationUsage>
+
+namespace osgViewer {
+
+class OSGVIEWER_EXPORT HelpHandler : public osgGA::GUIEventHandler 
+{
+    public: 
+
+        HelpHandler(osg::ApplicationUsage* au=0);
+        
+        void setApplicationUsage(osg::ApplicationUsage* au) { _applicationUsage = au; }
+        osg::ApplicationUsage* getApplicationUsage() { return _applicationUsage.get(); }
+        const osg::ApplicationUsage* getApplicationUsage() const { return _applicationUsage.get(); }
+
+        void setKeyEventTogglesOnScreenHelp(int key) { _keyEventTogglesOnScreenHelp = key; }
+        int getKeyEventTogglesOnScreenHelp() const { return _keyEventTogglesOnScreenHelp; }
+        
+        bool handle(const osgGA::GUIEventAdapter& ea, osgGA::GUIActionAdapter& aa);
+
+        /** Get the keyboard and mouse usage of this manipulator.*/
+        virtual void getUsage(osg::ApplicationUsage& usage) const;
+
+    protected:
+
+        void setUpHUDCamera(osgViewer::Viewer* viewer);
+
+        void setUpScene(osgViewer::Viewer* viewer);
+        
+        osg::ref_ptr<osg::ApplicationUsage> _applicationUsage;
+
+        int                                 _keyEventTogglesOnScreenHelp;
+
+        bool                                _helpEnabled;
+        osg::ref_ptr<osg::Camera>           _camera;
+        osg::ref_ptr<osg::Switch>           _switch;
+        
+};
+
+}
+
+#endif

include/osgViewer/StatsHandler

@@ -45,6 +45,9 @@ class OSGVIEWER_EXPORT StatsHandler : public osgGA::GUIEventHandler
 
         double getBlockMultiplier() const { return _blockMultiplier; }
 
+        /** Get the keyboard and mouse usage of this manipulator.*/
+        virtual void getUsage(osg::ApplicationUsage& usage) const;
+
     protected:
 
         void setUpHUDCamera(osgViewer::Viewer* viewer);

include/osgViewer/Viewer

@@ -161,6 +161,9 @@ class OSGVIEWER_EXPORT Viewer : public osgViewer::View
         /** Set up the Operations to render the various viewer cameras on the viewers graphics windows.*/
         void setUpRenderingSupport();
 
+        /** Get the keyboard and mouse usage of this viewer.*/
+        virtual void getUsage(osg::ApplicationUsage& usage) const;
+
     protected:
     
         void checkWindowStatus();