- match mtledit blocks with material name not object name

[laserbrain_demo] / src / app.cc

diff --git a/src/app.cc b/src/app.cc
index e135ddf..49f8469 100644 (file)
--- a/src/app.cc
+++ b/src/app.cc
@@ -119,19 +119,21 @@ bool app_init(int argc, char **argv)
        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->set_position(Vec3(-680, 160, -100));
+       blobs->node->set_scaling(Vec3(28, 28, 28));
        blobs->node->update(0);
 
        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");
@@ -584,10 +586,10 @@ static void calc_framerate()
                nframes = 1;
                prev_upd = time_msec;
 
-               if(++ncalc >= 5) {
+               /*if(++ncalc >= 5) {
                        printf("fps: %f\n", framerate);
                        ncalc = 0;
-               }
+               }*/
        } else {
                ++nframes;
        }