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

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

Browse Source 
Introduced osgViewer serializers plugin for serialization support for osgViewer::Config implementations and Keystone
This commit is contained in:
Robert Osfield
2013-05-15 11:31:49 +00:00
parent 07499f6658
commit bcbaaefa02
10 changed files with 2755 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgViewer/CMakeLists.txt
View File

@@ -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

2424
src/osgViewer/Config.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

25
src/osgViewer/Keystone.cpp
View File

@@ -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) );
}