Clean up to the osgProducer lib and demo.

include/osgGA/KeySwitchCameraManipulator

@@ -45,6 +45,11 @@ public:
 	*/
         void addNumberedCameraManipulator(CameraManipulator *cm);
 
+        unsigned int getNumCameraManipualtors() const { return _manips.size(); }
+
+        void selectCameraManipulator(unsigned int num);
+
+
         CameraManipulator* getCurrentCameraManipulator() { return _current.get(); }
 
         const CameraManipulator* getCurrentCameraManipulator() const { return _current.get(); }

include/osgProducer/ReadCameraConfigFile

@@ -1,32 +0,0 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2003 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 OSGDB_READCAMERACONDIGFILE
-#define OSGDB_READCAMERACONDIGFILE 1
-
-#include <Producer/CameraConfig>
-
-#include <osgProducer/Export>
-
-#include <string>
-
-namespace osgProducer {
-
-/** Read a Producer::CameraConfig from file. 
-  * Return valid Producer::CameraConfig on success,
-  * return NULL on failure.*/
-extern OSGPRODUCER_EXPORT Producer::CameraConfig* readCameraConfigFile(const std::string& filename);
-
-}
-
-#endif

include/osgProducer/Viewer

@@ -38,14 +38,9 @@ class OSGPRODUCER_EXPORT Viewer : public CameraGroup, public osgGA::GUIActionAda
 
         Viewer(const std::string& configFile);
 
-        Viewer(int& argc, char** argv);
-
         virtual ~Viewer() {}
 
 
-        bool readCommandLine(int& argc, char** argv);
-
-
         enum ViewerOptions
         {
             TRACKBALL_MANIPULATOR   = 1,
@@ -69,9 +64,6 @@ class OSGPRODUCER_EXPORT Viewer : public CameraGroup, public osgGA::GUIActionAda
 
         virtual void update();
 
-        typedef std::list< osg::ref_ptr<osgGA::GUIEventHandler> > EventHandlerList;
-
-        EventHandlerList& getEventHandlerList() { return _eventHandlerList; }
         
         virtual void realize( ThreadingModel thread_model= SingleThreaded );
 
@@ -79,6 +71,13 @@ class OSGPRODUCER_EXPORT Viewer : public CameraGroup, public osgGA::GUIActionAda
         virtual void requestContinuousUpdate(bool) {}
         virtual void requestWarpPointer(int x,int y);
 
+        typedef std::list< osg::ref_ptr<osgGA::GUIEventHandler> > EventHandlerList;
+        EventHandlerList& getEventHandlerList() { return _eventHandlerList; }
+
+        unsigned int addCameraManipulator(osgGA::CameraManipulator* cm);
+        void selectCameraManipulator(unsigned int no);
+
+
     protected :
 
 

include/osgProducer/WriteCameraConfigFile

@@ -1,32 +0,0 @@
-/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2003 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 OSGDB_WRITECAMERACONDIGFILE
-#define OSGDB_WRITECAMERACONDIGFILE 1
-
-#include <Producer/CameraConfig>
-
-#include <osgProducer/Export>
-
-#include <string>
-
-namespace osgProducer {
-
-/** Write a Producer::CameraConfig to file. 
-  * Return true on success,
-  * return false on failure.*/
-extern OSGPRODUCER_EXPORT bool writeCameraConfigFile(const Producer::CameraConfig& cameraconfig, const std::string& filename);
-
-}
-
-#endif