builds through mingw32 now. doesn't seem to run properly though

[laserbrain_demo] / src / app.cc

diff --git a/src/app.cc b/src/app.cc
index d126635..6eb019a 100644 (file)
--- a/src/app.cc
+++ b/src/app.cc
@@ -13,6 +13,8 @@
 #include "ui.h"
 #include "opt.h"
 #include "post.h"
+#include "renderer.h"
+#include "exman.h"
 #include "blob_exhibit.h"
 
 #define NEAR_CLIP      5.0
@@ -60,9 +62,12 @@ static unsigned int sdr_post_gamma;
 
 static long prev_msec;
 
+static ExhibitManager *exman;
 static BlobExhibit *blobs;
 static bool show_blobs;
 
+static Renderer *rend;
+
 
 bool app_init(int argc, char **argv)
 {
@@ -104,7 +109,7 @@ bool app_init(int argc, char **argv)
        float ambient[] = {0.0, 0.0, 0.0, 0.0};
        glLightModelfv(GL_LIGHT_MODEL_AMBIENT, ambient);
 
-       glClearColor(0.2, 0.2, 0.2, 1.0);
+       glClearColor(1, 1, 1, 1);
 
        mscn = new MetaScene;
        if(!mscn->load(opt.scenefile ? opt.scenefile : "data/museum.scene")) {
@@ -116,27 +121,39 @@ bool app_init(int argc, char **argv)
        dir.y = 0;
        cam_theta = rad_to_deg(acos(dot(dir, Vec3(0, 0, 1))));
 
+       exman = new ExhibitManager;
+       if(!exman->load(mscn, "data/exhibits")) {
+               //return false;
+       }
+
        blobs = new BlobExhibit;
        blobs->node = new SceneNode;
        blobs->init();
-       blobs->node->set_position(Vec3(-680, 150, -100));
-       blobs->node->set_scaling(Vec3(20, 20, 20));
+       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;
        }
+       set_uniform_int(sdr_ltmap_notex, "texmap", MTL_TEX_DIFFUSE);
+       set_uniform_int(sdr_ltmap_notex, "lightmap", MTL_TEX_LIGHTMAP);
 
        if(!(sdr_ltmap = create_program_load("sdr/lightmap.v.glsl", "sdr/lightmap-tex.p.glsl"))) {
                return false;
        }
-       set_uniform_int(sdr_ltmap, "texmap", 0);
-       set_uniform_int(sdr_ltmap, "lightmap", 1);
+       set_uniform_int(sdr_ltmap, "texmap", MTL_TEX_DIFFUSE);
+       set_uniform_int(sdr_ltmap, "lightmap", MTL_TEX_LIGHTMAP);
 
        if(!fb_srgb) {
                sdr_post_gamma = create_program_load("sdr/post_gamma.v.glsl", "sdr/post_gamma.p.glsl");
        }
 
+       rend = new Renderer;
+       rend->set_scene(mscn);
+
        glUseProgram(0);
 
        if(opt.vr || opt.fullscreen) {
@@ -152,9 +169,9 @@ void app_cleanup()
                goatvr_shutdown();
        }
 
-       blobs->destroy();
-       delete blobs->node;
-       delete blobs;
+       delete rend;
+
+       delete exman;
 
        texman.clear();
        sceneman.clear();
@@ -184,9 +201,7 @@ static void update(float dt)
        sceneman.update();
 
        mscn->update(dt);
-       if(show_blobs) {
-               blobs->update(dt);
-       }
+       exman->update(dt);
 
        float speed = walk_speed * dt;
        Vec3 dir;
@@ -352,7 +367,8 @@ static void draw_scene()
        set_light(1, lpos[1], Vec3(0.6, 0.7, 1.0) * 0.6);
        set_light(2, lpos[2], Vec3(0.8, 1.0, 0.8) * 0.3);
 
-       mscn->draw();
+       rend->draw();
+
        if(show_blobs) {
                blobs->draw();
        }
@@ -459,6 +475,11 @@ void app_keyboard(int key, bool pressed)
                        show_blobs = !show_blobs;
                        show_message("blobs: %s\n", show_blobs ? "on" : "off");
                        break;
+
+               case ' ':
+                       goatvr_recenter();
+                       show_message("VR recenter\n");
+                       break;
                }
        }
 
@@ -550,6 +571,11 @@ void app_gamepad_button(int bn, bool pressed)
                        show_message("blobs: %s\n", show_blobs ? "on" : "off");
                        break;
 
+               case GPAD_START:
+                       goatvr_recenter();
+                       show_message("VR recenter\n");
+                       break;
+
                default:
                        break;
                }