[Teem-commit] teem/src/bin emap.c,1.6,1.7

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

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

Modified Files:
	emap.c 
Log Message:
reflect changes in limnQN

Index: emap.c
===================================================================
RCS file: /cvsroot/teem/teem/src/bin/emap.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** emap.c	7 Jan 2004 15:34:28 -0000	1.6
--- emap.c	9 Feb 2004 07:20:46 -0000	1.7
***************
*** 28,37 ****
  		  "camera parameters, this allows for both lights in "
  		  "both world and view space.  Solely out of laziness, "
! 		  "the nrrd format is used for specifying the lights. "
! 		  "For N lights, the nrrd must be a 7 x N array of floats; "
! 		  "the 7 values are: 0/1 (world/view space), R\tG\tB color, "
! 		  "X\tY\tZ position.  The most convenient way of doing this "
! 		  "is to put this information in a text file, one line "
! 		  "per light.");
  
  int
--- 28,36 ----
  		  "camera parameters, this allows for both lights in "
  		  "both world and view space.  Solely out of laziness, "
! 		  "the nrrd format is used for specifying the lights, but not "
! 		  "to worry: you can use a simple un-adorned text file, "
! 		  "defining one light per line, with 7 values per light: "
! 		  "0/1 (world/view space), R\tG\tB color, and "
! 		  "X\tY\tZ position.");
  
  int
***************
*** 112,116 ****
    nmap=nrrdNew();
    airMopAdd(mop, nmap, (airMopper)nrrdNuke, airMopAlways);
!   if (limnEnvMapFill(nmap, limnLightDiffuseCB, limnQN_16checker, light)) {
      airMopAdd(mop, errS = biffGetDone(LIMN), airFree, airMopAlways);
      fprintf(stderr, "%s: problem making environment map:\n%s\n", me, errS);
--- 111,115 ----
    nmap=nrrdNew();
    airMopAdd(mop, nmap, (airMopper)nrrdNuke, airMopAlways);
!   if (limnEnvMapFill(nmap, limnLightDiffuseCB, limnQN16checker, light)) {
      airMopAdd(mop, errS = biffGetDone(LIMN), airFree, airMopAlways);
      fprintf(stderr, "%s: problem making environment map:\n%s\n", me, errS);
***************
*** 142,146 ****
  	ELL_3V_SET(V, u, v, -w);
  	ELL_3MV_MUL(W, V2W, V);
! 	qn = limnVtoQN[limnQN_16checker](W);
  	ELL_3V_COPY(debug + 3*(ui + 1024*vi), map + 3*qn);
  	
--- 141,145 ----
  	ELL_3V_SET(V, u, v, -w);
  	ELL_3MV_MUL(W, V2W, V);
! 	qn = limnVtoQN_f[limnQN16checker](W);
  	ELL_3V_COPY(debug + 3*(ui + 1024*vi), map + 3*qn);
  	
***************
*** 148,152 ****
  	ELL_3V_SET(V, u, v, w);
  	ELL_3MV_MUL(W, V2W, V);
! 	qn = limnVtoQN[limnQN_16checker](W);
  	ELL_3V_COPY(debug + 3*(ui + 512 + 1024*vi), map + 3*qn);
        }
--- 147,151 ----
  	ELL_3V_SET(V, u, v, w);
  	ELL_3MV_MUL(W, V2W, V);
! 	qn = limnVtoQN_f[limnQN16checker](W);
  	ELL_3V_COPY(debug + 3*(ui + 512 + 1024*vi), map + 3*qn);
        }