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

2
src/osgViewer/CMakeLists.txt
View File

@@ -10,7 +10,6 @@ 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
@@ -28,7 +27,6 @@ FILE(GLOB LIB_COMMON_FILES config/*.cpp)
SET(LIB_COMMON_FILES
${LIB_COMMON_FILES}
CompositeViewer.cpp
Config.cpp
GraphicsWindow.cpp
HelpHandler.cpp
Keystone.cpp

2413
src/osgViewer/Config.cpp
View File

File diff suppressed because it is too large Load Diff

1178
src/osgViewer/View.cpp
View File

File diff suppressed because it is too large Load Diff

6
src/osgViewer/Viewer.cpp
View File

@@ -26,7 +26,6 @@
#include <osgViewer/Viewer>
#include <osgViewer/Renderer>
#include <osgViewer/CompositeViewer>
#include <osgViewer/Config>
#include <sstream>
#include <string.h>
@@ -301,11 +300,10 @@ bool Viewer::readConfiguration(const std::string& filename)
return false;
}
Config* config = dynamic_cast<Config*>(object.get());
ViewConfig* config = dynamic_cast<ViewConfig*>(object.get());
if (config)
{
OSG_NOTICE<<"Using osgViewer::Config : "<<config->className()<<std::endl;
config->configure(*this);
apply(config);
return true;
}

10
src/osgWrappers/serializers/osgViewer/Config.cpp
View File

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

2
src/osgWrappers/serializers/osgViewer/PanoramicSphericalDisplay.cpp
View File

@@ -7,7 +7,7 @@
REGISTER_OBJECT_WRAPPER( osgViewer_PanoramicSphericalDisplay,
new osgViewer::PanoramicSphericalDisplay,
osgViewer::PanoramicSphericalDisplay,
"osg::Object osgViewer::Config osgViewer::PanoramicSphericalDisplay" )
"osg::Object osgViewer::ViewConfig osgViewer::PanoramicSphericalDisplay" )
{
ADD_DOUBLE_SERIALIZER(Radius, 1.0);
ADD_DOUBLE_SERIALIZER(Collar, 0.45);

2
src/osgWrappers/serializers/osgViewer/SingleScreen.cpp
View File

@@ -7,7 +7,7 @@
REGISTER_OBJECT_WRAPPER( osgViewer_SingleScreen,
new osgViewer::SingleScreen,
osgViewer::SingleScreen,
"osg::Object osgViewer::Config osgViewer::SingleScreen" )
"osg::Object osgViewer::ViewConfig osgViewer::SingleScreen" )
{
ADD_UINT_SERIALIZER( ScreenNum, 0u);
}

2
src/osgWrappers/serializers/osgViewer/SingleWindow.cpp
View File

@@ -7,7 +7,7 @@
REGISTER_OBJECT_WRAPPER( osgViewer_SingleWindow,
new osgViewer::SingleWindow,
osgViewer::SingleWindow,
"osg::Object osgViewer::Config osgViewer::SingleWindow" )
"osg::Object osgViewer::ViewConfig osgViewer::SingleWindow" )
{
ADD_INT_SERIALIZER( X, 0);
ADD_INT_SERIALIZER( Y, 0);

2
src/osgWrappers/serializers/osgViewer/SphericalDisplay.cpp
View File

@@ -7,7 +7,7 @@
REGISTER_OBJECT_WRAPPER( osgViewer_SphericalDisplay,
new osgViewer::SphericalDisplay,
osgViewer::SphericalDisplay,
"osg::Object osgViewer::Config osgViewer::SphericalDisplay" )
"osg::Object osgViewer::ViewConfig osgViewer::SphericalDisplay" )
{
ADD_DOUBLE_SERIALIZER(Radius, 1.0);
ADD_DOUBLE_SERIALIZER(Collar, 0.45);

21
src/osgWrappers/serializers/osgViewer/WoWVxDisplay.cpp
View File

@@ -7,16 +7,17 @@
REGISTER_OBJECT_WRAPPER( osgViewer_WoWVxDisplay,
new osgViewer::WoWVxDisplay,
osgViewer::WoWVxDisplay,
"osg::Object osgViewer::Config osgViewer::WoWVxDisplay" )
"osg::Object osgViewer::ViewConfig osgViewer::WoWVxDisplay" )
{
ADD_UINT_SERIALIZER(ScreenNum, 0u);
ADD_UCHAR_SERIALIZER(Content, 0);
ADD_UCHAR_SERIALIZER(Factor, 0);
ADD_UCHAR_SERIALIZER(Offset, 0);
ADD_FLOAT_SERIALIZER(DisparityZD, 0);
ADD_FLOAT_SERIALIZER(DisparityVZ, 0);
ADD_FLOAT_SERIALIZER(DisparityM, 0);
ADD_FLOAT_SERIALIZER(DisparityC, 0);
#if 0
ADD_UCHAR_SERIALIZER(Content, 0x02);
ADD_UCHAR_SERIALIZER(Factor, 0x40);
ADD_UCHAR_SERIALIZER(Offset, 0x80);
#endif
ADD_FLOAT_SERIALIZER(DisparityZD, 0.459813f);
ADD_FLOAT_SERIALIZER(DisparityVZ, 6.180772f);
ADD_FLOAT_SERIALIZER(DisparityM, -1586.34f);
ADD_FLOAT_SERIALIZER(DisparityC, 127.5f);
}