diff --git a/examples/demo_stars.hs b/examples/demo_stars.hs index 9d812b8..8e168a0 100755 --- a/examples/demo_stars.hs +++ b/examples/demo_stars.hs @@ -8,8 +8,8 @@ module Main where import Reanimate -import Reanimate.Interpolate import Reanimate.Builtin.Documentation +import Reanimate.ColorComponents import System.Random import Data.List import Codec.Picture.Types diff --git a/examples/doc_circlePlot.hs b/examples/doc_circlePlot.hs index a97f846..36ec0b2 100755 --- a/examples/doc_circlePlot.hs +++ b/examples/doc_circlePlot.hs @@ -5,7 +5,7 @@ module Main(main) where import Reanimate hiding (raster, hsv) import Reanimate.Builtin.Documentation import Reanimate.Builtin.CirclePlot -import Reanimate.Interpolate +import Reanimate.ColorComponents import Data.Colour.RGBSpace.HSV import Data.Colour.RGBSpace import Data.Colour.SRGB diff --git a/examples/doc_hsvComponents.hs b/examples/doc_hsvComponents.hs index 3616603..da70753 100755 --- a/examples/doc_hsvComponents.hs +++ b/examples/doc_hsvComponents.hs @@ -3,8 +3,8 @@ module Main(main) where import Reanimate -import Reanimate.Interpolate import Reanimate.Builtin.Documentation +import Reanimate.ColorComponents import Codec.Picture main :: IO () diff --git a/examples/doc_labComponents.hs b/examples/doc_labComponents.hs index 71af8e9..aff016a 100755 --- a/examples/doc_labComponents.hs +++ b/examples/doc_labComponents.hs @@ -3,8 +3,8 @@ module Main(main) where import Reanimate -import Reanimate.Interpolate import Reanimate.Builtin.Documentation +import Reanimate.ColorComponents import Codec.Picture main :: IO () diff --git a/examples/doc_lchComponents.hs b/examples/doc_lchComponents.hs index c21b4b5..33c32a4 100755 --- a/examples/doc_lchComponents.hs +++ b/examples/doc_lchComponents.hs @@ -3,8 +3,8 @@ module Main(main) where import Reanimate -import Reanimate.Interpolate import Reanimate.Builtin.Documentation +import Reanimate.ColorComponents import Codec.Picture main :: IO () diff --git a/examples/doc_rgbComponents.hs b/examples/doc_rgbComponents.hs index 59c70fd..c27cb97 100755 --- a/examples/doc_rgbComponents.hs +++ b/examples/doc_rgbComponents.hs @@ -3,8 +3,8 @@ module Main(main) where import Reanimate -import Reanimate.Interpolate import Reanimate.Builtin.Documentation +import Reanimate.ColorComponents import Codec.Picture main :: IO () diff --git a/examples/doc_ternaryPlot.hs b/examples/doc_ternaryPlot.hs index 638c685..e038685 100755 --- a/examples/doc_ternaryPlot.hs +++ b/examples/doc_ternaryPlot.hs @@ -5,7 +5,7 @@ module Main(main) where import Reanimate hiding (raster) import Reanimate.Builtin.Documentation import Reanimate.Builtin.TernaryPlot -import Reanimate.Interpolate +import Reanimate.ColorComponents import Data.Colour.CIE import Codec.Picture.Types diff --git a/examples/doc_xyzComponents.hs b/examples/doc_xyzComponents.hs index 5e4d4fe..76f75b1 100755 --- a/examples/doc_xyzComponents.hs +++ b/examples/doc_xyzComponents.hs @@ -3,8 +3,8 @@ module Main(main) where import Reanimate -import Reanimate.Interpolate import Reanimate.Builtin.Documentation +import Reanimate.ColorComponents import Codec.Picture main :: IO () diff --git a/examples/morphology_color.hs b/examples/morphology_color.hs index 6d8f101..b3966f5 100755 --- a/examples/morphology_color.hs +++ b/examples/morphology_color.hs @@ -6,7 +6,7 @@ module Main(main) where import Codec.Picture import Reanimate -import Reanimate.Interpolate +import Reanimate.ColorComponents import Reanimate.Morph.Common import Reanimate.Morph.Linear diff --git a/reanimate.cabal b/reanimate.cabal index 40a7bcf..520fe6d 100644 --- a/reanimate.cabal +++ b/reanimate.cabal @@ -80,9 +80,9 @@ library Reanimate.Morph.LineBend Reanimate.Morph.Cache Reanimate.Raster + Reanimate.ColorComponents Reanimate.ColorMap Reanimate.ColorSpace - Reanimate.Interpolate Reanimate.Memo Reanimate.Scene Reanimate.Povray diff --git a/src/Reanimate/Interpolate.hs b/src/Reanimate/ColorComponents.hs similarity index 98% rename from src/Reanimate/Interpolate.hs rename to src/Reanimate/ColorComponents.hs index be9cafd..333f356 100644 --- a/src/Reanimate/Interpolate.hs +++ b/src/Reanimate/ColorComponents.hs @@ -1,5 +1,5 @@ {-# LANGUAGE RecordWildCards #-} -module Reanimate.Interpolate where +module Reanimate.ColorComponents where import Codec.Picture import Codec.Picture.Types diff --git a/src/Reanimate/Morph/Common.hs b/src/Reanimate/Morph/Common.hs index acc104e..ae11b2d 100644 --- a/src/Reanimate/Morph/Common.hs +++ b/src/Reanimate/Morph/Common.hs @@ -24,7 +24,7 @@ import Graphics.SvgTree (DrawAttributes, Texture (..), strokeOpacity) import Linear.V2 import Reanimate.Animation -import Reanimate.Interpolate +import Reanimate.ColorComponents import Reanimate.Math.EarClip import Reanimate.Math.Polygon (Polygon, mkPolygon, pAddPoints, pCentroid, pRing, pSize, pdualPolygons, diff --git a/src/Reanimate/Morph/Linear.hs b/src/Reanimate/Morph/Linear.hs index 8bcca28..6c9a6cb 100644 --- a/src/Reanimate/Morph/Linear.hs +++ b/src/Reanimate/Morph/Linear.hs @@ -8,7 +8,7 @@ module Reanimate.Morph.Linear import Data.Hashable import qualified Data.Vector as V import Linear.Vector -import Reanimate.Interpolate +import Reanimate.ColorComponents import Reanimate.Math.Common import Reanimate.Math.Polygon import Reanimate.Morph.Cache diff --git a/videos/color-theory/Spectrum.hs b/videos/color-theory/Spectrum.hs index c50052f..6badf26 100755 --- a/videos/color-theory/Spectrum.hs +++ b/videos/color-theory/Spectrum.hs @@ -30,11 +30,11 @@ import Reanimate.Animation import Reanimate.Builtin.CirclePlot import Reanimate.Builtin.Documentation import qualified Reanimate.Builtin.TernaryPlot as Ternary +import Reanimate.ColorComponents import Reanimate.ColorMap import Reanimate.ColorSpace import Reanimate.Constants import Reanimate.Effect -import Reanimate.Interpolate import Reanimate.LaTeX import Reanimate.Raster import Reanimate.Scene diff --git a/videos/color-theory/color-theory.hs b/videos/color-theory/color-theory.hs index 6f2f3a1..29570f4 100755 --- a/videos/color-theory/color-theory.hs +++ b/videos/color-theory/color-theory.hs @@ -20,6 +20,7 @@ import Graphics.SvgTree.Memo import Numeric import Reanimate import Reanimate.Animation +import Reanimate.ColorComponents import Reanimate.ColorMap import Reanimate.ColorSpace import Reanimate.Builtin.Flip @@ -30,7 +31,6 @@ import Reanimate.Raster import Reanimate.Scene import Reanimate.Ease import Reanimate.Transition -import Reanimate.Interpolate import Reanimate.Svg import System.IO.Unsafe diff --git a/videos/color-theory/gen_lab.hs b/videos/color-theory/gen_lab.hs index c11d36b..6691835 100644 --- a/videos/color-theory/gen_lab.hs +++ b/videos/color-theory/gen_lab.hs @@ -23,12 +23,12 @@ import Reanimate.Animation import Reanimate.Builtin.CirclePlot import Reanimate.Builtin.Documentation import qualified Reanimate.Builtin.TernaryPlot as Ternary +import Reanimate.ColorComponents import Reanimate.ColorMap import Reanimate.ColorSpace import Reanimate.Constants import Reanimate.Driver (reanimate) import Reanimate.Effect -import Reanimate.Interpolate import Reanimate.LaTeX import Reanimate.Raster import Reanimate.Scene