added a non-interactive blobs exhibit

[laserbrain_demo] / src / app.cc

diff --git a/src/app.cc b/src/app.cc
index 665ded4..ca750fa 100644 (file)
--- a/src/app.cc
+++ b/src/app.cc
@@ -13,12 +13,14 @@
 #include "ui.h"
 #include "opt.h"
 #include "post.h"
+#include "blob_exhibit.h"
 
 #define NEAR_CLIP      5.0
 #define FAR_CLIP       10000.0
 
 static void draw_scene();
 static void toggle_flight();
+static void calc_framerate();
 
 long time_msec;
 int win_width, win_height;
@@ -50,12 +52,17 @@ static bool gpad_bnstate[64];
 static Vec2 joy_move, joy_look;
 static float joy_deadzone = 0.01;
 
+static float framerate;
+
 static Mat4 view_matrix, mouse_view_matrix, proj_matrix;
 static MetaScene *mscn;
 static unsigned int sdr_post_gamma;
 
 static long prev_msec;
 
+static BlobExhibit *blobs;
+static bool show_blobs;
+
 
 bool app_init(int argc, char **argv)
 {
@@ -109,6 +116,13 @@ bool app_init(int argc, char **argv)
        dir.y = 0;
        cam_theta = rad_to_deg(acos(dot(dir, Vec3(0, 0, 1))));
 
+       blobs = new BlobExhibit;
+       blobs->node = new SceneNode;
+       blobs->init();
+       blobs->node->set_position(Vec3(-250, 150, 250));
+       blobs->node->set_scaling(Vec3(20, 20, 20));
+       blobs->node->update(0);
+
        if(!(sdr_ltmap_notex = create_program_load("sdr/lightmap.v.glsl", "sdr/lightmap-notex.p.glsl"))) {
                return false;
        }
@@ -138,6 +152,10 @@ void app_cleanup()
                goatvr_shutdown();
        }
 
+       blobs->destroy();
+       delete blobs->node;
+       delete blobs;
+
        texman.clear();
        sceneman.clear();
 }
@@ -166,6 +184,9 @@ static void update(float dt)
        sceneman.update();
 
        mscn->update(dt);
+       if(show_blobs) {
+               blobs->update(dt);
+       }
 
        float speed = walk_speed * dt;
        Vec3 dir;
@@ -319,6 +340,8 @@ void app_display()
                app_swap_buffers();
        }
        assert(glGetError() == GL_NO_ERROR);
+
+       calc_framerate();
 }
 
 
@@ -330,6 +353,9 @@ static void draw_scene()
        set_light(2, lpos[2], Vec3(0.8, 1.0, 0.8) * 0.3);
 
        mscn->draw();
+       if(show_blobs) {
+               blobs->draw();
+       }
 
        if(show_walk_mesh && mscn->walk_mesh) {
                glPushAttrib(GL_ENABLE_BIT);
@@ -351,6 +377,7 @@ static void draw_scene()
                glPopAttrib();
        }
 
+       print_text(Vec2(9 * win_width / 10, 20), Vec3(1, 1, 0), "fps: %.1f", framerate);
        draw_ui();
 }
 
@@ -427,6 +454,11 @@ void app_keyboard(int key, bool pressed)
                        mouse_speed *= 0.8;
                        show_message("mouse speed: %g", mouse_speed);
                        break;
+
+               case 'b':
+                       show_blobs = !show_blobs;
+                       show_message("blobs: %s\n", show_blobs ? "on" : "off");
+                       break;
                }
        }
 
@@ -513,6 +545,11 @@ void app_gamepad_button(int bn, bool pressed)
                        toggle_flight();
                        break;
 
+               case GPAD_X:
+                       show_blobs = !show_blobs;
+                       show_message("blobs: %s\n", show_blobs ? "on" : "off");
+                       break;
+
                default:
                        break;
                }
@@ -534,3 +571,18 @@ static void toggle_flight()
                show_message("walk mode\n");
        }
 }
+
+static void calc_framerate()
+{
+       static int nframes;
+       static long prev_upd;
+
+       long elapsed = time_msec - prev_upd;
+       if(elapsed >= 1000) {
+               framerate = (float)nframes / (float)(elapsed * 0.001);
+               nframes = 1;
+               prev_upd = time_msec;
+       } else {
+               ++nframes;
+       }
+}