git.iko.soy/elk
on master help sign in
spinning cube demo!
3e2d2e9John P Mayer Jr
libraries/MJS.elm+3
compare with master
unifiedsplit
@@ -15,6 +15,9 @@ v3 = Native.MJS.v3
15m4x4identity : M4x4
15m4x4identity : M4x4
16m4x4identity = Native.MJS.m4x4identity
16m4x4identity = Native.MJS.m4x4identity
17
17
18+m4x4mul : M4x4 -> M4x4 -> M4x4
19+m4x4mul = Native.MJS.m4x4mul
20+
18m4x4makeRotate : Float -> V3 -> M4x4
21m4x4makeRotate : Float -> V3 -> M4x4
19m4x4makeRotate = Native.MJS.m4x4makeRotate
22m4x4makeRotate = Native.MJS.m4x4makeRotate
20
23
libraries/Native/Graphics/WebGL.js+1
@@ -228,6 +228,7 @@ Elm.Native.Graphics.WebGL.make = function(elm) {
228
228
229 var node = newNode('canvas');
229 var node = newNode('canvas');
230 var gl = node.getContext('webgl') || node.getContext('experimental-webgl');
230 var gl = node.getContext('webgl') || node.getContext('experimental-webgl');
231+ gl.enable(gl.DEPTH_TEST);
231
232
232 model.cache.gl = gl;
233 model.cache.gl = gl;
233 model.cache.programs = [];
234 model.cache.programs = [];
tests/good/Box.elm+39−15
@@ -1,30 +1,50 @@
1
1
2−import MJS (V3,v3,M4x4,m4x4makeRotate)
2+import MJS (V3,M4x4,v3,m4x4makeRotate,m4x4makePerspective,m4x4makeLookAt,m4x4mul)
3import Graphics.WebGL (Program, link, Triangle, zipTriangle, Buffer, bind, Model, encapsulate, webgl)
3import Graphics.WebGL (Program, link, Triangle, zipTriangle, Buffer, bind, Model, encapsulate, webgl)
4
4
5-- Define what our geometry looks like
5-- Define what our geometry looks like
6
6
7−topleft = v3 -1 1 0
7+p0 = v3 1 1 1
8−topright = v3 1 1 0
8+p1 = v3 -1 1 1
9−botleft = v3 -1 -1 0
9+p2 = v3 -1 -1 1
10+p3 = v3 1 -1 1
11+p4 = v3 1 -1 -1
12+p5 = v3 1 1 -1
13+p6 = v3 -1 1 -1
10−botright = v3 1 -1 0
14+p7 = v3 -1 -1 -1
11
15
12−red = v3 1 0 0
16+front = [(p0,p1,p2),(p2,p3,p0)]
13−green = v3 0 1 0
17+back = [(p5,p6,p7),(p7,p4,p5)]
14−blue = v3 0 0 1
18+right = [(p0,p3,p4),(p4,p5,p0)]
19+left = [(p1,p2,p7),(p7,p6,p1)]
20+top = [(p0,p5,p6),(p6,p1,p0)]
21+bottom = [(p3,p4,p7),(p7,p2,p3)]
15
22
23+positions = front ++ back ++ right ++ left ++ top ++ bottom
24+
25+gray = v3 0.7 0.7 0.7
26+red = v3 1 0 0
27+green = v3 0 1 0
28+blue = v3 0 0 1
29+yellow = v3 1 1 0
30+purple = v3 0 1 1
31+
32+repeat n elem = map (\_ -> elem) [0..n-1]
33+
16−colors = [(red,green,blue),(red,green,blue)]
34+colors = concat . map (\c -> repeat 2 (c,c,c)) <| [gray,red,green,blue,yellow,purple]
17
35
18mesh : [Triangle {pos : V3, color : V3}]
36mesh : [Triangle {pos : V3, color : V3}]
19−mesh = zipWith (zipTriangle (\pos color -> { pos = pos, color = color })) [(topleft, topright, botleft), (topright, botleft, botright)] colors
37+mesh = zipWith (zipTriangle (\pos color -> { pos = pos, color = color })) positions colors
20
38
21vert = [glShader|
39vert = [glShader|
22attribute vec3 pos;
40attribute vec3 pos;
23attribute vec3 color;
41attribute vec3 color;
42+uniform mat4 per;
43+uniform mat4 cam;
24uniform mat4 rot;
44uniform mat4 rot;
25varying vec3 vcolor;
45varying vec3 vcolor;
26void main () {
46void main () {
27− gl_Position = rot * vec4(pos, 1.0);
47+ gl_Position = per * cam * rot * vec4(pos, 1.0);
28 vcolor = color;
48 vcolor = color;
29}
49}
30|]
50|]
@@ -37,17 +57,21 @@ void main () {
37}
57}
38|]
58|]
39
59
40−prog : Program {pos : V3, color : V3} { rot : M4x4 }
41prog = link vert frag
60prog = link vert frag
42
61
43buf : Buffer {pos : V3, color : V3}
62buf : Buffer {pos : V3, color : V3}
44buf = bind mesh
63buf = bind mesh
45
64
65+per : M4x4
66+per = m4x4makePerspective 45 1 0.01 100
67+
68+cam : M4x4
69+cam = m4x4makeLookAt (v3 0 0 5) (v3 0 0 0) (v3 0 1 0)
70+
46angle : Signal Float
71angle : Signal Float
47−angle = foldp (\_ n -> n + 0.1) 0 (fps 25)
72+angle = foldp (\_ n -> n + 0.02) 0 (fps 25)
48
73
49−rot : Signal { rot : M4x4 }
50−rot = (\t -> { rot = m4x4makeRotate t (v3 0 1 0) }) <~ angle
74+rot = (\t -> { rot = m4x4mul (m4x4makeRotate (3*t) (v3 0 1 0)) (m4x4makeRotate (2*t) (v3 1 0 0)), per = per, cam = cam }) <~ angle
51
75
52draw : Signal [Model]
76draw : Signal [Model]
53draw = combine [ (encapsulate prog buf) <~ rot ]
77draw = combine [ (encapsulate prog buf) <~ rot ]