[Teem-commit] teem/src/bin emap.c,1.9,1.10

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

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

Modified Files:
	emap.c 
Log Message:
added -err option for looking at error images

Index: emap.c
===================================================================
RCS file: /cvsroot/teem/teem/src/bin/emap.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** emap.c	27 Feb 2004 18:16:50 -0000	1.9
--- emap.c	1 Mar 2004 10:17:43 -0000	1.10
***************
*** 41,46 ****
    char *me, *outS, *errS, *debugS;
    airArray *mop;
!   float amb[3], *linfo, *debug, *map, W[3], V[3] /* , diff */;
!   int li, ui, vi, qn, bits, method;
    limnLight *light;
    limnCamera *cam;
--- 41,46 ----
    char *me, *outS, *errS, *debugS;
    airArray *mop;
!   float amb[3], *linfo, *debug, *map, W[3], V[3], diff;
!   int li, ui, vi, qn, bits, method, doerr;
    limnLight *light;
    limnCamera *cam;
***************
*** 78,81 ****
--- 78,84 ----
  	     "right-ward, V increases downward.  The back sphere half is "
  	     "rendered as though the front half was removed");
+   hestOptAdd(&hopt, "err", NULL, airTypeInt, 0, 0, &doerr, NULL,
+ 	     "If using \"-d\", make the image represent the error between the "
+ 	     "real and quantized vector");
    hestParseOrDie(hopt, argc-1, argv+1, hparm, me, emapInfo,
  		 AIR_TRUE, AIR_TRUE, AIR_TRUE);
***************
*** 162,186 ****
  	ELL_3MV_MUL(W, V2W, V);
  	qn = limnVtoQN_f[method](W);
! 	/* 
! 	limnQNtoV_f[method](V, qn);
! 	ELL_3V_SUB(W, W, V);
! 	diff = ELL_3V_LEN(W);
! 	ELL_3V_SET(debug + 3*(ui + 1024*vi), diff, diff, diff);
! 	*/
! 	ELL_3V_COPY(debug + 3*(ui + 1024*vi), map + 3*qn);
  
- 	
  	/* second, the far side of the sphere */
  	ELL_3V_SET(V, u, v, w);
  	ELL_3MV_MUL(W, V2W, V);
  	qn = limnVtoQN_f[method](W);
! 	/*
! 	limnQNtoV_f[method](V, qn);
! 	ELL_3V_SUB(W, W, V);
! 	diff = ELL_3V_LEN(W);
! 	ELL_3V_SET(debug + 3*(ui + 512 + 1024*vi), diff, diff, diff);
! 	*/
! 	ELL_3V_COPY(debug + 3*(ui + 512 + 1024*vi), map + 3*qn);
! 
        }
      }
--- 165,189 ----
  	ELL_3MV_MUL(W, V2W, V);
  	qn = limnVtoQN_f[method](W);
! 	if (doerr) {
! 	  limnQNtoV_f[method](V, qn);
! 	  ELL_3V_SUB(W, W, V);
! 	  diff = ELL_3V_LEN(W);
! 	  ELL_3V_SET(debug + 3*(ui + 1024*vi), diff, diff, diff);
! 	} else {
! 	  ELL_3V_COPY(debug + 3*(ui + 1024*vi), map + 3*qn);
! 	}
  
  	/* second, the far side of the sphere */
  	ELL_3V_SET(V, u, v, w);
  	ELL_3MV_MUL(W, V2W, V);
  	qn = limnVtoQN_f[method](W);
! 	if (doerr) {
! 	  limnQNtoV_f[method](V, qn);
! 	  ELL_3V_SUB(W, W, V);
! 	  diff = ELL_3V_LEN(W);
! 	  ELL_3V_SET(debug + 3*(ui + 512 + 1024*vi), diff, diff, diff);
! 	} else {
! 	  ELL_3V_COPY(debug + 3*(ui + 512 + 1024*vi), map + 3*qn);
! 	}
        }
      }