[Teem-commit] teem/src/limn cam.c,1.20,1.21

[Gordon K. <kin...@us...>]

Update of /cvsroot/teem/teem/src/limn
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7408

Modified Files:
	cam.c 
Log Message:
still debuggin

Index: cam.c
===================================================================
RCS file: /cvsroot/teem/teem/src/limn/cam.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** cam.c	10 May 2004 19:27:24 -0000	1.20
--- cam.c	10 May 2004 21:20:30 -0000	1.21
***************
*** 265,268 ****
--- 265,275 ----
      }
      ell_4m_to_q_d(quat + 4*ii, keycam[ii].W2V);
+     fprintf(stderr, "!%s: keycam[%d].W2V:\n", me, ii);
+     ell_4m_print_d(stderr, keycam[ii].W2V);
+     fprintf(stderr, "!%s: --> q = %g %g %g %g --> \n", me,
+ 	    (quat + 4*ii)[0], (quat + 4*ii)[1],
+ 	    (quat + 4*ii)[2], (quat + 4*ii)[3]);
+     ell_q_to_3m_d(W2V, quat + 4*ii);
+     ell_3m_print_d(stderr, W2V);
      if (ii) {
        if (0 > ELL_4V_DOT(quat + 4*ii, quat + 4*(ii-1))) {
***************
*** 274,279 ****
      ELL_3V_COPY(upvc + 3*ii, keycam[ii].up);
      ELL_3V_SUB(fratVec, keycam[ii].from, keycam[ii].at);
!     ELL_4V_SET(dist + 4*ii,
! 	       ELL_3V_LEN(fratVec),
  	       keycam[ii].neer, keycam[ii].dist, keycam[ii].faar);
      ELL_2V_SET(fova + 2*ii, keycam[ii].fov, keycam[ii].aspect);
--- 281,287 ----
      ELL_3V_COPY(upvc + 3*ii, keycam[ii].up);
      ELL_3V_SUB(fratVec, keycam[ii].from, keycam[ii].at);
!     fratDist = ELL_3V_LEN(fratVec);
!     fprintf(stderr, "!%s(%d): fratDist = %g\n", me, ii, fratDist);
!     ELL_4V_SET(dist + 4*ii, fratDist, 
  	       keycam[ii].neer, keycam[ii].dist, keycam[ii].faar);
      ELL_2V_SET(fova + 2*ii, keycam[ii].fov, keycam[ii].aspect);
***************
*** 333,337 ****
      if (!E) E |= limnSplineNrrdEvaluate(natpt, atptSpline, nsample);
      if (!E) atpt = (double*)(natpt->data);
!     if (!E) E |= limnSplineNrrdEvaluate(nupvc, atptSpline, nsample);
      if (!E) upvc = (double*)(nupvc->data);
      break;
--- 341,345 ----
      if (!E) E |= limnSplineNrrdEvaluate(natpt, atptSpline, nsample);
      if (!E) atpt = (double*)(natpt->data);
!     if (!E) E |= limnSplineNrrdEvaluate(nupvc, upvcSpline, nsample);
      if (!E) upvc = (double*)(nupvc->data);
      break;
***************
*** 359,362 ****
--- 367,371 ----
      } else {
        fratDist = (dist + 4*ii)[0];
+       fprintf(stderr, "!%s(%d): fratDist = %g\n", me, ii, fratDist);
        ell_q_to_3m_d(W2V, quat + 4*ii);
        ELL_3MV_ROW1_GET(cam[ii].up, W2V);