projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
moving the first exhibit, no picking yet
[laserbrain_demo]
/
src
/
app.cc
diff --git
a/src/app.cc
b/src/app.cc
index
ac6edd9
..
6c9f374
100644
(file)
--- a/
src/app.cc
+++ b/
src/app.cc
@@
-18,6
+18,7
@@
#include "vrinput.h"
#include "exman.h"
#include "blob_exhibit.h"
#include "vrinput.h"
#include "exman.h"
#include "blob_exhibit.h"
+#include "dbg_gui.h"
#define NEAR_CLIP 5.0
#define FAR_CLIP 10000.0
#define NEAR_CLIP 5.0
#define FAR_CLIP 10000.0
@@
-25,6
+26,7
@@
static void draw_scene();
static void toggle_flight();
static void calc_framerate();
static void draw_scene();
static void toggle_flight();
static void calc_framerate();
+static Ray calc_pick_ray(int x, int y, const Mat4 &view_mat, const Mat4 &proj_mat);
long time_msec;
int win_width, win_height;
long time_msec;
int win_width, win_height;
@@
-68,6
+70,8
@@
static ExhibitManager *exman;
static BlobExhibit *blobs;
static bool show_blobs;
static BlobExhibit *blobs;
static bool show_blobs;
+static ExSelection ex_sel;
+
static Renderer *rend;
static Renderer *rend;
@@
-112,6
+116,10
@@
bool app_init(int argc, char **argv)
glEnable(GL_LIGHTING);
glEnable(GL_NORMALIZE);
glEnable(GL_LIGHTING);
glEnable(GL_NORMALIZE);
+ if(!init_debug_gui()) {
+ return false;
+ }
+
Mesh::use_custom_sdr_attr = false;
float ambient[] = {0.0, 0.0, 0.0, 0.0};
Mesh::use_custom_sdr_attr = false;
float ambient[] = {0.0, 0.0, 0.0, 0.0};
@@
-136,9
+144,11
@@
bool app_init(int argc, char **argv)
avatar.body_rot = rad_to_deg(acos(dot(dir, Vec3(0, 0, 1))));
exman = new ExhibitManager;
avatar.body_rot = rad_to_deg(acos(dot(dir, Vec3(0, 0, 1))));
exman = new ExhibitManager;
+ /*
if(!exman->load(mscn, "data/exhibits")) {
//return false;
}
if(!exman->load(mscn, "data/exhibits")) {
//return false;
}
+ */
blobs = new BlobExhibit;
blobs->node = new SceneNode;
blobs = new BlobExhibit;
blobs->node = new SceneNode;
@@
-199,6
+209,8
@@
void app_cleanup()
texman.clear();
sceneman.clear();
texman.clear();
sceneman.clear();
+
+ cleanup_debug_gui();
}
static bool constrain_walk_mesh(const Vec3 &v, Vec3 *newv)
}
static bool constrain_walk_mesh(const Vec3 &v, Vec3 *newv)
@@
-338,6
+350,13
@@
void app_display()
float dt = (float)(time_msec - prev_msec) / 1000.0f;
prev_msec = time_msec;
float dt = (float)(time_msec - prev_msec) / 1000.0f;
prev_msec = time_msec;
+ if(debug_gui) {
+ ImGui::GetIOPtr()->DeltaTime = dt;
+ ImGui::NewFrame();
+
+ ImGui::ShowTestWindow();
+ }
+
if(opt.vr) {
// VR mode
goatvr_draw_start();
if(opt.vr) {
// VR mode
goatvr_draw_start();
@@
-361,6
+380,10
@@
void app_display()
if(have_handtracking) {
draw_vrhands();
}
if(have_handtracking) {
draw_vrhands();
}
+
+ if(debug_gui) {
+ ImGui::Render();
+ }
}
goatvr_draw_done();
}
goatvr_draw_done();
@@
-387,6
+410,10
@@
void app_display()
slow_post(sdr_post_gamma);
glUseProgram(0);
}
slow_post(sdr_post_gamma);
glUseProgram(0);
}
+
+ if(debug_gui) {
+ ImGui::Render();
+ }
app_swap_buffers();
}
assert(glGetError() == GL_NO_ERROR);
app_swap_buffers();
}
assert(glGetError() == GL_NO_ERROR);
@@
-403,10
+430,7
@@
static void draw_scene()
set_light(2, lpos[2], Vec3(0.8, 1.0, 0.8) * 0.3);
rend->draw();
set_light(2, lpos[2], Vec3(0.8, 1.0, 0.8) * 0.3);
rend->draw();
-
- if(show_blobs) {
- blobs->draw();
- }
+ exman->draw();
/*
if(have_handtracking) {
/*
if(have_handtracking) {
@@
-469,12
+493,18
@@
void app_reshape(int x, int y)
{
glViewport(0, 0, x, y);
goatvr_set_fb_size(x, y, 1.0f);
{
glViewport(0, 0, x, y);
goatvr_set_fb_size(x, y, 1.0f);
+ debug_gui_reshape(x, y);
}
void app_keyboard(int key, bool pressed)
{
unsigned int mod = app_get_modifiers();
}
void app_keyboard(int key, bool pressed)
{
unsigned int mod = app_get_modifiers();
+ if(debug_gui && !(pressed && (key == '`' || key == 27))) {
+ debug_gui_key(key, pressed, mod);
+ return; // ignore all keystrokes when GUI is visible
+ }
+
if(pressed) {
switch(key) {
case 27:
if(pressed) {
switch(key) {
case 27:
@@
-489,6
+519,11
@@
void app_keyboard(int key, bool pressed)
break;
case '`':
break;
case '`':
+ debug_gui = !debug_gui;
+ show_message("debug gui %s", debug_gui ? "enabled" : "disabled");
+ break;
+
+ case 'm':
app_toggle_grab_mouse();
show_message("mouse %s", app_is_mouse_grabbed() ? "grabbed" : "released");
break;
app_toggle_grab_mouse();
show_message("mouse %s", app_is_mouse_grabbed() ? "grabbed" : "released");
break;
@@
-547,6
+582,10
@@
void app_keyboard(int key, bool pressed)
goatvr_recenter();
show_message("VR recenter\n");
break;
goatvr_recenter();
show_message("VR recenter\n");
break;
+
+ case 'x':
+ exman->load(mscn, "data/exhibits");
+ break;
}
}
}
}
@@
-557,9
+596,25
@@
void app_keyboard(int key, bool pressed)
void app_mouse_button(int bn, bool pressed, int x, int y)
{
void app_mouse_button(int bn, bool pressed, int x, int y)
{
+ if(debug_gui) {
+ debug_gui_mbutton(bn, pressed, x, y);
+ return; // ignore mouse events while GUI is visible
+ }
+
prev_mx = x;
prev_my = y;
bnstate[bn] = pressed;
prev_mx = x;
prev_my = y;
bnstate[bn] = pressed;
+
+ if(bn == 0) {
+ if(!pressed) {
+ if(ex_sel.ex) {
+ ex_sel.ex = 0;
+ } else {
+ Ray ray = calc_pick_ray(x, y, view_matrix, proj_matrix);
+ ex_sel = exman->select(ray);
+ }
+ }
+ }
}
static inline void mouse_look(float dx, float dy)
}
static inline void mouse_look(float dx, float dy)
@@
-580,6
+635,11
@@
static void mouse_zoom(float dx, float dy)
void app_mouse_motion(int x, int y)
{
void app_mouse_motion(int x, int y)
{
+ if(debug_gui) {
+ debug_gui_mmotion(x, y);
+ return; // ignore mouse events while GUI is visible
+ }
+
int dx = x - prev_mx;
int dy = y - prev_my;
prev_mx = x;
int dx = x - prev_mx;
int dy = y - prev_my;
prev_mx = x;
@@
-587,11
+647,15
@@
void app_mouse_motion(int x, int y)
if(!dx && !dy) return;
if(!dx && !dy) return;
- if(bnstate[0]) {
- mouse_look(dx, dy);
+ if(ex_sel.ex) {
+ Vec3 pos = ex_sel.ex->node->get_node_position();
+ Vec3 dir = transpose(view_matrix.upper3x3()) * Vec3(dx * 1.0, dy * -1.0, 0);
+
+ ex_sel.ex->node->set_position(pos + dir);
}
}
+
if(bnstate[2]) {
if(bnstate[2]) {
- mouse_zoom(dx, dy);
+ mouse_look(dx, dy);
}
}
}
}
@@
-604,6
+668,13
@@
void app_mouse_delta(int dx, int dy)
}
}
}
}
+void app_mouse_wheel(int dir)
+{
+ if(debug_gui) {
+ debug_gui_wheel(dir);
+ }
+}
+
void app_gamepad_axis(int axis, float val)
{
switch(axis) {
void app_gamepad_axis(int axis, float val)
{
switch(axis) {
@@
-685,3
+756,8
@@
static void calc_framerate()
++nframes;
}
}
++nframes;
}
}
+
+static Ray calc_pick_ray(int x, int y, const Mat4 &view_mat, const Mat4 &proj_mat)
+{
+ return Ray(); // TODO
+}