|
From: <kin...@us...> - 2004-02-19 06:55:25
|
Update of /cvsroot/teem/teem/src/limn/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16501/limn/test Modified Files: tcamanim.c Log Message: going crazy: replaced M_E with AIR_E and M_PI with AIR_PI, out of spite for windows Index: tcamanim.c =================================================================== RCS file: /cvsroot/teem/teem/src/limn/test/tcamanim.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tcamanim.c 7 Jan 2004 15:34:30 -0000 1.3 --- tcamanim.c 19 Feb 2004 06:45:12 -0000 1.4 *************** *** 76,80 **** ELL_3V_COPY((*keycamP)[ki].at, at); ELL_3V_COPY((*keycamP)[ki].up, up); ! vm = tan((M_PI/180)*(va/2))*di; um = vm*imgSize[0]/imgSize[1]; (*keycamP)[ki].uRange[0] = -um; --- 76,80 ---- ELL_3V_COPY((*keycamP)[ki].at, at); ELL_3V_COPY((*keycamP)[ki].up, up); ! vm = tan((AIR_PI/180)*(va/2))*di; um = vm*imgSize[0]/imgSize[1]; (*keycamP)[ki].uRange[0] = -um; *************** *** 90,94 **** *timeP = (double*)calloc(*numKeysP, sizeof(double)); for (ki=0; ki<*numKeysP; ki++) { ! tmp[ki] = tan(AIR_AFFINE(-0.01, dwell[ki], 2.01, 0.0, M_PI/2)); } (*timeP)[0] = 0; --- 90,94 ---- *timeP = (double*)calloc(*numKeysP, sizeof(double)); for (ki=0; ki<*numKeysP; ki++) { ! tmp[ki] = tan(AIR_AFFINE(-0.01, dwell[ki], 2.01, 0.0, AIR_PI/2)); } (*timeP)[0] = 0; *************** *** 116,120 **** di = cam[fi].dist; vm = cam[fi].vRange[1]; ! va = 2*atan2(vm, di)/(M_PI/180); fprintf(fout, "isoValue %g cam.di %g cam.at {%g %g %g } " "cam.up {%g %g %g } cam.dn %g cam.df %g cam.va %g " --- 116,120 ---- di = cam[fi].dist; vm = cam[fi].vRange[1]; ! va = 2*atan2(vm, di)/(AIR_PI/180); fprintf(fout, "isoValue %g cam.di %g cam.at {%g %g %g } " "cam.up {%g %g %g } cam.dn %g cam.df %g cam.va %g " |