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

Introduced Widget::WidgetStateSet to help localize the StateSet set up by Widget implementations from being serialized or

Browse Source 
affecting what end users apply via the standard Node::s/getStateSet().

Further work on TabWidget.


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14440 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield
2014-09-09 13:37:33 +00:00
parent 0db0bcdd5e
commit e93e7ca1f2
13 changed files with 107 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/osgWrappers/serializers/osgUI/Tab.cpp
View File

@@ -11,6 +11,5 @@ REGISTER_OBJECT_WRAPPER( Tab,
"osg::Object osgUI::Tab" )
{
ADD_STRING_SERIALIZER(Text, "");
ADD_VEC4F_SERIALIZER(Color, osg::Vec4(1.0f,1.0f,1.0f,0.0f));
ADD_OBJECT_SERIALIZER(Widget, osgUI::Widget, NULL);
}

4
src/osgWrappers/serializers/osgUI/Widget.cpp
View File

@@ -70,6 +70,10 @@ REGISTER_OBJECT_WRAPPER( Widget,
ADD_BOOL_SERIALIZER(HasEventFocus, false);
ADD_MAP_SERIALIZER(GraphicsSubgraphMap, osgUI::Widget::GraphicsSubgraphMap, osgDB::BaseSerializer::RW_INT, osgDB::BaseSerializer::RW_OBJECT);
SET_USAGE( osgDB::BaseSerializer::GET_SET_PROPERTY);
ADD_OBJECT_SERIALIZER( WidgetStateSet, osg::StateSet, NULL );
SET_USAGE( osgDB::BaseSerializer::GET_SET_PROPERTY);
ADD_BOUNDINGBOXF_SERIALIZER(Extents, osg::BoundingBoxf());