projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't crash when calling DataMap::lookup with an empty string
[laserbrain_demo]
/
src
/
app.cc
diff --git
a/src/app.cc
b/src/app.cc
index
ca750fa
..
ef8db06
100644
(file)
--- a/
src/app.cc
+++ b/
src/app.cc
@@
-119,8
+119,8
@@
bool app_init(int argc, char **argv)
blobs = new BlobExhibit;
blobs->node = new SceneNode;
blobs->init();
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"))) {
blobs->node->update(0);
if(!(sdr_ltmap_notex = create_program_load("sdr/lightmap.v.glsl", "sdr/lightmap-notex.p.glsl"))) {
@@
-574,6
+574,7
@@
static void toggle_flight()
static void calc_framerate()
{
static void calc_framerate()
{
+ static int ncalc;
static int nframes;
static long prev_upd;
static int nframes;
static long prev_upd;
@@
-582,6
+583,11
@@
static void calc_framerate()
framerate = (float)nframes / (float)(elapsed * 0.001);
nframes = 1;
prev_upd = time_msec;
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;
}
} else {
++nframes;
}