X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FScripting%2FNasalCanvas.cxx;h=3e57389dd67b9753f99d566d67525faea57d6739;hb=ce09c320d32728dd9c5eb0d6b4ab9f4683242cbc;hp=2a9faaa1b48e31ba5b51afc43f3947755f79ae35;hpb=e5286f12173a060bc786fef49e6a58813663f846;p=flightgear.git diff --git a/src/Scripting/NasalCanvas.cxx b/src/Scripting/NasalCanvas.cxx index 2a9faaa1b..3e57389dd 100644 --- a/src/Scripting/NasalCanvas.cxx +++ b/src/Scripting/NasalCanvas.cxx @@ -24,6 +24,8 @@ #include "NasalCanvas.hxx" #include +#include +#include #include
#include @@ -33,6 +35,7 @@ #include #include +#include #include #include @@ -55,51 +58,16 @@ typedef nasal::Ghost NasalMouseEvent; typedef nasal::Ghost NasalCanvas; typedef nasal::Ghost NasalElement; typedef nasal::Ghost NasalGroup; +typedef nasal::Ghost NasalText; +typedef nasal::Ghost NasalWindow; -#if 0 -typedef osg::ref_ptr GUIEventPtr; - -class NasalCanvasEvent: - public NasalObject +SGPropertyNode* from_nasal_helper(naContext c, naRef ref, SGPropertyNode**) { - public: - - naRef getEventType(naContext c, const GUIEventPtr& event) - { -#define RET_EVENT_STR(type, str)\ - case osgGA::GUIEventAdapter::type:\ - return nasal::to_nasal(c, str); - - switch( event->getEventType() ) - { - RET_EVENT_STR(PUSH, "push"); - RET_EVENT_STR(RELEASE, "release"); - RET_EVENT_STR(DOUBLECLICK, "double-click"); - RET_EVENT_STR(DRAG, "drag"); - RET_EVENT_STR(MOVE, "move"); - RET_EVENT_STR(SCROLL, "scroll"); - RET_EVENT_STR(KEYUP, "key-up"); - RET_EVENT_STR(KEYDOWN, "key-down"); - -#undef RET_EVENT_STR - - default: - return naNil(); - } - } -}; -#endif - -SGPropertyNode& requireArg(naContext c, int argc, naRef* args, int index = 0) -{ - 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) @@ -112,12 +80,34 @@ CanvasMgr& requireCanvasMgr(naContext c) return *canvas_mgr; } +GUIMgr& requireGUIMgr(naContext c) +{ + GUIMgr* mgr = + static_cast(globals->get_subsystem("CanvasGUI")); + if( !mgr ) + naRuntimeError(c, "Failed to get CanvasGUI subsystem"); + + return *mgr; +} + /** * Create new Canvas and get ghost for it. */ -static naRef f_createCanvas(naContext c, naRef me, int argc, naRef* args) +static naRef f_createCanvas(const nasal::CallContext& ctx) { - return NasalCanvas::create(c, requireCanvasMgr(c).createCanvas()); + return NasalCanvas::create(ctx.c, requireCanvasMgr(ctx.c).createCanvas()); +} + +/** + * Create new Window and get ghost for it. + */ +static naRef f_createWindow(const nasal::CallContext& ctx) +{ + return NasalWindow::create + ( + ctx.c, + requireGUIMgr(ctx.c).createWindow( ctx.getArg(0) ) + ); } /** @@ -125,7 +115,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(0); CanvasMgr& canvas_mgr = requireCanvasMgr(c); sc::CanvasPtr canvas; @@ -150,34 +141,118 @@ static naRef f_getCanvas(naContext c, naRef me, int argc, naRef* args) naRef f_canvasCreateGroup(sc::Canvas& canvas, const nasal::CallContext& ctx) { - std::string name; - if( ctx.argc > 0 ) - name = nasal::from_nasal(ctx.c, ctx.args[0]); + return NasalGroup::create + ( + ctx.c, + canvas.createGroup( ctx.getArg(0) ) + ); +} + +/** + * Get group containing all gui windows + */ +naRef f_getDesktop(naContext c, naRef me, int argc, naRef* args) +{ + return NasalGroup::create(c, requireGUIMgr(c).getDesktop()); +} + +naRef f_elementGetTransformedBounds(sc::Element& el, const nasal::CallContext& ctx) +{ + osg::BoundingBox bb = el.getTransformedBounds( osg::Matrix::identity() ); + + std::vector 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 + ( + ctx.c, + group.createChild( ctx.requireArg(0), + ctx.getArg(1) ) + ); +} - return NasalGroup::create(ctx.c, canvas.createGroup(name)); +naRef f_groupGetChild(sc::Group& group, const nasal::CallContext& ctx) +{ + return NasalElement::create + ( + ctx.c, + group.getChild( ctx.requireArg(0) ) + ); +} + +naRef f_groupGetElementById(sc::Group& group, const nasal::CallContext& ctx) +{ + return NasalElement::create + ( + ctx.c, + group.getElementById( ctx.requireArg(0) ) + ); } -naRef initNasalCanvas(naRef globals, naContext c, naRef gcSave) +naRef to_nasal_helper(naContext c, const sc::ElementWeakPtr& el) { - NasalEvent::init("canvas.Event"); + return NasalElement::create(c, el.lock()); +} + +naRef initNasalCanvas(naRef globals, naContext c) +{ + NasalEvent::init("canvas.Event") + .member("type", &sc::Event::getTypeString) + .member("target", &sc::Event::getTarget) + .member("currentTarget", &sc::Event::getCurrentTarget) + .method("stopPropagation", &sc::Event::stopPropagation); NasalMouseEvent::init("canvas.MouseEvent") - .bases(); + .bases() + .member("screenX", &sc::MouseEvent::getScreenX) + .member("screenY", &sc::MouseEvent::getScreenY) + .member("clientX", &sc::MouseEvent::getClientX) + .member("clientY", &sc::MouseEvent::getClientY) + .member("localX", &sc::MouseEvent::getLocalX) + .member("localY", &sc::MouseEvent::getLocalY) + .member("deltaX", &sc::MouseEvent::getDeltaX) + .member("deltaY", &sc::MouseEvent::getDeltaY) + .member("click_count", &sc::MouseEvent::getCurrentClickCount); NasalCanvas::init("Canvas") .member("_node_ghost", &elementGetNode) .member("size_x", &sc::Canvas::getSizeX) .member("size_y", &sc::Canvas::getSizeY) - .method_func<&f_canvasCreateGroup>("createGroup"); + .method("_createGroup", &f_canvasCreateGroup) + .method("_getGroup", &sc::Canvas::getGroup) + .method("addEventListener", &sc::Canvas::addEventListener); NasalElement::init("canvas.Element") .member("_node_ghost", &elementGetNode) - .method<&sc::Element::addEventListener>("addEventListener"); + .method("_getParent", &sc::Element::getParent) + .method("addEventListener", &sc::Element::addEventListener) + .method("getTransformedBounds", &f_elementGetTransformedBounds); NasalGroup::init("canvas.Group") - .bases(); + .bases() + .method("_createChild", &f_groupCreateChild) + .method("_getChild", &f_groupGetChild) + .method("_getElementById", &f_groupGetElementById); + NasalText::init("canvas.Text") + .bases() + .method("getNearestCursor", &sc::Text::getNearestCursor); + + NasalWindow::init("canvas.Window") + .bases() + .member("_node_ghost", &elementGetNode) + .method("_getCanvasDecoration", &canvas::Window::getCanvasDecoration); nasal::Hash globals_module(globals, c), canvas_module = globals_module.createHash("canvas"); canvas_module.set("_newCanvasGhost", f_createCanvas); + canvas_module.set("_newWindowGhost", f_createWindow); canvas_module.set("_getCanvasGhost", f_getCanvas); + canvas_module.set("_getDesktopGhost", f_getDesktop); return naNil(); }