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")) {
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");
static void calc_framerate()
{
+ static int ncalc;
static int nframes;
static long prev_upd;
framerate = (float)nframes / (float)(elapsed * 0.001);
nframes = 1;
prev_upd = time_msec;
+
+ /*if(++ncalc >= 5) {
+ printf("fps: %f\n", framerate);
+ ncalc = 0;
+ }*/
} else {
++nframes;
}