summaryrefslogtreecommitdiffstats
path: root/progs/demos/terrain.c
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2005-01-09 17:37:50 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2005-01-09 17:37:50 +0000
commit92eddb0fd404624ca198f19e4088927701eec7f5 (patch)
treedd93d51d271e6bd43d09af9e8b0f3a98a640a8d2 /progs/demos/terrain.c
parent516f9bc6e306fe7820649ead125d557b46ca8419 (diff)
downloadexternal_mesa3d-92eddb0fd404624ca198f19e4088927701eec7f5.zip
external_mesa3d-92eddb0fd404624ca198f19e4088927701eec7f5.tar.gz
external_mesa3d-92eddb0fd404624ca198f19e4088927701eec7f5.tar.bz2
better animate rate (Marcelo Magallon)
Diffstat (limited to 'progs/demos/terrain.c')
-rw-r--r--progs/demos/terrain.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/progs/demos/terrain.c b/progs/demos/terrain.c
index 9063c93..990c7b8 100644
--- a/progs/demos/terrain.c
+++ b/progs/demos/terrain.c
@@ -69,7 +69,7 @@ static int scrheight = HEIGHT;
static float obs[3] = { OBSSTARTX, heightMnt * 1.3, OBSSTARTY };
static float dir[3], v1[2], v2[2];
-static float v = 15.0;
+static float v = 900.0;
static float alpha = 75.0;
static float beta = 90.0;
@@ -77,6 +77,12 @@ static void
calcposobs(void)
{
float alpha1, alpha2;
+ static double t0 = -1.;
+ double dt, t = glutGet(GLUT_ELAPSED_TIME) / 1000.0;
+ if (t0 < 0.0)
+ t0 = t;
+ dt = t - t0;
+ t0 = t;
dir[0] = sin(alpha * M_PI / 180.0);
dir[2] = cos(alpha * M_PI / 180.0) * sin(beta * M_PI / 180.0);
@@ -97,9 +103,9 @@ calcposobs(void)
v2[0] = sin(alpha2 * M_PI / 180.0);
v2[1] = cos(alpha2 * M_PI / 180.0);
- obs[0] += v * dir[0];
- obs[1] += v * dir[1];
- obs[2] += v * dir[2];
+ obs[0] += v * dir[0] * dt;
+ obs[1] += v * dir[1] * dt;
+ obs[2] += v * dir[2] * dt;
if (obs[1] < 0.0)
obs[1] = 0.0;
@@ -432,10 +438,10 @@ key(unsigned char k, int x, int y)
exit(0);
break;
case 'a':
- v += 0.5;
+ v += 50.;
break;
case 'z':
- v -= 0.5;
+ v -= 50.;
break;
case 'p':
if (poutline) {