Refactor FG_HOME init, so we can log sooner.

[flightgear.git] / src / Scripting / NasalCanvas.cxx

diff --git a/src/Scripting/NasalCanvas.cxx b/src/Scripting/NasalCanvas.cxx
index d45bf347e7ce60d27889d7e9d48d1d0a32f9c6a7..f349dadb5bf502070c597cfeda85678415dd6618 100644 (file)
--- a/src/Scripting/NasalCanvas.cxx
+++ b/src/Scripting/NasalCanvas.cxx
@@ -33,6 +33,7 @@
 
 #include <simgear/canvas/Canvas.hxx>
 #include <simgear/canvas/elements/CanvasElement.hxx>
+#include <simgear/canvas/elements/CanvasText.hxx>
 #include <simgear/canvas/MouseEvent.hxx>
 
 #include <simgear/nasal/cppbind/from_nasal.hxx>
@@ -55,17 +56,15 @@ typedef nasal::Ghost<sc::MouseEventPtr> NasalMouseEvent;
 typedef nasal::Ghost<sc::CanvasPtr> NasalCanvas;
 typedef nasal::Ghost<sc::ElementPtr> NasalElement;
 typedef nasal::Ghost<sc::GroupPtr> NasalGroup;
+typedef nasal::Ghost<sc::TextPtr> NasalText;
 
-SGPropertyNode& requireArg(naContext c, int argc, naRef* args, int index = 0)
+SGPropertyNode* from_nasal_helper(naContext c, naRef ref, SGPropertyNode**)
 {
-  if( argc <= index )
-    naRuntimeError(c, "missing argument #%d", index);
-
-  SGPropertyNode* props = ghostToPropNode(args[index]);
+  SGPropertyNode* props = ghostToPropNode(ref);
   if( !props )
-    naRuntimeError(c, "arg #%d: not a SGPropertyNode ghost");
+    naRuntimeError(c, "Not a SGPropertyNode ghost.");
 
-  return *props;
+  return props;
 }
 
 CanvasMgr& requireCanvasMgr(naContext c)
@@ -91,7 +90,8 @@ static naRef f_createCanvas(naContext c, naRef me, int argc, naRef* args)
  */
 static naRef f_getCanvas(naContext c, naRef me, int argc, naRef* args)
 {
-  SGPropertyNode& props = requireArg(c, argc, args);
+  nasal::CallContext ctx(c, argc, args);
+  SGPropertyNode& props = *ctx.requireArg<SGPropertyNode*>(0);
   CanvasMgr& canvas_mgr = requireCanvasMgr(c);
 
   sc::CanvasPtr canvas;
@@ -123,6 +123,19 @@ naRef f_canvasCreateGroup(sc::Canvas& canvas, const nasal::CallContext& ctx)
   );
 }
 
+naRef f_elementGetTransformedBounds(sc::Element& el, const nasal::CallContext& ctx)
+{
+  osg::BoundingBox bb = el.getTransformedBounds( osg::Matrix::identity() );
+
+  std::vector<float> bb_vec(4);
+  bb_vec[0] = bb._min.x();
+  bb_vec[1] = bb._min.y();
+  bb_vec[2] = bb._max.x();
+  bb_vec[3] = bb._max.y();
+
+  return nasal::to_nasal(ctx.c, bb_vec);
+}
+
 naRef f_groupCreateChild(sc::Group& group, const nasal::CallContext& ctx)
 {
   return NasalElement::create
@@ -133,22 +146,80 @@ naRef f_groupCreateChild(sc::Group& group, const nasal::CallContext& ctx)
   );
 }
 
+naRef f_groupGetChild(sc::Group& group, const nasal::CallContext& ctx)
+{
+  return NasalElement::create
+  (
+    ctx.c,
+    group.getChild( ctx.requireArg<SGPropertyNode*>(0) )
+  );
+}
+
+naRef f_groupGetElementById(sc::Group& group, const nasal::CallContext& ctx)
+{
+  return NasalElement::create
+  (
+    ctx.c,
+    group.getElementById( ctx.requireArg<std::string>(0) )
+  );
+}
+
+naRef f_textGetNearestCursor(sc::Text& text, const nasal::CallContext& ctx)
+{
+  return nasal::to_nasal
+  (
+    ctx.c,
+    text.getNearestCursor( ctx.requireArg<osg::Vec2>(0) )
+  );
+}
+
+naRef f_eventGetTarget(naContext c, sc::Event& event)
+{
+  return NasalElement::create(c, event.getTarget().lock());
+}
+
+// TODO allow directly exposing functions without parameters and return type
+naRef f_eventStopPropagation(sc::Event& event, const nasal::CallContext& ctx)
+{
+  if( ctx.argc != 0 )
+    naRuntimeError(ctx.c, "Event::stopPropagation no argument expected");
+  event.stopPropagation();
+  return naNil();
+}
+
 naRef initNasalCanvas(naRef globals, naContext c, naRef gcSave)
 {
-  NasalEvent::init("canvas.Event");
+  NasalEvent::init("canvas.Event")
+    .member("type", &sc::Event::getTypeString)
+    .member("target", &f_eventGetTarget)
+    .method_func<&f_eventStopPropagation>("stopPropagation");
   NasalMouseEvent::init("canvas.MouseEvent")
-    .bases<NasalEvent>();
+    .bases<NasalEvent>()
+    .member("screenX", &sc::MouseEvent::getScreenX)
+    .member("screenY", &sc::MouseEvent::getScreenY)
+    .member("clientX", &sc::MouseEvent::getClientX)
+    .member("clientY", &sc::MouseEvent::getClientY)
+    .member("deltaX", &sc::MouseEvent::getDeltaX)
+    .member("deltaY", &sc::MouseEvent::getDeltaY)
+    .member("click_count", &sc::MouseEvent::getCurrentClickCount);
   NasalCanvas::init("Canvas")
     .member("_node_ghost", &elementGetNode<sc::Canvas>)
     .member("size_x", &sc::Canvas::getSizeX)
     .member("size_y", &sc::Canvas::getSizeY)
-    .method_func<&f_canvasCreateGroup>("createGroup");
+    .method_func<&f_canvasCreateGroup>("_createGroup")
+    .method<&sc::Canvas::addEventListener>("addEventListener");
   NasalElement::init("canvas.Element")
     .member("_node_ghost", &elementGetNode<sc::Element>)
-    .method<&sc::Element::addEventListener>("addEventListener");
+    .method<&sc::Element::addEventListener>("addEventListener")
+    .method_func<&f_elementGetTransformedBounds>("getTransformedBounds");
   NasalGroup::init("canvas.Group")
     .bases<NasalElement>()
-    .method_func<&f_groupCreateChild>("createChild");
+    .method_func<&f_groupCreateChild>("_createChild")
+    .method_func<&f_groupGetChild>("_getChild")
+    .method_func<&f_groupGetElementById>("_getElementById");
+  NasalText::init("canvas.Text")
+    .bases<NasalElement>()
+    .method_func<&f_textGetNearestCursor>("getNearestCursor");
 
   nasal::Hash globals_module(globals, c),
               canvas_module = globals_module.createHash("canvas");