X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=src%2Fapp.cc;h=620ec52a0db290a78a83f7d5c1969ffdc9d46c53;hp=d4b516ed5804679e2061c23a7b3309f515a15aa3;hb=332f9dce52862e39afabd50bdce9691de7986921;hpb=3c48aa0de66e0b89b674d353eb6c84b2c9276013 diff --git a/src/app.cc b/src/app.cc index d4b516e..620ec52 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 @@ -70,7 +71,6 @@ static unsigned int sdr_post_gamma; static long prev_msec; static ExhibitManager *exman; -static BlobExhibit *blobs; static bool show_blobs; ExSelection exsel_active, exsel_hover; @@ -171,15 +171,6 @@ bool app_init(int argc, char **argv) } */ - blobs = new BlobExhibit; - blobs->node = new SceneNode; - blobs->init(); - blobs->node->set_position(Vec3(-680, 160, -100)); - blobs->node->set_scaling(Vec3(28, 28, 28)); - blobs->node->update(0); - - exman->add(blobs); - if(!(sdr_ltmap_notex = create_program_load("sdr/lightmap.v.glsl", "sdr/lightmap-notex.p.glsl"))) { return false; } @@ -483,6 +474,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);