projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
better logging and OpenGL ARB_debug_output
[laserbrain_demo]
/
src
/
app.cc
diff --git
a/src/app.cc
b/src/app.cc
index
a03fd34
..
dcfd3f3
100644
(file)
--- a/
src/app.cc
+++ b/
src/app.cc
@@
-26,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;
@@
-69,13
+70,19
@@
static ExhibitManager *exman;
static BlobExhibit *blobs;
static bool show_blobs;
static BlobExhibit *blobs;
static bool show_blobs;
-static Renderer *rend;
+static ExSelection ex_sel;
-static bool show_debug_gui;
+static Renderer *rend;
bool app_init(int argc, char **argv)
{
bool app_init(int argc, char **argv)
{
+ set_log_file("demo.log");
+
+ if(init_opengl() == -1) {
+ return false;
+ }
+
if(!init_options(argc, argv, "demo.conf")) {
return false;
}
if(!init_options(argc, argv, "demo.conf")) {
return false;
}
@@
-143,9
+150,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;
@@
-347,7
+356,7
@@
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(show_debug_gui) {
+ if(debug_gui) {
ImGui::GetIOPtr()->DeltaTime = dt;
ImGui::NewFrame();
ImGui::GetIOPtr()->DeltaTime = dt;
ImGui::NewFrame();
@@
-378,7
+387,7
@@
void app_display()
draw_vrhands();
}
draw_vrhands();
}
- if(show_debug_gui) {
+ if(debug_gui) {
ImGui::Render();
}
}
ImGui::Render();
}
}
@@
-408,7
+417,7
@@
void app_display()
glUseProgram(0);
}
glUseProgram(0);
}
- if(show_debug_gui) {
+ if(debug_gui) {
ImGui::Render();
}
app_swap_buffers();
ImGui::Render();
}
app_swap_buffers();
@@
-427,10
+436,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) {
@@
-500,7
+506,7
@@
void app_keyboard(int key, bool pressed)
{
unsigned int mod = app_get_modifiers();
{
unsigned int mod = app_get_modifiers();
- if(show_debug_gui && !(pressed && (key == '`' || key == 27))) {
+ if(debug_gui && !(pressed && (key == '`' || key == 27))) {
debug_gui_key(key, pressed, mod);
return; // ignore all keystrokes when GUI is visible
}
debug_gui_key(key, pressed, mod);
return; // ignore all keystrokes when GUI is visible
}
@@
-519,8
+525,8
@@
void app_keyboard(int key, bool pressed)
break;
case '`':
break;
case '`':
- show_debug_gui = !show_debug_gui;
- show_message("debug gui %s", show_debug_gui ? "enabled" : "disabled");
+ debug_gui = !debug_gui;
+ show_message("debug gui %s", debug_gui ? "enabled" : "disabled");
break;
case 'm':
break;
case 'm':
@@
-582,6
+588,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;
}
}
}
}
@@
-592,7
+602,7
@@
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(show_debug_gui) {
+ if(debug_gui) {
debug_gui_mbutton(bn, pressed, x, y);
return; // ignore mouse events while GUI is visible
}
debug_gui_mbutton(bn, pressed, x, y);
return; // ignore mouse events while GUI is visible
}
@@
-600,6
+610,17
@@
void app_mouse_button(int bn, bool pressed, int x, int y)
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)
@@
-620,7
+641,7
@@
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(show_debug_gui) {
+ if(debug_gui) {
debug_gui_mmotion(x, y);
return; // ignore mouse events while GUI is visible
}
debug_gui_mmotion(x, y);
return; // ignore mouse events while GUI is visible
}
@@
-632,11
+653,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);
}
}
}
}
@@
-651,7
+676,7
@@
void app_mouse_delta(int dx, int dy)
void app_mouse_wheel(int dir)
{
void app_mouse_wheel(int dir)
{
- if(show_debug_gui) {
+ if(debug_gui) {
debug_gui_wheel(dir);
}
}
debug_gui_wheel(dir);
}
}
@@
-737,3
+762,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
+}