X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fapp.cc;h=8aaaee301ddcb35dae1625055a33b62e6f4cda7b;hp=88650127400fac125079e63d9cee5ec0467529a5;hb=fc00873a180b1b7272d94a32dcc40d0d44ed2b72;hpb=91c5d07b779f24afec373047afe401b8811811c7 diff --git a/src/app.cc b/src/app.cc index 8865012..8aaaee3 100644 --- a/src/app.cc +++ b/src/app.cc @@ -20,6 +20,7 @@ #include "exman.h" #include "blob_exhibit.h" #include "dbg_gui.h" +#include "geomdraw.h" #define NEAR_CLIP 5.0 #define FAR_CLIP 10000.0 @@ -483,6 +484,11 @@ static void draw_scene() } */ + if(debug_gui && dbg_sel_node) { + AABox bvol = dbg_sel_node->get_bounds(); + draw_geom_object(&bvol); + } + if(show_walk_mesh && mscn->walk_mesh) { glPushAttrib(GL_ENABLE_BIT); glEnable(GL_BLEND); @@ -648,17 +654,19 @@ void app_mouse_button(int bn, bool pressed, int x, int y) } else { if(exsel_grab_mouse) { // cancel grab on mouse release - debug_log("releasing...\n"); Exhibit *ex = exsel_grab_mouse.ex; Vec3 pos = exslot_mouse.node.get_position(); - debug_log("release location: %g %g %g\n", pos.x, pos.y, pos.z); - ExhibitSlot *slot = exman->nearest_empty_slot(pos); + debug_log("releasing at %g %g %g ...\n", pos.x, pos.y, pos.z); + + exslot_mouse.detach_exhibit(); + + ExhibitSlot *slot = exman->nearest_empty_slot(pos, 100); if(!slot) { - debug_log("no nearby slot\n"); + debug_log("no empty slot nearby\n"); if(ex->prev_slot && ex->prev_slot->empty()) { slot = ex->prev_slot; - debug_log("previous slot available though\n"); + debug_log("using previous slot"); } }