formatting
This commit is contained in:
parent
2c2ad42325
commit
125762ea59
3 changed files with 197 additions and 199 deletions
|
|
@ -3,7 +3,9 @@ module Main where
|
|||
import Control.Arrow
|
||||
import qualified Control.Monad as M
|
||||
import qualified Control.Monad.Parallel as MP
|
||||
import Control.Monad.Zip (MonadZip (mzipWith))
|
||||
import Control.Parallel.Strategies
|
||||
import qualified Data.Bifunctor as Bi
|
||||
import qualified Data.Colour as C
|
||||
import qualified Data.Colour.Names as CN
|
||||
import Data.Colour.RGBSpace (uncurryRGB)
|
||||
|
|
@ -15,6 +17,7 @@ import qualified Data.Maybe as My
|
|||
import qualified Data.Set as S
|
||||
import qualified Data.Vector.Unboxed as Vec
|
||||
import Debug.Trace
|
||||
import qualified Debug.Trace as D
|
||||
import qualified Debug.Trace as DT
|
||||
import qualified Debug.Trace as T
|
||||
import qualified Diagrams as DP
|
||||
|
|
@ -26,6 +29,7 @@ import GHC.Generics
|
|||
import Graphics.Image as Img hiding (map, zipWith)
|
||||
import qualified Graphics.Image.ColorSpace as G
|
||||
import qualified Graphics.Image.Interface as Int
|
||||
import qualified MinDistanceSample as MDS
|
||||
import Options.Generic
|
||||
import qualified System.Environment as Env
|
||||
import System.Random
|
||||
|
|
@ -33,10 +37,6 @@ import System.Random.Internal
|
|||
import System.Random.SplitMix
|
||||
import Triangles (getTriangleAverageRGB)
|
||||
import qualified Triangles as Tri
|
||||
import qualified MinDistanceSample as MDS
|
||||
import Control.Monad.Zip (MonadZip(mzipWith))
|
||||
import qualified Data.Bifunctor as Bi
|
||||
import qualified Debug.Trace as D
|
||||
|
||||
-- CL.rgb might be the wrong fn...
|
||||
tosRGB' :: (Ord b, Floating b) => Pixel G.RGB b -> CL.Colour b
|
||||
|
|
@ -92,7 +92,6 @@ genImage image minDistance gen =
|
|||
. Tri.toPlanarGraph
|
||||
$ corners'
|
||||
|
||||
|
||||
averageSideSize = (fromIntegral (uncurry (+) dimensions)) / 2
|
||||
|
||||
padding = (/) 10 . (*) widthHeightRatio <$> V2 1 1
|
||||
|
|
|
|||
|
|
@ -3,14 +3,14 @@ module MinDistanceSample where
|
|||
import qualified Control.Monad as M
|
||||
import qualified Data.Array as A
|
||||
import qualified Data.Bifunctor as B
|
||||
import qualified Data.Ix as Ix
|
||||
import qualified Data.List as L
|
||||
import qualified Data.List.NonEmpty as NE
|
||||
import qualified Data.Map.Strict as M
|
||||
import qualified Data.Maybe as My
|
||||
import qualified Debug.Trace as D
|
||||
import Diagrams.Prelude
|
||||
import System.Random.Stateful
|
||||
import qualified Data.Map.Strict as M
|
||||
import qualified Data.Ix as Ix
|
||||
|
||||
k :: Int
|
||||
k = 10
|
||||
|
|
@ -68,6 +68,8 @@ randomPoints dims minDistance gen' = runStateGen_ gen' randomPointsM
|
|||
|
||||
isValidPoint :: Point V2 Double -> Bool
|
||||
isValidPoint p =
|
||||
(Ix.inRange gridBounds (floor <$> p)) && (all ((>= 1) . abs . norm . (p .-.))
|
||||
(Ix.inRange gridBounds (floor <$> p))
|
||||
&& ( all ((>= 1) . abs . norm . (p .-.))
|
||||
. My.mapMaybe ((grid M.!?) . fmap floor . (p .-^))
|
||||
$ unitVectorsAround)
|
||||
$ unitVectorsAround
|
||||
)
|
||||
|
|
|
|||
|
|
@ -46,8 +46,6 @@ derivingUnbox
|
|||
[|toSRGBTuple|]
|
||||
[|fromSRGBTuple|]
|
||||
|
||||
|
||||
|
||||
-- from -0.05 to 1.05 so there aren't missing/elongated triangles at the edges
|
||||
borderSize = 0.05
|
||||
|
||||
|
|
@ -70,7 +68,6 @@ combinations xs =
|
|||
. tails
|
||||
$ xs
|
||||
where
|
||||
|
||||
xsLen = length xs
|
||||
|
||||
toPlanarGraph :: forall n. (NFData n, Floating n, Ord n) => [P2 n] -> [(Point V2 n, Point V2 n)]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue