diff --git a/release.nix b/release.nix deleted file mode 100644 index f88ea3f..0000000 --- a/release.nix +++ /dev/null @@ -1,26 +0,0 @@ -let - nixpkgs = fetchGit { - url = git://github.com/NixOS/nixpkgs-channels; - ref = "nixos-18.09"; - }; - - config = { - packageOverrides = pkgs: rec { - haskellPackages = pkgs.haskellPackages.override { - overrides = haskellPackagesNew: haskellPackagesOld: rec { - SVGFonts - = pkgs.haskellPackages.callHackage "SVGFonts" "1.6.0.3" {}; - - project - = haskellPackagesNew.callCabal2nix "image-triangles" ../image-triangles {}; - - }; - }; - }; - }; - - pkgs = import nixpkgs {inherit config;}; -in - { - project = pkgs.haskellPackages.project; - } diff --git a/shell.nix b/shell.nix deleted file mode 100644 index 768d281..0000000 --- a/shell.nix +++ /dev/null @@ -1 +0,0 @@ -(import ./release.nix).project.env diff --git a/src/Main.hs b/src/Main.hs index 746fccd..0b026d2 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -27,7 +27,7 @@ defaultOpts = Options { } genList :: StdGen -> [StdGen] -genList = map mkStdGen . randoms +genList = map snd . iterate (split . fst) . split -- CL.rgb might be the wrong fn... tosRGB' :: (Ord b, Floating b) => Pixel G.RGB b -> CL.Colour b @@ -48,10 +48,10 @@ renderTri image dimensions gen progress = Ren.makeTriangle (Ren.toPointList dime -- the following should be considered triangle shaders -- modify them to your liking, their outputs are expected to be in [0, 1] -- TODO: move these into a separate module - opacity' = 0.4 - --opacity' = 1 - area + -- opacity' = 0.4 + opacity' = 0.3 + ((1 - progress) * 0.5) - area = max ((progress ** 2) * 0.2) 0.01 + area = max ((progress ** 2) * 0.2) 0.02