Changeset 5400

Timestamp:

May 3, 2015 5:34:14 PM (9 years ago)

Author:

ldelgass

Message:

minor change to sync with nanovis trunk

File:

• nanovis/branches/1.2/nanovis.cpp (modified) (2 diffs)

nanovis/branches/1.2/nanovis.cpp

@@ -19 +19 @@
 #include <cassert>
 #include <cstdio>
+#include <cmath> // for fmod()
 
 #include <GL/glew.h>
@@ -701 +702 @@
         struct timeval clock;
         gettimeofday(&clock, NULL);
-        double elapsed_time;
-
-        elapsed_time = clock.tv_sec + clock.tv_usec/1000000.0 -
+        double elapsed_time = clock.tv_sec + clock.tv_usec/1000000.0 -
             volInterp->getStartTime();
 
-        TRACE("%lf %lf", elapsed_time, 
+        TRACE("%g %g", elapsed_time, 
               volInterp->getInterval());
-        float fraction;
-        float f;
-
-        f = fmod((float) elapsed_time, (float)volInterp->getInterval());
+        double fraction;
+        double f = fmod(elapsed_time, volInterp->getInterval());
         if (f == 0.0) {
-            fraction = 0.0f;
+            fraction = 0.0;
         } else {
             fraction = f / volInterp->getInterval();
         }
-        TRACE("fraction : %f", fraction);
-        volInterp->update(fraction);
+        TRACE("fraction : %g", fraction);
+        volInterp->update((float)fraction);
     }
 }