[Teem-commit] teem/src/mite kindnot.c,1.3,1.4 mite.h,1.29,1.30 ray.c,1.21,1.22 user.c,1.18,1.19

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

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

Modified Files:
	kindnot.c mite.h ray.c user.c 
Log Message:
added fakeFrom for faking out view-dependent txfs, and started to added miteValWdotD

Index: ray.c
===================================================================
RCS file: /cvsroot/teem/teem/src/mite/ray.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ray.c	25 Mar 2004 03:13:33 -0000	1.21
--- ray.c	11 Apr 2004 15:07:27 -0000	1.22
***************
*** 145,148 ****
--- 145,154 ----
    }
  
+   /* set (fake) view based on fake from */
+   if (AIR_EXISTS(muu->fakeFrom[0])) {
+     ELL_3V_SUB(mtt->V, samplePosWorld, muu->fakeFrom);
+     ELL_3V_NORM(mtt->V, mtt->V, len);
+   }
+ 
    /* do probing at this location to determine values of everything
       that might appear in the txf domain */

Index: kindnot.c
===================================================================
RCS file: /cvsroot/teem/teem/src/mite/kindnot.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** kindnot.c	4 Mar 2004 14:04:07 -0000	1.3
--- kindnot.c	11 Apr 2004 15:07:27 -0000	1.4
***************
*** 39,43 ****
    "GTdotV",
    "VdefT",
!   "VdefTdotV"
  };
  
--- 39,44 ----
    "GTdotV",
    "VdefT",
!   "VdefTdotV",
!   "WdotD"
  };
  
***************
*** 60,64 ****
    miteValGTdotV,
    miteValVdefT,
!   miteValVdefTdotV
  };
  
--- 61,66 ----
    miteValGTdotV,
    miteValVdefT,
!   miteValVdefTdotV,
!   miteValWdotD,
  };
  
***************
*** 80,84 ****
    "gtdotv",
    "vdeft",
!   "vdeftdotv"
    ""
  };
--- 82,87 ----
    "gtdotv",
    "vdeft",
!   "vdeftdotv",
!   "wdotd",
    ""
  };
***************
*** 101,105 ****
    miteValGTdotV,
    miteValVdefT,
!   miteValVdefTdotV
  };
  
--- 104,109 ----
    miteValGTdotV,
    miteValVdefT,
!   miteValVdefTdotV,
!   miteValWdotD
  };
  
***************
*** 140,144 ****
    {miteValGTdotV,        1,  0,  {-1, -1, -1, -1, -1},                                    -1,  -1},
    {miteValVdefT,         3,  0,  {-1, -1, -1, -1, -1},                                    -1,  -1},
!   {miteValVdefTdotV,     1,  0,  {-1, -1, -1, -1, -1},                                    -1,  -1}
  };
  
--- 144,149 ----
    {miteValGTdotV,        1,  0,  {-1, -1, -1, -1, -1},                                    -1,  -1},
    {miteValVdefT,         3,  0,  {-1, -1, -1, -1, -1},                                    -1,  -1},
!   {miteValVdefTdotV,     1,  0,  {-1, -1, -1, -1, -1},                                    -1,  -1},
!   {miteValWdotD,         1,  0,  {-1, -1, -1, -1, -1},                                    -1,  -1}
  };
  

Index: user.c
===================================================================
RCS file: /cvsroot/teem/teem/src/mite/user.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** user.c	13 Mar 2004 20:03:10 -0000	1.18
--- user.c	11 Apr 2004 15:07:27 -0000	1.19
***************
*** 48,51 ****
--- 48,53 ----
    muu->opacNear1 = miteDefOpacNear1;
    muu->hctx = hooverContextNew();
+   ELL_3V_SET(muu->fakeFrom, AIR_NAN, AIR_NAN, AIR_NAN);
+   ELL_3V_SET(muu->vectorD, 0, 0, 0);
    airMopAdd(muu->umop, muu->hctx, (airMopper)hooverContextNix, airMopAlways);
    for (i=0; i<GAGE_KERNEL_NUM; i++) {

Index: mite.h
===================================================================
RCS file: /cvsroot/teem/teem/src/mite/mite.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** mite.h	4 Mar 2004 14:04:08 -0000	1.29
--- mite.h	11 Apr 2004 15:07:27 -0000	1.30
***************
*** 150,153 ****
--- 150,157 ----
    hooverContext *hctx;   /* context and input for all hoover-related things,
  			    including camera and image parameters */
+   double fakeFrom[3],    /* if non-NaN, then the "V"-dependent miteVal's will
+ 			    use this as the nominal eye point, instead of what
+ 			    is actually being used in the hooverContext */
+     vectorD[3];          /* some vector to use for something */
    /* local initial copies of kernels, later passed to gageKernelSet */
    NrrdKernelSpec *ksp[GAGE_KERNEL_NUM];
***************
*** 187,191 ****
    miteShadeMethodNone,        /* 1: no direction shading based on anything
  				 in the miteShadeSpec: just ambient, though
! 				 things are still compositited with the over
  				 operator, and transfer functions are free
  				 to implement whatever shading they can */
--- 191,195 ----
    miteShadeMethodNone,        /* 1: no direction shading based on anything
  				 in the miteShadeSpec: just ambient, though
! 				 things are still composited with the over
  				 operator, and transfer functions are free
  				 to implement whatever shading they can */
***************
*** 333,337 ****
    miteValGTdotV,        /* 13: "GTdotV", normal curvature in view direction,
  			       the contraction of the geometry tensor along
! 				he view vector (gage_t[1]) */
    miteValVdefT,         /* 14: "defT", view direction, deflected by tensor,
  			       then normalized (gage_t[3]) */
--- 337,341 ----
    miteValGTdotV,        /* 13: "GTdotV", normal curvature in view direction,
  			       the contraction of the geometry tensor along
! 			       the view vector (gage_t[1]) */
    miteValVdefT,         /* 14: "defT", view direction, deflected by tensor,
  			       then normalized (gage_t[3]) */
***************
*** 339,345 ****
  			       same as the tensor contraction along V,
  			       (gage_t[1]) */
    miteValLast
  };
! #define MITE_VAL_ITEM_MAX  15
  
  /*
--- 343,351 ----
  			       same as the tensor contraction along V,
  			       (gage_t[1]) */
+   miteValWdotD,         /* 16: "WdotD", world space position dotted with
+ 			       muu->vectorD */
    miteValLast
  };
! #define MITE_VAL_ITEM_MAX  16
  
  /*