[Jrman-commit] drafts/src/org/jrman/grid FloatGrid.java,1.25,1.26

[Elmer G. <ega...@us...>]

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

Modified Files:
	FloatGrid.java 
Log Message:
Added missing file 


Index: FloatGrid.java
===================================================================
RCS file: /cvsroot/jrman/drafts/src/org/jrman/grid/FloatGrid.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** FloatGrid.java	13 Apr 2004 20:37:02 -0000	1.25
--- FloatGrid.java	14 Dec 2005 01:08:49 -0000	1.26
***************
*** 40,44 ****
      public float[] data;
  
!     private static float getFloat(MipMap texture, float s, float t, float area, int band) {
          texture.getData(s, t, area, mmData);
          return mmData[band];
--- 40,45 ----
      public float[] data;
  
!     private static float getFloat(MipMap texture, float s, float t, 
!                                   float area, int band) {
          texture.getData(s, t, area, mmData);
          return mmData[band];
***************
*** 814,818 ****
      }
  
!     public void smoothstep(float f1, float f2, FloatGrid alpha, BooleanGrid cond) {
          for (int i = 0; i < size; i++)
              if (cond.data[i])
--- 815,820 ----
      }
  
!     public void smoothstep(float f1, float f2, FloatGrid alpha, 
!                            BooleanGrid cond) {
          for (int i = 0; i < size; i++)
              if (cond.data[i])
***************
*** 836,840 ****
      }
  
!     public void smoothstep(float f1, FloatGrid f2, FloatGrid alpha, BooleanGrid cond) {
          for (int i = 0; i < size; i++)
              if (cond.data[i])
--- 838,843 ----
      }
  
!     public void smoothstep(float f1, FloatGrid f2, FloatGrid alpha, 
!                            BooleanGrid cond) {
          for (int i = 0; i < size; i++)
              if (cond.data[i])
***************
*** 847,851 ****
      }
  
!     public void smoothstep(FloatGrid f1, float f2, float alpha, BooleanGrid cond) {
          for (int i = 0; i < size; i++)
              if (cond.data[i])
--- 850,855 ----
      }
  
!     public void smoothstep(FloatGrid f1, float f2, float alpha,
!                            BooleanGrid cond) {
          for (int i = 0; i < size; i++)
              if (cond.data[i])
***************
*** 858,862 ****
      }
  
!     public void smoothstep(FloatGrid f1, float f2, FloatGrid alpha, BooleanGrid cond) {
          for (int i = 0; i < size; i++)
              if (cond.data[i])
--- 862,867 ----
      }
  
!     public void smoothstep(FloatGrid f1, float f2, FloatGrid alpha,
!                            BooleanGrid cond) {
          for (int i = 0; i < size; i++)
              if (cond.data[i])
***************
*** 880,884 ****
      }
  
!     public void smoothstep(FloatGrid f1, FloatGrid f2, FloatGrid alpha, BooleanGrid cond) {
          for (int i = 0; i < size; i++)
              if (cond.data[i])
--- 885,890 ----
      }
  
!     public void smoothstep(FloatGrid f1, FloatGrid f2, FloatGrid alpha, 
!                            BooleanGrid cond) {
          for (int i = 0; i < size; i++)
              if (cond.data[i])
***************
*** 913,919 ****
          for (int i = 0; i < size; i += uSize) {
              for (int j = 0; j < uSize - 1; j++)
!                 data[i + j] = (f1.data[i + j + 1] - f1.data[i + j]) / du.data[i + j];
              data[i + uSize - 1] =
!                 (f1.data[i + uSize - 1] - f1.data[i + uSize - 2]) / du.data[i + uSize - 1];
          }
      }
--- 919,927 ----
          for (int i = 0; i < size; i += uSize) {
              for (int j = 0; j < uSize - 1; j++)
!                 data[i + j] = (f1.data[i + j + 1] - f1.data[i + j]) / 
!                     du.data[i + j];
              data[i + uSize - 1] =
!                 (f1.data[i + uSize - 1] - f1.data[i + uSize - 2]) / 
!                 du.data[i + uSize - 1];
          }
      }
***************
*** 923,930 ****
              for (int j = 0; j < uSize - 1; j++)
                  if (cond.data[i + j])
!                     data[i + j] = (f1.data[i + j + 1] - f1.data[i + j]) / du.data[i + j];
              if (cond.data[i + uSize - 1])
                  data[i + uSize - 1] =
!                     (f1.data[i + uSize - 1] - f1.data[i + uSize - 2]) / du.data[i + uSize - 1];
          }
      }
--- 931,940 ----
              for (int j = 0; j < uSize - 1; j++)
                  if (cond.data[i + j])
!                     data[i + j] = (f1.data[i + j + 1] - f1.data[i + j]) / 
!                         du.data[i + j];
              if (cond.data[i + uSize - 1])
                  data[i + uSize - 1] =
!                     (f1.data[i + uSize - 1] - f1.data[i + uSize - 2]) / 
!                     du.data[i + uSize - 1];
          }
      }
***************
*** 945,949 ****
          for (int i = 0; i < size - uSize; i += uSize)
              for (int j = 0; j < uSize; j++)
!                 data[i + j] = (f1.data[i + j + uSize] - f1.data[i + j]) / dv.data[i + j];
          for (int i = size - uSize; i < size; i++)
              data[i] = (f1.data[i] - f1.data[i - uSize]) / dv.data[i];
--- 955,960 ----
          for (int i = 0; i < size - uSize; i += uSize)
              for (int j = 0; j < uSize; j++)
!                 data[i + j] = (f1.data[i + j + uSize] - f1.data[i + j]) / 
!                     dv.data[i + j];
          for (int i = size - uSize; i < size; i++)
              data[i] = (f1.data[i] - f1.data[i - uSize]) / dv.data[i];
***************
*** 954,958 ****
              for (int j = 0; j < uSize; j++)
                  if (cond.data[i + j])
!                     data[i + j] = (f1.data[i + j + uSize] - f1.data[i + j]) / dv.data[i + j];
          for (int i = size - uSize; i < size; i++)
              if (cond.data[i])
--- 965,970 ----
              for (int j = 0; j < uSize; j++)
                  if (cond.data[i + j])
!                     data[i + j] = (f1.data[i + j + uSize] - f1.data[i + j]) / 
!                         dv.data[i + j];
          for (int i = size - uSize; i < size; i++)
              if (cond.data[i])
***************
*** 991,1005 ****
      public void noise(FloatGrid x, FloatGrid y, FloatGrid z) {
          for (int i = 0; i < size; i++)
!             data[i] = 0.5f * PerlinNoise.noise3d(x.data[i], y.data[i], z.data[i]) + 0.5f;
      }
  
      public void noise(FloatGrid x, FloatGrid y, FloatGrid z, float w) {
          for (int i = 0; i < size; i++)
!             data[i] = 0.5f * PerlinNoise.noise4d(x.data[i], y.data[i], z.data[i], w) + 0.5f;
      }
  
      public void noise(Tuple3fGrid t) {
          for (int i = 0; i < size; i++)
!             data[i] = 0.5f * PerlinNoise.noise3d(t.data[i].x, t.data[i].y, t.data[i].z) + 0.5f;
      }
  
--- 1003,1020 ----
      public void noise(FloatGrid x, FloatGrid y, FloatGrid z) {
          for (int i = 0; i < size; i++)
!             data[i] = 0.5f * PerlinNoise.noise3d(x.data[i], y.data[i], 
!                                                  z.data[i]) + 0.5f;
      }
  
      public void noise(FloatGrid x, FloatGrid y, FloatGrid z, float w) {
          for (int i = 0; i < size; i++)
!             data[i] = 0.5f * PerlinNoise.noise4d(x.data[i], y.data[i], 
!                                                  z.data[i], w) + 0.5f;
      }
  
      public void noise(Tuple3fGrid t) {
          for (int i = 0; i < size; i++)
!             data[i] = 0.5f * PerlinNoise.noise3d(t.data[i].x, t.data[i].y,
!                                                  t.data[i].z) + 0.5f;
      }
  
***************
*** 1007,1011 ****
          for (int i = 0; i < size; i++)
              data[i] =
!                 0.5f * PerlinNoise.noise4d(t.data[i].x, t.data[i].y, t.data[i].z, w) + 0.5f;
  
      }
--- 1022,1027 ----
          for (int i = 0; i < size; i++)
              data[i] =
!                 0.5f * PerlinNoise.noise4d(t.data[i].x, t.data[i].y, 
!                                            t.data[i].z, w) + 0.5f;
  
      }
***************
*** 1037,1046 ****
      public void snoise(Tuple3fGrid t) {
          for (int i = 0; i < size; i++)
!             data[i] = PerlinNoise.noise3d(t.data[i].x, t.data[i].y, t.data[i].z);
      }
  
      public void snoise(Tuple3fGrid t, float w) {
          for (int i = 0; i < size; i++)
!             data[i] = PerlinNoise.noise4d(t.data[i].x, t.data[i].y, t.data[i].z, w);
      }
  
--- 1053,1064 ----
      public void snoise(Tuple3fGrid t) {
          for (int i = 0; i < size; i++)
!             data[i] = PerlinNoise.noise3d(t.data[i].x, t.data[i].y, 
!                                           t.data[i].z);
      }
  
      public void snoise(Tuple3fGrid t, float w) {
          for (int i = 0; i < size; i++)
!             data[i] = PerlinNoise.noise4d(t.data[i].x, t.data[i].y, 
!                                           t.data[i].z, w);
      }
  
***************
*** 1054,1058 ****
              float nx = x.data[i] > 0 ? x.data[i] % px : (-x.data[i]) % px;
              float pmx = px - nx;
!             data[i] = (PerlinNoise.noise1d(nx) * pmx + PerlinNoise.noise1d(-pmx) * nx);
              data[i] /= px;
              data[i] = .5f + data[i] * .5f;
--- 1072,1077 ----
              float nx = x.data[i] > 0 ? x.data[i] % px : (-x.data[i]) % px;
              float pmx = px - nx;
!             data[i] = (PerlinNoise.noise1d(nx) * pmx + 
!                        PerlinNoise.noise1d(-pmx) * nx);
              data[i] /= px;
              data[i] = .5f + data[i] * .5f;
***************
*** 1067,1074 ****
              float pmx = px - nx;
              float pmy = py - ny;
!             data[i] =
!                 (PerlinNoise.noise2d(nx, ny) * pmx + PerlinNoise.noise2d(-pmx, ny) * nx) * pmy;
!             data[i]
!                 += (PerlinNoise.noise2d(nx, -pmy) * pmx + PerlinNoise.noise2d(-pmx, -pmy) * nx)
                  * ny;
              data[i] /= px * py;
--- 1086,1093 ----
              float pmx = px - nx;
              float pmy = py - ny;
!             data[i] = (PerlinNoise.noise2d(nx, ny) * pmx + 
!                        PerlinNoise.noise2d(-pmx, ny) * nx) * pmy;
!             data[i] += (PerlinNoise.noise2d(nx, -pmy) * pmx + 
!                         PerlinNoise.noise2d(-pmx, -pmy) * nx)
                  * ny;
              data[i] /= px * py;
***************
*** 1077,1081 ****
      }
  
!     public void pnoise(FloatGrid x, FloatGrid y, FloatGrid z, float px, float py, float pz) {
          assert px > 0f && py > 0f && pz > 0f;
          for (int i = 0; i < size; i++) {
--- 1096,1101 ----
      }
  
!     public void pnoise(FloatGrid x, FloatGrid y, FloatGrid z, float px, 
!                        float py, float pz) {
          assert px > 0f && py > 0f && pz > 0f;
          for (int i = 0; i < size; i++) {
***************
*** 1196,1200 ****
      }
  
!     public void pnoise(Tuple3fGrid t, float w, float px, float py, float pz, float pw) {
          assert px > 0f && py > 0f && pz > 0f && pw > 0f;
          float nw = w > 0 ? w % pw : (-w) % pw;
--- 1216,1221 ----
      }
  
!     public void pnoise(Tuple3fGrid t, float w, float px, float py, float pz,
!                        float pw) {
          assert px > 0f && py > 0f && pz > 0f && pw > 0f;
          float nw = w > 0 ? w % pw : (-w) % pw;
***************
*** 1307,1321 ****
      public void cellnoise(FloatGrid x, FloatGrid y, FloatGrid z, float w) {
          for (int i = 0; i < size; i++)
!             data[i] = PerlinNoise.cellnoise4d(x.data[i], y.data[i], z.data[i], w);
      }
  
      public void cellnoise(Tuple3fGrid t) {
          for (int i = 0; i < size; i++)
!             data[i] = PerlinNoise.cellnoise3d(t.data[i].x, t.data[i].y, t.data[i].z);
      }
  
      public void cellnoise(Tuple3fGrid t, float w) {
          for (int i = 0; i < size; i++)
!             data[i] = PerlinNoise.cellnoise4d(t.data[i].x, t.data[i].y, t.data[i].z, w);
      }
  
--- 1328,1345 ----
      public void cellnoise(FloatGrid x, FloatGrid y, FloatGrid z, float w) {
          for (int i = 0; i < size; i++)
!             data[i] = PerlinNoise.cellnoise4d
!                 (x.data[i], y.data[i], z.data[i], w);
      }
  
      public void cellnoise(Tuple3fGrid t) {
          for (int i = 0; i < size; i++)
!             data[i] = PerlinNoise.cellnoise3d
!                 (t.data[i].x, t.data[i].y, t.data[i].z);
      }
  
      public void cellnoise(Tuple3fGrid t, float w) {
          for (int i = 0; i < size; i++)
!             data[i] = PerlinNoise.cellnoise4d
!                 (t.data[i].x, t.data[i].y, t.data[i].z, w);
      }
  
***************
*** 1530,1534 ****
       */
  
!     public void texture(String textureName, FloatGrid s, FloatGrid t, float blur, int band) {
          MipMap texture = MipMap.getMipMap(textureName);
          for (int v = 0; v < vSize; v++)
--- 1554,1559 ----
       */
  
!     public void texture(String textureName, FloatGrid s, FloatGrid t, 
!                         float blur, int band) {
          MipMap texture = MipMap.getMipMap(textureName);
          for (int v = 0; v < vSize; v++)
***************
*** 1541,1552 ****
                      v1 = v - 1;
                  float area =
!                     ((s.get(u, v) + s.get(u1, v)) * (t.get(u, v) - t.get(u1, v))
!                         + (s.get(u1, v) + s.get(u1, v1)) * (t.get(u1, v) - t.get(u1, v1))
!                         + (s.get(u1, v1) + s.get(u, v1)) * (t.get(u1, v1) - t.get(u, v1))
!                         + (s.get(u, v1) + s.get(u, v)) * (t.get(u, v1) - t.get(u, v)))
                          / 2f;
                  area = Math.abs(area) + blur;
!                 float avgS = (s.get(u, v) + s.get(u1, v) + s.get(u1, v1) + s.get(u, v1)) / 4f;
!                 float avgT = (t.get(u, v) + t.get(u1, v) + t.get(u1, v1) + t.get(u, v1)) / 4f;
                  set(u, v, getFloat(texture, avgS, avgT, area, band));
              }
--- 1566,1583 ----
                      v1 = v - 1;
                  float area =
!                     ((s.get(u, v) + s.get(u1, v)) * 
!                      (t.get(u, v) - t.get(u1, v))
!                         + (s.get(u1, v) + s.get(u1, v1)) * 
!                      (t.get(u1, v) - t.get(u1, v1))
!                         + (s.get(u1, v1) + s.get(u, v1)) * 
!                      (t.get(u1, v1) - t.get(u, v1))
!                         + (s.get(u, v1) + s.get(u, v)) * 
!                      (t.get(u, v1) - t.get(u, v)))
                          / 2f;
                  area = Math.abs(area) + blur;
!                 float avgS = (s.get(u, v) + s.get(u1, v) + 
!                               s.get(u1, v1) + s.get(u, v1)) / 4f;
!                 float avgT = (t.get(u, v) + t.get(u1, v) + 
!                               t.get(u1, v1) + t.get(u, v1)) / 4f;
                  set(u, v, getFloat(texture, avgS, avgT, area, band));
              }
***************
*** 1581,1585 ****
                      u,
                      v,
!                     shadowMap.get(p1, p2, bias, isamples, oneOverSamples, blur, halfBlur));
              }
      }
--- 1612,1617 ----
                      u,
                      v,
!                     shadowMap.get
!                     (p1, p2, bias, isamples, oneOverSamples, blur, halfBlur));
              }
      }