[Jrman-commit] drafts/src/org/jrman/grid FloatGrid.java,1.26,1.27 Point3fGrid.java,1.5,1.6 Tuple3fGrid.java,1.10,1.11 Vector3fGrid.java,1.8,1.9

[Gerardo H. <ma...@us...>]

Update of /cvsroot/jrman/drafts/src/org/jrman/grid
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11875/src/org/jrman/grid

Modified Files:
	FloatGrid.java Point3fGrid.java Tuple3fGrid.java 
	Vector3fGrid.java 
Log Message:
Undid changes in bicubic patch normals.


Index: Vector3fGrid.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/grid/Vector3fGrid.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Vector3fGrid.java	8 Feb 2004 08:54:55 -0000	1.8
--- Vector3fGrid.java	11 Jan 2006 06:23:23 -0000	1.9
***************
*** 66,70 ****
      }
  
!     public void vtransform(Vector3fGrid v, Transform transform, BooleanGrid cond) {
          Vector3f[] tdata = (Vector3f[]) data;
          Vector3f[] vdata = (Vector3f[]) v.data;
--- 66,71 ----
      }
  
!     public void vtransform(Vector3fGrid v, Transform transform,
!                            BooleanGrid cond) {
          Vector3f[] tdata = (Vector3f[]) data;
          Vector3f[] vdata = (Vector3f[]) v.data;
***************
*** 85,89 ****
      }
  
!     public void ntransform(Vector3fGrid n, Transform transform, BooleanGrid cond) {
          Vector3f[] tdata = (Vector3f[]) data;
          Vector3f[] ndata = (Vector3f[]) n.data;
--- 86,91 ----
      }
  
!     public void ntransform(Vector3fGrid n, Transform transform,
!                            BooleanGrid cond) {
          Vector3f[] tdata = (Vector3f[]) data;
          Vector3f[] ndata = (Vector3f[]) n.data;
***************
*** 149,153 ****
           }
           for (int i = 0; i < size; i += uSize) {
!              if (vdata[i + 1].x == 0 && vdata[i + 1].y == 0 && vdata[i + 1].z == 0)
                   vdata[i + 1].set(vdata[i + 2]);
               if (vdata[i].x == 0 && vdata[i].y == 0 && vdata[i].z == 0)
--- 151,156 ----
           }
           for (int i = 0; i < size; i += uSize) {
!              if (vdata[i + 1].x == 0 && vdata[i + 1].y == 0 &&
!                  vdata[i + 1].z == 0)
                   vdata[i + 1].set(vdata[i + 2]);
               if (vdata[i].x == 0 && vdata[i].y == 0 && vdata[i].z == 0)
***************
*** 155,159 ****
           }
           for (int i = uSize - 1; i < size; i += uSize) {
!              if (vdata[i - 1].x == 0 && vdata[i - 1].y == 0 && vdata[i - 1].z == 0)
                   vdata[i - 1].set(vdata[i - 2]);
               if (vdata[i].x == 0 && vdata[i].y == 0 && vdata[i].z == 0)
--- 158,163 ----
           }
           for (int i = uSize - 1; i < size; i += uSize) {
!              if (vdata[i - 1].x == 0 && vdata[i - 1].y == 0 &&
!                  vdata[i - 1].z == 0)
                   vdata[i - 1].set(vdata[i - 2]);
               if (vdata[i].x == 0 && vdata[i].y == 0 && vdata[i].z == 0)

Index: FloatGrid.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/grid/FloatGrid.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** FloatGrid.java	14 Dec 2005 01:08:49 -0000	1.26
--- FloatGrid.java	11 Jan 2006 06:23:23 -0000	1.27
***************
*** 718,725 ****
      }
  
!     public void mix(FloatGrid f1, FloatGrid f2, FloatGrid alpha, BooleanGrid cond) {
          for (int i = 0; i < size; i++)
              if (cond.data[i])
!                 data[i] = Calc.interpolate(f1.data[i], f2.data[i], alpha.data[i]);
      }
  
--- 718,727 ----
      }
  
!     public void mix(FloatGrid f1, FloatGrid f2, FloatGrid alpha,
!                     BooleanGrid cond) {
          for (int i = 0; i < size; i++)
              if (cond.data[i])
!                 data[i] =
!                     Calc.interpolate(f1.data[i], f2.data[i], alpha.data[i]);
      }
  
***************
*** 827,831 ****
      }
  
!     public void smoothstep(float f1, FloatGrid f2, float alpha, BooleanGrid cond) {
          for (int i = 0; i < size; i++)
              if (cond.data[i])
--- 829,834 ----
      }
  
!     public void smoothstep(float f1, FloatGrid f2, float alpha,
!                            BooleanGrid cond) {
          for (int i = 0; i < size; i++)
              if (cond.data[i])
***************
*** 874,878 ****
      }
  
!     public void smoothstep(FloatGrid f1, FloatGrid f2, float alpha, BooleanGrid cond) {
          for (int i = 0; i < size; i++)
              if (cond.data[i])
--- 877,882 ----
      }
  
!     public void smoothstep(FloatGrid f1, FloatGrid f2, float alpha,
!                            BooleanGrid cond) {
          for (int i = 0; i < size; i++)
              if (cond.data[i])
***************
*** 889,893 ****
          for (int i = 0; i < size; i++)
              if (cond.data[i])
!                 data[i] = Calc.smoothstep(f1.data[i], f2.data[i], alpha.data[i]);
      }
  
--- 893,898 ----
          for (int i = 0; i < size; i++)
              if (cond.data[i])
!                 data[i] =
!                     Calc.smoothstep(f1.data[i], f2.data[i], alpha.data[i]);
      }
  

Index: Point3fGrid.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/grid/Point3fGrid.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Point3fGrid.java	25 Oct 2003 05:46:47 -0000	1.5
--- Point3fGrid.java	11 Jan 2006 06:23:23 -0000	1.6
***************
*** 47,51 ****
      }
  
!     public void transform(Point3fGrid p, Transform transform, BooleanGrid cond) {
          Point3f[] tdata = (Point3f[]) data;
          Point3f[] pdata = (Point3f[]) p.data;
--- 47,52 ----
      }
  
!     public void transform(Point3fGrid p, Transform transform,
!                           BooleanGrid cond) {
          Point3f[] tdata = (Point3f[]) data;
          Point3f[] pdata = (Point3f[]) p.data;

Index: Tuple3fGrid.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/grid/Tuple3fGrid.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Tuple3fGrid.java	8 Feb 2004 08:54:55 -0000	1.10
--- Tuple3fGrid.java	11 Jan 2006 06:23:23 -0000	1.11
***************
*** 54,60 ****
      public void set(float in) {
          for (int i= 0; i < size; i++) {
!             data[i].x= in;
!             data[i].y= in;
!             data[i].z= in;
          }
      }
--- 54,60 ----
      public void set(float in) {
          for (int i= 0; i < size; i++) {
[...1334 lines suppressed...]
      }
  
      public void setzcomp(FloatGrid z) {
          for (int i= 0; i < size; i++)
!             data[i].z = z.data[i];
      }
  
***************
*** 889,893 ****
          for (int i= 0; i < size; i++)
              if (cond.data[i])
!                 data[i].z= z.data[i];
      }
  
--- 958,962 ----
          for (int i= 0; i < size; i++)
              if (cond.data[i])
!                 data[i].z = z.data[i];
      }