Canvas: Image/Window unifying and allow using canvas inside canvas.

[flightgear.git] / src / Canvas / canvas_mgr.cxx

diff --git a/src/Canvas/canvas_mgr.cxx b/src/Canvas/canvas_mgr.cxx
index eab30b5818d7165a4f90224f416c088bf55a2e63..a175076237112b4583c097e2069a582a8ac682fc 100644 (file)
--- a/src/Canvas/canvas_mgr.cxx
+++ b/src/Canvas/canvas_mgr.cxx
@@ -19,126 +19,48 @@
 #include "canvas_mgr.hxx"
 #include "canvas.hxx"
 
-#include <Main/fg_props.hxx>
+#include <boost/bind.hpp>
 
-#include <osg/Camera>
-#include <osg/Texture2D>
-
-#include <stdexcept>
-#include <string>
-
-//------------------------------------------------------------------------------
-CanvasMgr::CanvasMgr():
-  _props( fgGetNode("/canvas", true) )
-{
-
-}
-
-//------------------------------------------------------------------------------
-CanvasMgr::~CanvasMgr()
-{
-
-}
-
-//------------------------------------------------------------------------------
-void CanvasMgr::init()
-{
-  _props->addChangeListener(this);
-  triggerChangeRecursive(_props);
-}
-
-//------------------------------------------------------------------------------
-void CanvasMgr::reinit()
-{
-
-}
-
-//------------------------------------------------------------------------------
-void CanvasMgr::shutdown()
-{
-  _props->removeChangeListener(this);
-}
-
-//------------------------------------------------------------------------------
-void CanvasMgr::bind()
+typedef boost::shared_ptr<Canvas> CanvasPtr;
+CanvasPtr canvasFactory(SGPropertyNode* node)
 {
+  return CanvasPtr(new Canvas(node));
 }
 
-//------------------------------------------------------------------------------
-void CanvasMgr::unbind()
-{
-}
 
 //------------------------------------------------------------------------------
-void CanvasMgr::update(double delta_time_sec)
-{
- for( size_t i = 0; i < _canvases.size(); ++i )
-   _canvases[i].update(delta_time_sec);
-}
-
-//------------------------------------------------------------------------------
-void CanvasMgr::childAdded( SGPropertyNode * parent,
-                            SGPropertyNode * child )
+CanvasMgr::CanvasMgr():
+  PropertyBasedMgr("/canvas/by-index", "texture", &canvasFactory)
 {
-  if( parent != _props )
-    return;
-
-  if( child->getNameString() == "texture" )
-    textureAdded(child);
-  else
-    std::cout << "CanvasMgr::childAdded: " << child->getPath() << std::endl;
+  Canvas::addPlacementFactory
+  (
+    "object",
+    boost::bind
+    (
+      &FGODGauge::set_texture,
+      _1,
+      boost::bind(&Canvas::getTexture, _2),
+      boost::bind(&Canvas::getCullCallback, _2)
+    )
+  );
 }
 
 //------------------------------------------------------------------------------
-void CanvasMgr::childRemoved( SGPropertyNode * parent,
-                              SGPropertyNode * child )
+CanvasPtr CanvasMgr::getCanvas(size_t index) const
 {
-  if( parent != _props )
-    return;
+  if(    index >= _elements.size()
+      || !_elements[index] )
+    return CanvasPtr();
 
-  std::cout << "CanvasMgr::childRemoved: " << child->getPath() << std::endl;
+  return boost::static_pointer_cast<Canvas>(_elements[index]);
 }
 
 //------------------------------------------------------------------------------
-void CanvasMgr::textureAdded(SGPropertyNode* node)
+unsigned int CanvasMgr::getCanvasTexId(size_t index) const
 {
-  size_t index = node->getIndex();
-
-  if( index >= _canvases.size() )
-  {
-    if( index > _canvases.size() )
-      SG_LOG(SG_GL, SG_WARN, "Skipping unused texture slot(s)!");
-    SG_LOG(SG_GL, SG_INFO, "Add new texture[" << index << "]");
-
-    _canvases.resize(index + 1);
-    _canvases[index];
-  }
+  CanvasPtr canvas = getCanvas(index);
+  if( canvas )
+    return canvas->getTexId();
   else
-  {
-    SG_LOG(SG_GL, SG_WARN, "texture[" << index << "] already exists!");
-  }
-
-  _canvases[index].reset(node);
-}
-
-//------------------------------------------------------------------------------
-void CanvasMgr::triggerChangeRecursive(SGPropertyNode* node)
-{
-  node->getParent()->fireChildAdded(node);
-
-  if( node->nChildren() == 0 && node->getType() != simgear::props::NONE )
-    return node->fireValueChanged();
-
-  for( int i = 0; i < node->nChildren(); ++i )
-    triggerChangeRecursive( node->getChild(i) );
-}
-
-//------------------------------------------------------------------------------
-template<class T>
-T CanvasMgr::getParam(const SGPropertyNode* node, const char* prop)
-{
-  const SGPropertyNode* child = node->getChild(prop);
-  if( !child )
-    throw std::runtime_error(std::string("Missing property ") + prop);
-  return getValue<T>(child);
+    return 0;
 }