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

Renamed osgViewer::Config osgViewer::ViewConfig and moved it's declaration into include/osgViewer.

Browse Source
This commit is contained in:
Robert Osfield
2013-05-16 10:11:06 +00:00
parent e3ed763c15
commit 3b6c2b636a
19 changed files with 113 additions and 3892 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/osgViewer/config/AcrossAllScreens
View File

@@ -14,16 +14,16 @@
#ifndef OSGVIEWER_AcrossAllScreens
#define OSGVIEWER_AcrossAllScreens 1
#include <osgViewer/Config>
#include <osgViewer/View>
namespace osgViewer {
class OSGVIEWER_EXPORT AcrossAllScreens : public Config
class OSGVIEWER_EXPORT AcrossAllScreens : public ViewConfig
{
public:
AcrossAllScreens() {}
AcrossAllScreens(const AcrossAllScreens& rhs, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY): Config(rhs,copyop) {}
AcrossAllScreens(const AcrossAllScreens& rhs, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY): ViewConfig(rhs,copyop) {}
META_Object(osgViewer, AcrossAllScreens);

6
include/osgViewer/config/PanoramicSphericalDisplay
View File

@@ -14,12 +14,12 @@
#ifndef OSGVIEWER_PanoramicSphericalDisplay
#define OSGVIEWER_PanoramicSphericalDisplay 1
#include <osgViewer/Config>
#include <osgViewer/View>
namespace osgViewer {
/** 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 PanoramicSphericalDisplay : public Config
class OSGVIEWER_EXPORT PanoramicSphericalDisplay : public ViewConfig
{
public:
@@ -31,7 +31,7 @@ class OSGVIEWER_EXPORT PanoramicSphericalDisplay : public Config
_projectorMatrix(projectorMatrix) {}
PanoramicSphericalDisplay(const PanoramicSphericalDisplay& rhs, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY):
Config(rhs, copyop),
ViewConfig(rhs, copyop),
_radius(rhs._radius),
_collar(rhs._collar),
_screenNum(rhs._screenNum),

6
include/osgViewer/config/SingleScreen
View File

@@ -14,17 +14,17 @@
#ifndef OSGVIEWER_SingleScreen
#define OSGVIEWER_SingleScreen 1
#include <osgViewer/Config>
#include <osgViewer/View>
namespace osgViewer {
/** single camera associated with a single full screen GraphicsWindow.*/
class OSGVIEWER_EXPORT SingleScreen : public Config
class OSGVIEWER_EXPORT SingleScreen : public ViewConfig
{
public:
SingleScreen(unsigned int screenNum=0) : _screenNum(screenNum) {}
SingleScreen(const SingleScreen& rhs, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY) : Config(rhs,copyop), _screenNum(rhs._screenNum) {}
SingleScreen(const SingleScreen& rhs, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY) : ViewConfig(rhs,copyop), _screenNum(rhs._screenNum) {}
META_Object(osgViewer, SingleScreen);

6
include/osgViewer/config/SingleWindow
View File

@@ -14,18 +14,18 @@
#ifndef OSGVIEWER_SingleWindow
#define OSGVIEWER_SingleWindow 1
#include <osgViewer/Config>
#include <osgViewer/View>
namespace osgViewer {
/** single camera on a single window.*/
class OSGVIEWER_EXPORT SingleWindow : public Config
class OSGVIEWER_EXPORT SingleWindow : public ViewConfig
{
public:
SingleWindow():_x(0),_y(0),_width(-1),_height(-1),_screenNum(0) {}
SingleWindow(int x, int y, int width, int height, unsigned int screenNum=0):_x(x),_y(y),_width(width),_height(height),_screenNum(screenNum) {}
SingleWindow(const SingleWindow& 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) {}
SingleWindow(const SingleWindow& rhs, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY):ViewConfig(rhs,copyop), _x(rhs._x),_y(rhs._y),_width(rhs._width),_height(rhs._height),_screenNum(rhs._screenNum) {}
META_Object(osgViewer,SingleWindow);

6
include/osgViewer/config/SphericalDisplay
View File

@@ -14,12 +14,12 @@
#ifndef OSGVIEWER_SphericalDisplay
#define OSGVIEWER_SphericalDisplay 1
#include <osgViewer/Config>
#include <osgViewer/View>
namespace osgViewer {
/** 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 SphericalDisplay : public Config
class OSGVIEWER_EXPORT SphericalDisplay : public ViewConfig
{
public:
@@ -31,7 +31,7 @@ class OSGVIEWER_EXPORT SphericalDisplay : public Config
_projectorMatrix(projectorMatrix) {}
SphericalDisplay(const SphericalDisplay& rhs, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY):
Config(rhs,copyop),
ViewConfig(rhs,copyop),
_radius(rhs._radius),
_collar(rhs._collar),
_screenNum(rhs._screenNum),

10
include/osgViewer/config/WoWVxDisplay
View File

@@ -11,15 +11,15 @@
* OpenSceneGraph Public License for more details.
*/
#ifndef OSGVIEWER_PanoramicSphericalDisplay
#define OSGVIEWER_PanoramicSphericalDisplay 1
#ifndef OSGVIEWER_WoWVxDisplay
#define OSGVIEWER_WoWVxDisplay 1
#include <osgViewer/Config>
#include <osgViewer/View>
namespace osgViewer {
/** autostereoscopic Philips WoWvx display.*/
class OSGVIEWER_EXPORT WoWVxDisplay : public Config
class OSGVIEWER_EXPORT WoWVxDisplay : public ViewConfig
{
public:
@@ -45,7 +45,7 @@ class OSGVIEWER_EXPORT WoWVxDisplay : public Config
_wow_disparity_C(wow_disparity_C) {}
WoWVxDisplay(const WoWVxDisplay& rhs, const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY):
Config(rhs, copyop),
ViewConfig(rhs, copyop),
_screenNum(rhs._screenNum),
_wow_content(rhs._wow_content),
_wow_factor(rhs._wow_factor),