X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FGrid.hs;h=e4f3d62b9a661df068ec80e837fc9d7289734ea4;hb=f3d720f107f74b07a5f9f96e6a7c9c7a9022aeb0;hp=01d73a2576cd11173fb281e06996c8a102a4ad29;hpb=c832bb3ac428a0d96759d9c82e9547d3acf4353d;p=spline3.git diff --git a/src/Grid.hs b/src/Grid.hs index 01d73a2..e4f3d62 100644 --- a/src/Grid.hs +++ b/src/Grid.hs @@ -71,8 +71,9 @@ cubes delta fvs j <- [0..ymax], k <- [0..zmax], let tet_vol = (1/24)*(delta^(3::Int)), + let fvs' = make_values fvs i j k, let cube_ijk = - Cube delta i j k (make_values fvs i j k) tet_vol] + Cube delta i j k fvs' tet_vol] where xmax = xsize - 1 ymax = ysize - 1 @@ -148,7 +149,6 @@ zoom_result g (sfx, sfy, sfz) (R.Z R.:. m R.:. n R.:. o) = o' = (fromIntegral o) / (fromIntegral sfz) - offset p = (m', n', o') :: Point cube = find_containing_cube g p - -- Figure out i,j,k without importing those functions. t = find_containing_tetrahedron cube p f = polynomial t