Introduced osgViewer::Config base class and beginnigs of various Config implementations.

Introduced osgViewer serializers plugin for serialization support for osgViewer::Config implementations and Keystone

include/osgViewer/Config

@@ -0,0 +1,262 @@
+/* -*-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_CONFIG
+#define OSGVIEWER_CONFIG 1
+
+#include <osg/Object>
+#include <osgViewer/Export>
+
+namespace osgViewer {
+
+// forward declare
+class View;
+    
+/** Config base class for encapsulating view configuration.*/
+class Config : public osg::Object
+{
+    public:
+
+        Config() {}
+
+        Config(const Config& rhs, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY) : osg::Object(rhs,copyop) {}
+
+        META_Object(osgViewer,Config);
+        
+        /** configure method that is overridden by Config subclasses.*/
+        virtual void configure(osgViewer::View& /*view*/) const {}
+};
+
+class OSGVIEWER_EXPORT ViewAcrossAllScreens : public Config
+{
+    public:
+        
+        ViewAcrossAllScreens() {}
+        ViewAcrossAllScreens(const ViewAcrossAllScreens& rhs, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY): Config(rhs,copyop) {}
+        
+        META_Object(osgViewer,ViewAcrossAllScreens);
+        
+        /** configure method that is overridden by Config subclasses.*/
+        virtual void configure(osgViewer::View& view) const;
+};
+
+/** single camera on a single window.*/
+class OSGVIEWER_EXPORT ViewInWindow : public Config
+{
+    public:
+        
+        ViewInWindow():_x(0),_y(0),_width(-1),_height(-1),_screenNum(0) {}
+        ViewInWindow(int x, int y, int width, int height, unsigned int screenNum=0):_x(x),_y(y),_width(width),_height(height),_screenNum(screenNum) {}
+        ViewInWindow(const ViewInWindow& rhs, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY):Config(rhs,copyop), _x(rhs._x),_y(rhs._y),_width(rhs._width),_height(rhs._height),_screenNum(rhs._screenNum) {}
+        
+        META_Object(osgViewer,ViewInWindow);
+        
+        /** configure method that is overridden by Config subclasses.*/
+        virtual void configure(osgViewer::View& view) const;
+        
+        void setX(int x) { _x = x; }
+        int getX() const { return _x; }
+        
+        void setY(int y) { _y = y; }
+        int getY() const { return _y; }
+        
+        void setWidth(int w) { _width = w; }
+        int getWidth() const { return _width; }
+
+        void setHeight(int h) { _height = h; }
+        int getHeight() const { return _height; }
+
+        void setScreenNum(unsigned int sn) { _screenNum = sn; }
+        unsigned int getScreenNum() const { return _screenNum; }
+        
+    protected:
+        
+        int _x, _y, _width, _height;
+        unsigned int _screenNum;
+};
+
+#if 0
+
+/** single camera associated with a single full screen GraphicsWindow.*/
+class OSGVIEWER_EXPORT ViewOnSingleScreen : public Config
+{
+    public:
+        
+        ViewOnSingleScreen(unsigned int screenNum=0);
+        ViewOnSingleScreen(const ViewOnSingleScreen& rhs, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
+        
+        META_Object(osgViewer,ViewOnSingleScreen);
+        
+        /** configure method that is overridden by Config subclasses.*/
+        virtual void configure(osgViewer::View& view);
+
+        void setScreenNum(int sn) { _screenNum = sn; }
+        int getScreenNum() const { return _screenNum; }
+        
+    protected:
+        
+        unsigned int _screenNum;
+};
+
+/** spherical display using 6 slave cameras rendering the 6 sides of a cube map, and 7th camera doing distortion correction to present on a spherical display.*/
+class OSGVIEWER_EXPORT ViewFor3DSphericalDisplay : public Config
+{
+    public:
+        
+        ViewFor3DSphericalDisplay(double radius=1.0, double collar=0.45, unsigned int screenNum=0, osg::Image* intensityMap=0, const osg::Matrixd& projectorMatrix = osg::Matrixd());
+        ViewFor3DSphericalDisplay(const ViewFor3DSphericalDisplay& rhs, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
+        
+        META_Object(osgViewer,ViewOnSingleScreen);
+        
+        /** configure method that is overridden by Config subclasses.*/
+        virtual void configure(osgViewer::View& view);
+        
+        void setRadius(double r) { _radius = r; }
+        double getRadius() const { return _radius; }
+        
+        void setCollar(double r) { _collar = r; }
+        double getCollar() const { return _collar; }
+        
+        void setScreenNum(unsigned int n) { _screenNum = n; }
+        unsigned int getScreenNum() const { return _screenNum; }
+        
+        void setIntensityMap(osg::Image* im) { _intensityMap = im; }
+        osg::Image* getIntensityMap() const { return _intensityMap; }
+        
+        void setProjectionMatrix(const osg::Matrixd& m) { _intensityMap = m; }
+        osg::Matrixd& getIntensityMap() const { return _intensityMap; }
+        
+    protected:
+        
+        double _radius;
+        double _collar;
+        unsigned int _screenNum;
+        osg::ref_ref<osg::Image> _intensityMap;
+        const osg::Matrixd _projectorMatrix;
+};
+
+/** spherical display by rendering main scene to a panoramic 2:1 texture and then doing distortion correction to present onto a spherical display.*/
+class OSGVIEWER_EXPORT ViewForPanoramicSphericalDisplay : public Config
+{
+    public:
+        
+        ViewForPanoramicSphericalDisplay(double radius=1.0, double collar=0.45, unsigned int screenNum=0, osg::Image* intensityMap=0, const osg::Matrixd& projectorMatrix = osg::Matrixd());
+        ViewForPanoramicSphericalDisplay(const ViewForPanoramicSphericalDisplay& rhs, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
+        
+        META_Object(osgViewer,ViewOnSingleScreen);
+        
+        /** configure method that is overridden by Config subclasses.*/
+        virtual void configure(osgViewer::View& view);
+        
+        void setRadius(double r) { _radius = r; }
+        double getRadius() const { return _radius; }
+        
+        void setCollar(double r) { _collar = r; }
+        double getCollar() const { return _collar; }
+        
+        void setScreenNum(unsigned int n) { _screenNum = n; }
+        unsigned int getScreenNum() const { return _screenNum; }
+        
+        void setIntensityMap(osg::Image* im) { _intensityMap = im; }
+        osg::Image* getIntensityMap() const { return _intensityMap; }
+        
+        void setProjectionMatrix(const osg::Matrixd& m) { _intensityMap = m; }
+        osg::Matrixd& getIntensityMap() const { return _intensityMap; }
+        
+    protected:
+        
+        double _radius;
+        double _collar;
+        unsigned int _screenNum;
+        osg::ref_ref<osg::Image> _intensityMap;
+        const osg::Matrixd _projectorMatrix;
+};
+
+/** autostereoscopic Philips WoWvx display.*/
+class OSGVIEWER_EXPORT ViewForWoWVxDisplay : public Config
+{
+    public:
+        
+        ViewForWoWVxDisplay();
+        ViewForWoWVxDisplay(unsigned int screenNum, unsigned char wow_content, unsigned char wow_factor, unsigned char wow_offset, float wow_disparity_Zd, float wow_disparity_vz, float wow_disparity_M, float wow_disparity_C);
+        ViewForWoWVxDisplay(const ViewForWoWVxDisplay& rhs, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
+        
+        META_Object(osgViewer,ViewForWoWVxDisplay);
+        
+        /** configure method that is overridden by Config subclasses.*/
+        virtual void configure(osgViewer::View& view);
+        
+        void setScreenNum(unsigned int n) { _screenNum = n; }
+        unsigned int getScreenNum() const { return _screenNum; }
+
+        void set(unsigned char c) { _wow_content = c; }
+        double get() const { return _wow_content; }
+
+        void set(unsigned char c) { _wow_factor = c; }
+        double get() const { return _wow_factor; }
+
+        void set(unsigned char c) { _wow_offset = c; }
+        double get() const { return _wow_offset; }
+
+        void setWowDisparityZD(float c) { _wow_disparity_Zd = c; }
+        float getWowDisparityZD() const { return _wow_disparity_Zd; }
+        
+        void setWowDisparityVZ(float c) { _wow_disparity_vz = c; }
+        float getWowDisparityVZ() const { return _wow_disparity_vz; }
+        
+        void setWowDisparityM(float c) { _wow_disparity_M = c; }
+        float getWowDisparityM() const { return _wow_disparity_M; }
+        
+        void setWowDisparityC(float c) { _wow_disparity_C = c; }
+        float getWowDisparityC() const { return _wow_disparity_C; }
+        
+    protected:
+    
+        unsigned int _screenNum;
+        unsigned char _wow_content;
+        unsigned char _wow_factor;
+        unsigned char _wow_offset;
+        float _wow_disparity_Zd;
+        float _wow_disparity_vz;
+        float _wow_disparity_M;
+        float _wow_disparity_C;
+};
+        
+/** Configure view with DepthPartition.*/
+class OSGVIEWER_EXPORT DepthPartition : public Config
+{
+    public:
+        
+        DepthPartition(DepthPartitionSettings* dsp=0);
+
+        DepthPartition(const ViewForWoWVxDisplay& rhs, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
+        
+        META_Object(osgViewer,DepthPartition);
+
+        void setDepthPartionSettings(DepthPartitionSettings* dsp) const { _dps = dps; }
+        const DepthPartitionSettings* getDepthPartionSettings() const { return _dps; }
+
+        /** for setting up depth partitioning on the specified camera.*/
+        bool setUpDepthPartitionForCamera(osg::Camera* cameraToPartition, DepthPartitionSettings* dps=0);
+
+        virtual void configure(osgViewer::View& view);
+        
+    protected:
+};
+
+#endif
+
+}
+
+
+#endif

src/osgViewer/CMakeLists.txt

@@ -10,6 +10,7 @@ SET(LIB_NAME osgViewer)
 SET(HEADER_PATH ${OpenSceneGraph_SOURCE_DIR}/include/${LIB_NAME})
 SET(TARGET_H
     ${HEADER_PATH}/CompositeViewer
+    ${HEADER_PATH}/Config
     ${HEADER_PATH}/Export
     ${HEADER_PATH}/GraphicsWindow
     ${HEADER_PATH}/Keystone
@@ -24,6 +25,7 @@ SET(TARGET_H
 
 SET(LIB_COMMON_FILES
     CompositeViewer.cpp
+    Config.cpp
     GraphicsWindow.cpp
     HelpHandler.cpp
     Keystone.cpp

src/osgViewer/Keystone.cpp

@@ -592,28 +592,3 @@ bool Keystone::loadKeystoneFiles(osg::DisplaySettings* ds)
     return keystonesLoaded;
 }
 
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// Serialization support
-//
-
-#include <osgDB/ObjectWrapper>
-#include <osgDB/InputStream>
-#include <osgDB/OutputStream>
-
-REGISTER_OBJECT_WRAPPER( Keystone,
-                         new osgViewer::Keystone,
-                         osgViewer::Keystone,
-                         "osg::Object osgViewer::Keystone" )
-{
-    ADD_BOOL_SERIALIZER( KeystoneEditingEnabled, true );
-    ADD_VEC4_SERIALIZER( GridColor, osg::Vec4(1.0,1.0,1.0,1.0) );
-    ADD_VEC2D_SERIALIZER( BottomLeft, osg::Vec2d(0.0,0.0) );
-    ADD_VEC2D_SERIALIZER( BottomRight, osg::Vec2d(0.0,0.0) );
-    ADD_VEC2D_SERIALIZER( TopLeft, osg::Vec2d(0.0,0.0) );
-    ADD_VEC2D_SERIALIZER( TopRight, osg::Vec2d(0.0,0.0) );
-}
-
-

src/osgWrappers/serializers/CMakeLists.txt

@@ -48,3 +48,4 @@ ADD_SUBDIRECTORY(osgGA)
 ADD_SUBDIRECTORY(osgTerrain)
 ADD_SUBDIRECTORY(osgText)
 ADD_SUBDIRECTORY(osgVolume)
+ADD_SUBDIRECTORY(osgViewer)

src/osgWrappers/serializers/osgViewer/CMakeLists.txt

@@ -0,0 +1,7 @@
+FILE(GLOB TARGET_SRC *.cpp)
+FILE(GLOB TARGET_H *.h)
+
+SET(TARGET_ADDED_LIBRARIES osgViewer )
+
+#### end var setup  ###
+SETUP_PLUGIN(osgviewer)

src/osgWrappers/serializers/osgViewer/Config.cpp

@@ -0,0 +1,12 @@
+#include <osgViewer/Config>
+
+#include <osgDB/ObjectWrapper>
+#include <osgDB/InputStream>
+#include <osgDB/OutputStream>
+
+REGISTER_OBJECT_WRAPPER( osgViewer_Config,
+                         new osgViewer::Config,
+                         osgViewer::Config,
+                         "osg::Object osgViewer::Config" )
+{
+}

src/osgWrappers/serializers/osgViewer/Keystone.cpp

@@ -0,0 +1,18 @@
+#include <osgViewer/Keystone>
+
+#include <osgDB/ObjectWrapper>
+#include <osgDB/InputStream>
+#include <osgDB/OutputStream>
+
+REGISTER_OBJECT_WRAPPER( osgViewer_Keystone,
+                         new osgViewer::Keystone,
+                         osgViewer::Keystone,
+                         "osg::Object osgViewer::Keystone" )
+{
+    ADD_BOOL_SERIALIZER( KeystoneEditingEnabled, true );
+    ADD_VEC4_SERIALIZER( GridColor, osg::Vec4(1.0,1.0,1.0,1.0) );
+    ADD_VEC2D_SERIALIZER( BottomLeft, osg::Vec2d(0.0,0.0) );
+    ADD_VEC2D_SERIALIZER( BottomRight, osg::Vec2d(0.0,0.0) );
+    ADD_VEC2D_SERIALIZER( TopLeft, osg::Vec2d(0.0,0.0) );
+    ADD_VEC2D_SERIALIZER( TopRight, osg::Vec2d(0.0,0.0) );
+}

src/osgWrappers/serializers/osgViewer/ViewAcrossAllScreens.cpp

@@ -0,0 +1,12 @@
+#include <osgViewer/Config>
+
+#include <osgDB/ObjectWrapper>
+#include <osgDB/InputStream>
+#include <osgDB/OutputStream>
+
+REGISTER_OBJECT_WRAPPER( osgViewer_ViewAcrossAllScreens,
+                         new osgViewer::ViewAcrossAllScreens,
+                         osgViewer::ViewAcrossAllScreens,
+                         "osg::Object osgViewer::Config osgViewer::ViewAcrossAllScreens" )
+{
+}

src/osgWrappers/serializers/osgViewer/ViewInWindow.cpp

@@ -0,0 +1,17 @@
+#include <osgViewer/Config>
+
+#include <osgDB/ObjectWrapper>
+#include <osgDB/InputStream>
+#include <osgDB/OutputStream>
+
+REGISTER_OBJECT_WRAPPER( osgViewer_ViewInWindow,
+                         new osgViewer::ViewInWindow,
+                         osgViewer::ViewInWindow,
+                         "osg::Object osgViewer::Config osgViewer::ViewInWindow" )
+{
+    ADD_INT_SERIALIZER( X, 0);
+    ADD_INT_SERIALIZER( Y, 0);
+    ADD_INT_SERIALIZER( Width, -1);
+    ADD_INT_SERIALIZER( Height, -1);
+    ADD_UINT_SERIALIZER( ScreenNum, 0u);
+}