projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exhibits
[laserbrain_demo]
/
src
/
app.cc
diff --git
a/src/app.cc
b/src/app.cc
index
46b0152
..
1c27685
100644
(file)
--- a/
src/app.cc
+++ b/
src/app.cc
@@
-141,9
+141,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;
@@
-348,6
+350,8
@@
void app_display()
if(debug_gui) {
ImGui::GetIOPtr()->DeltaTime = dt;
ImGui::NewFrame();
if(debug_gui) {
ImGui::GetIOPtr()->DeltaTime = dt;
ImGui::NewFrame();
+
+ ImGui::ShowTestWindow();
}
if(opt.vr) {
}
if(opt.vr) {
@@
-423,10
+427,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) {
@@
-578,6
+579,11
@@
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->clear();
+ exman->load(mscn, "data/exhibits");
+ break;
}
}
}
}