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

Clean up Canvas element creation

Browse Source
This commit is contained in:
Thomas Geymayer 2012-11-06 18:48:00 +01:00
parent df8a3d9c60
commit 34719da000
13 changed files with 57 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
simgear/canvas/canvas_fwd.hxx
View File

@ -29,6 +29,7 @@
#include <boost/shared_ptr.hpp>
#include <boost/weak_ptr.hpp>
#include <map>
#include <vector>
namespace simgear
@ -40,6 +41,15 @@ namespace canvas
typedef boost::shared_ptr<Canvas> CanvasPtr;
typedef boost::weak_ptr<Canvas> CanvasWeakPtr;
class Element;
typedef boost::shared_ptr<Element> ElementPtr;
typedef boost::weak_ptr<Element> ElementWeakPtr;
typedef std::map<std::string, const SGPropertyNode*> Style;
typedef boost::function<ElementPtr( const CanvasWeakPtr&,
const SGPropertyNode_ptr&,
const Style& )> ElementFactory;
typedef osg::ref_ptr<osgText::Font> FontPtr;
class Placement;

2
simgear/canvas/elements/CanvasElement.cxx
View File

@ -240,7 +240,7 @@ namespace canvas
//----------------------------------------------------------------------------
Element::Element( const CanvasWeakPtr& canvas,
SGPropertyNode_ptr node,
const SGPropertyNode_ptr& node,
const Style& parent_style ):
_canvas( canvas ),
_transform_dirty( false ),

3
simgear/canvas/elements/CanvasElement.hxx
View File

@ -43,7 +43,6 @@ namespace canvas
public SGPropertyChangeListener
{
public:
typedef std::map<std::string, const SGPropertyNode*> Style;
typedef boost::function<void(const SGPropertyNode*)> StyleSetter;
typedef std::map<std::string, StyleSetter> StyleSetters;
@ -116,7 +115,7 @@ namespace canvas
std::vector<SGPropertyNode_ptr> _bounding_box;
Element( const CanvasWeakPtr& canvas,
SGPropertyNode_ptr node,
const SGPropertyNode_ptr& node,
const Style& parent_style );
template<typename T, class C1, class C2>

55
simgear/canvas/elements/CanvasGroup.cxx
View File

@ -22,20 +22,43 @@
#include "CanvasPath.hxx"
#include "CanvasText.hxx"
#include <boost/bind.hpp>
#include <boost/foreach.hpp>
#include <boost/make_shared.hpp>
#include <boost/lambda/core.hpp>
namespace simgear
{
namespace canvas
{
/**
* Create an ElementFactory for elements of type T
*/
template<typename T>
ElementFactory createElementFactory()
{
return boost::bind
(
&boost::make_shared<T, const CanvasWeakPtr&,
const SGPropertyNode_ptr&,
const Style&>,
boost::lambda::_1,
boost::lambda::_2,
boost::lambda::_3
);
}
//----------------------------------------------------------------------------
Group::Group( const CanvasWeakPtr& canvas,
SGPropertyNode_ptr node,
const SGPropertyNode_ptr& node,
const Style& parent_style ):
Element(canvas, node, parent_style)
{
_child_factories["group"] = createElementFactory<Group>();
_child_factories["image"] = createElementFactory<Image>();
_child_factories["map" ] = createElementFactory<Map >();
_child_factories["path" ] = createElementFactory<Path >();
_child_factories["text" ] = createElementFactory<Text >();
}
//----------------------------------------------------------------------------
@ -71,26 +94,16 @@ namespace canvas
if( child->getParent() != _node )
return;
boost::shared_ptr<Element> element;
// TODO create map of child factories and use also to check for element
// on deletion in ::childRemoved
if( child->getNameString() == "text" )
element.reset( new Text(_canvas, child, _style) );
else if( child->getNameString() == "group" )
element.reset( new Group(_canvas, child, _style) );
else if( child->getNameString() == "map" )
element.reset( new Map(_canvas, child, _style) );
else if( child->getNameString() == "path" )
element.reset( new Path(_canvas, child, _style) );
else if( child->getNameString() == "image" )
element.reset( new Image(_canvas, child, _style) );
if( element )
ChildFactories::iterator child_factory =
_child_factories.find( child->getNameString() );
if( child_factory != _child_factories.end() )
{
ElementPtr element = child_factory->second(_canvas, child, _style);
// Add to osg scene graph...
_transform->addChild( element->getMatrixTransform() );
_children.push_back( ChildList::value_type(child, element) );
return;
}
@ -120,11 +133,7 @@ namespace canvas
if( node->getParent() != _node )
return;
if( node->getNameString() == "text"
|| node->getNameString() == "group"
|| node->getNameString() == "map"
|| node->getNameString() == "path"
|| node->getNameString() == "image" )
if( _child_factories.find(node->getNameString()) != _child_factories.end() )
{
ChildFinder pred(node);
ChildList::iterator child =

11
simgear/canvas/elements/CanvasGroup.hxx
View File

@ -21,17 +21,13 @@
#include "CanvasElement.hxx"
#include <boost/shared_ptr.hpp>
#include <list>
#include <map>
namespace simgear
{
namespace canvas
{
typedef boost::shared_ptr<Element> ElementPtr;
class Group:
public Element
{
@ -42,7 +38,7 @@ namespace canvas
> ChildList;
Group( const CanvasWeakPtr& canvas,
SGPropertyNode_ptr node,
const SGPropertyNode_ptr& node,
const Style& parent_style = Style() );
virtual ~Group();
@ -50,7 +46,10 @@ namespace canvas
protected:
ChildList _children;
typedef std::map<std::string, ElementFactory> ChildFactories;
ChildFactories _child_factories;
ChildList _children;
virtual bool handleLocalMouseEvent(const canvas::MouseEvent& event);

2
simgear/canvas/elements/CanvasImage.cxx
View File

@ -73,7 +73,7 @@ namespace canvas
//----------------------------------------------------------------------------
Image::Image( const CanvasWeakPtr& canvas,
SGPropertyNode_ptr node,
const SGPropertyNode_ptr& node,
const Style& parent_style ):
Element(canvas, node, parent_style),
_texture(new osg::Texture2D),

2
simgear/canvas/elements/CanvasImage.hxx
View File

@ -42,7 +42,7 @@ namespace canvas
* [x,y] Position of rectangle
*/
Image( const CanvasWeakPtr& canvas,
SGPropertyNode_ptr node,
const SGPropertyNode_ptr& node,
const Style& parent_style );
virtual ~Image();

2
simgear/canvas/elements/CanvasMap.cxx
View File

@ -46,7 +46,7 @@ namespace canvas
//----------------------------------------------------------------------------
Map::Map( const CanvasWeakPtr& canvas,
SGPropertyNode_ptr node,
const SGPropertyNode_ptr& node,
const Style& parent_style ):
Group(canvas, node, parent_style),
// TODO make projection configurable

2
simgear/canvas/elements/CanvasMap.hxx
View File

@ -36,7 +36,7 @@ namespace canvas
{
public:
Map( const CanvasWeakPtr& canvas,
SGPropertyNode_ptr node,
const SGPropertyNode_ptr& node,
const Style& parent_style );
virtual ~Map();

2
simgear/canvas/elements/CanvasPath.cxx
View File

@ -354,7 +354,7 @@ namespace canvas
//----------------------------------------------------------------------------
Path::Path( const CanvasWeakPtr& canvas,
SGPropertyNode_ptr node,
const SGPropertyNode_ptr& node,
const Style& parent_style ):
Element(canvas, node, parent_style),
_path( new PathDrawable(this) )

2
simgear/canvas/elements/CanvasPath.hxx
View File

@ -30,7 +30,7 @@ namespace canvas
{
public:
Path( const CanvasWeakPtr& canvas,
SGPropertyNode_ptr node,
const SGPropertyNode_ptr& node,
const Style& parent_style );
virtual ~Path();

2
simgear/canvas/elements/CanvasText.cxx
View File

@ -176,7 +176,7 @@ namespace canvas
//----------------------------------------------------------------------------
Text::Text( const CanvasWeakPtr& canvas,
SGPropertyNode_ptr node,
const SGPropertyNode_ptr& node,
const Style& parent_style ):
Element(canvas, node, parent_style),
_text( new Text::TextOSG(this) )

2
simgear/canvas/elements/CanvasText.hxx
View File

@ -34,7 +34,7 @@ namespace canvas
{
public:
Text( const CanvasWeakPtr& canvas,
SGPropertyNode_ptr node,
const SGPropertyNode_ptr& node,
const Style& parent_style );
~Text();