Permalink
Browse files

Up

  • Loading branch information...
markandrus committed Mar 14, 2012
1 parent af60f0c commit 83b3e25ac60c4dbcc519366f2a1585c7cbdb517e
Showing with 5 additions and 5 deletions.
  1. +2 −2 matrixFunctions.c
  2. +3 −3 proj4.c
View
@@ -677,7 +677,7 @@ void updateScene(GLfloat time, GLfloat dt)
gctx->time = time;
}
- GLfloat d=100.0; // dist
+ GLfloat d=25.0; // dist
GLfloat r=2.0 * M_PI;
// SPLINE from keyframe 0 => 2
if (floor(time)>=0 && ceil(time)<=2) {
@@ -700,7 +700,7 @@ void updateScene(GLfloat time, GLfloat dt)
// SPLINE from keyframe 3 => 4
if (floor(time)>=3 && ceil(time)<=4) {
GLfloat t = dt;
- t *= 2.0 * d; // 2x dist. w/ 1x time
+ t *= 1.0 * d; // 2x dist. w/ 1x time
translate_view_N(gctx->camera.uvn, &t, 0);
}
// LINEAR RAMP from keyfram 4 => 5
View
@@ -429,9 +429,9 @@ int contextGLInit(context_t *ctx) {
gctx->camera.up[0] = 0;
gctx->camera.up[1] = 1;
gctx->camera.up[2] = 0;
- gctx->camera.from[0] = -1;
- gctx->camera.from[1] = -50;
- gctx->camera.from[2] = 0;
+ gctx->camera.from[0] = 0;
+ gctx->camera.from[1] = -2;
+ gctx->camera.from[2] = 25;
gctx->camera.at[0] = 0;
gctx->camera.at[1] = 0;
gctx->camera.at[2] = 0;

0 comments on commit 83b3e25

Please sign in to comment.