git.iko.soy/elk
on master help sign in
Move Geometry into Collage. Get rid of Graphics prefix as appropriate.
commit6ca373bdeb9db8f64495778be5b631a5418fe3d4 authorevancz <info@elm-lang.org> dateSun 28 Apr 2013, 20:57 (14 years ago) parent104faf1
5 files changed+41−41
compare with master
unifiedsplit
compiler/Gen/CompileToJS.hs+1−1 compiler/Gen/ExtractNoscript.hs−1 compiler/Model/Libraries.hs+2−3 libraries/Graphics/Collage.elm+38−1 libraries/Graphics/Geometry.elm−35
compiler/Gen/CompileToJS.hs+1−1
@@ -20,7 +20,7 @@ import Types.Types ( Type(RecordT) )
2020showErr :: String -> String
2121showErr err = globalAssign "Elm.Main" (jsFunc "elm" body)
2222 where msg = show . concatMap (++"<br>") . lines $ err
23− body = "var T = Elm.Graphics.Text(elm);\n\
23+ body = "var T = Elm.Text(elm);\n\
2424 \return { main : T.text(T.monospace(" ++ msg ++ ")) };"
2525
2626indent = concatMap f
compiler/Gen/ExtractNoscript.hs−1
@@ -36,7 +36,6 @@ instance Extract Expr where
3636 (_ , ss1 , ss2 ) -> ss1 ++ ss2
3737 Lambda v e -> f e
3838 App (C _ _ (App (C _ _ (Var "link")) src)) txt -> linkExtract src txt
39− App (C _ _ (App (C _ _ (Var "Graphics.link")) src)) txt -> linkExtract src txt
4039 App (C _ _ (App (C _ _ (Var "Text.link")) src)) txt -> linkExtract src txt
4140 App (C _ _ (Var "header")) e -> tag "h1" e
4241 App (C _ _ (Var "bold")) e -> tag "b" e
compiler/Model/Libraries.hs+2−3
@@ -18,10 +18,9 @@ addPrelude (Module name exs ims stmts) = Module name exs (customIms ++ ims) stmt
1818
1919prelude = text : map (\n -> (n, Hiding [])) modules
2020 where
21− text = ("Graphics.Text", Hiding ["link", "color", "height"])
21+ text = ("Text", Hiding ["link", "color", "height"])
2222 modules = [ "Prelude", "Signal", "List", "Maybe", "Time"
23− , "Graphics.Element", "Graphics.Color"
24− , "Graphics.Collage", "Graphics.Geometry" ]
23+ , "Graphics.Element", "Color", "Graphics.Collage" ]
2524
2625libraries :: Map.Map String (Map.Map String String)
2726libraries =
libraries/Graphics/Collage.elm+38−1
@@ -1,8 +1,9 @@
11
22module Graphics.Collage where
33
4+import List
5+import Native.Utils (toFloat)
46import Either
5−import Graphics.Geometry
67import Native.Matrix2D as Matrix
78import Native.Graphics.Collage as N
89import Graphics.Element
@@ -96,3 +97,39 @@ moveX x f = { f | x <- f.x + x }
9697moveY y f = { f | y <- f.y + y }
9798
9899collage : Int -> Int -> [Form] -> Element
100+
101+
102+type Path = [(Float,Float)]
103+
104+path : [(Number a,Number a)] -> Path
105+path ps = ps
106+
107+segment : (Number a,Number a) -> (Number a,Number a) -> Path
108+segment p1 p2 = [p1,p2]
109+
110+type Shape = [(Float,Float)]
111+
112+polygon : [(Number a,Number a)] -> Shape
113+polygon points = points
114+
115+rect : Number a -> Number a -> Shape
116+rect w h = [ (0-w/2,0-h/2), (0-w/2,h/2), (w/2,h/2), (w/2,0-h/2) ]
117+
118+oval : Number a -> Number a -> Shape
119+oval w h =
120+ let n = 50
121+ t = 2 * Math.PI / n
122+ hw = w/2
123+ hh = h/2
124+ f i = (hw * Math.cos (t*i), hh * Math.sin (t*i))
125+ in map f [0..n-1]
126+
127+circle : Number a -> Shape
128+circle r = oval (2*r) (2*r)
129+
130+ngon : Int -> Number a -> Shape
131+ngon n r =
132+ let m = toFloat n
133+ t = 2 * Math.PI / m
134+ f i = ( r * Math.cos (t*i), r * Math.sin (t*i) )
135+ in map f [0..n-1]
libraries/Graphics/Geometry.elmdeleted−35
@@ -1,35 +0,0 @@
1−-- Paths and Shapes.
2−-- These structures are purely geometric forms, no colors or styles.
3−-- Could be the basis of some cool geometry stuff :)
4−
5−module Graphics.Geometry where
6−
7−import List
8−import Native.Utils (toFloat)
9−
10−type Path = [(Float,Float)]
11−
12−path ps = ps
13−segment p1 p2 = [p1,p2]
14−
15−type Shape = [(Float,Float)]
16−
17−polygon points = points
18−
19−rect w h = [ (0-w/2,0-h/2), (0-w/2,h/2), (w/2,h/2), (w/2,0-h/2) ]
20−
21−oval w h =
22− let n = 50
23− t = 2 * Math.PI / n
24− hw = w/2
25− hh = h/2
26− f i = (hw * Math.cos (t*i), hh * Math.sin (t*i))
27− in map f [0..n-1]
28−
29−circle r = oval (2*r) (2*r)
30−
31−ngon n r =
32− let m = toFloat n
33− t = 2 * Math.PI / m
34− f i = ( r * Math.cos (t*i), r * Math.sin (t*i) )
35− in map f [0..n-1]