Changeset 4949


Ignore:
Timestamp:
Jan 20, 2015, 1:38:09 AM (5 years ago)
Author:
ldelgass
Message:

Bump version in configure, minor cleanups

Location:
nanovis/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • nanovis/trunk/Makefile.in

    r4948 r4949  
    264264.PHONY: all install install-resources install-shaders install-nanovis docs clean-docs clean distclean graphics imgloaders newmat11 util vrmath
    265265
    266 all: nanovis 
     266all: nanovis
    267267
    268268install: install-nanovis install-resources install-shaders
     
    336336
    337337Axis.o: Axis.cpp Axis.h Chain.h
    338 BMPWriter.o: BMPWriter.cpp nanovis.h
     338BMPWriter.o: BMPWriter.cpp BMPWriter.h nanovis.h
    339339BucketSort.o: BucketSort.cpp BucketSort.h $(VRMATH_DIR)/include/vrmath/Vector3f.h $(VRMATH_DIR)/include/vrmath/Vector4f.h $(VRMATH_DIR)/include/vrmath/Matrix4x4d.h PCASplit.h
    340340Camera.o: Camera.cpp Camera.h config.h $(VRMATH_DIR)/include/vrmath/Matrix4x4d.h
  • nanovis/trunk/configure

    r4353 r4949  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.69 for nanovis 1.2.
     3# Generated by GNU Autoconf 2.69 for nanovis 1.3.
    44#
    55# Report bugs to <rappture@nanohub.org>.
     
    581581PACKAGE_NAME='nanovis'
    582582PACKAGE_TARNAME='nanovis'
    583 PACKAGE_VERSION='1.2'
    584 PACKAGE_STRING='nanovis 1.2'
     583PACKAGE_VERSION='1.3'
     584PACKAGE_STRING='nanovis 1.3'
    585585PACKAGE_BUGREPORT='rappture@nanohub.org'
    586586PACKAGE_URL=''
     
    12621262  # This message is too long to be a string in the A/UX 3.1 sh.
    12631263  cat <<_ACEOF
    1264 \`configure' configures nanovis 1.2 to adapt to many kinds of systems.
     1264\`configure' configures nanovis 1.3 to adapt to many kinds of systems.
    12651265
    12661266Usage: $0 [OPTION]... [VAR=VALUE]...
     
    13231323if test -n "$ac_init_help"; then
    13241324  case $ac_init_help in
    1325      short | recursive ) echo "Configuration of nanovis 1.2:";;
     1325     short | recursive ) echo "Configuration of nanovis 1.3:";;
    13261326   esac
    13271327  cat <<\_ACEOF
     
    14201420if $ac_init_version; then
    14211421  cat <<\_ACEOF
    1422 nanovis configure 1.2
     1422nanovis configure 1.3
    14231423generated by GNU Autoconf 2.69
    14241424
     
    18641864running configure, to aid debugging if configure makes a mistake.
    18651865
    1866 It was created by nanovis $as_me 1.2, which was
     1866It was created by nanovis $as_me 1.3, which was
    18671867generated by GNU Autoconf 2.69.  Invocation command line was
    18681868
     
    55875587# values after options handling.
    55885588ac_log="
    5589 This file was extended by nanovis $as_me 1.2, which was
     5589This file was extended by nanovis $as_me 1.3, which was
    55905590generated by GNU Autoconf 2.69.  Invocation command line was
    55915591
     
    56495649ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
    56505650ac_cs_version="\\
    5651 nanovis config.status 1.2
     5651nanovis config.status 1.3
    56525652configured by $0, generated by GNU Autoconf 2.69,
    56535653  with options \\"\$ac_cs_config\\"
  • nanovis/trunk/configure.in

    r4353 r4949  
    11AC_PREREQ([2.60])
    2 AC_INIT([nanovis], [1.2], [rappture@nanohub.org])
     2AC_INIT([nanovis], [1.3], [rappture@nanohub.org])
    33AC_CONFIG_AUX_DIR(cf)
    44AC_CONFIG_HEADERS([nvconf.h])
  • nanovis/trunk/nanovis.cpp

    r4947 r4949  
    1919#include <cassert>
    2020#include <cstdio>
     21#include <cmath> // for fmod()
    2122
    2223#include <GL/glew.h>
     
    592593        struct timeval clock;
    593594        gettimeofday(&clock, NULL);
    594         double elapsed_time;
    595 
    596         elapsed_time = clock.tv_sec + clock.tv_usec/1000000.0 -
     595        double elapsed_time = clock.tv_sec + clock.tv_usec/1000000.0 -
    597596            volInterp->getStartTime();
    598597
    599         TRACE("%lf %lf", elapsed_time,
     598        TRACE("%g %g", elapsed_time,
    600599              volInterp->getInterval());
    601         float fraction;
    602         float f;
    603 
    604         f = fmod((float) elapsed_time, (float)volInterp->getInterval());
     600        double fraction;
     601        double f = fmod(elapsed_time, volInterp->getInterval());
    605602        if (f == 0.0) {
    606             fraction = 0.0f;
     603            fraction = 0.0;
    607604        } else {
    608605            fraction = f / volInterp->getInterval();
    609606        }
    610         TRACE("fraction : %f", fraction);
    611         volInterp->update(fraction);
     607        TRACE("fraction : %g", fraction);
     608        volInterp->update((float)fraction);
    612609    }
    613610}
  • nanovis/trunk/nanovis.h

    r4897 r4949  
    8888
    8989    static void eventuallyRedraw();
    90  
     90
    9191    static TransferFunction *getTransferFunction(const TransferFunctionId& id);
    9292    static TransferFunction *defineTransferFunction(const TransferFunctionId& id,
Note: See TracChangeset for help on using the changeset viewer.