wip

Author: juliaogris

.golangci.yaml

@@ -26,6 +26,7 @@ linters:
     - gomnd
     - ifshort
     - interfacer
+    - interfacebloat
     - ireturn
     - lll
     - maligned

frontend/courses/courses.json

@@ -22,7 +22,13 @@
         { "id": "dot", "title": "Red Dot" },
         { "id": "lines", "title": "Lines" },
         { "id": "squares", "title": "Squares" },
-        { "id": "rainbow", "title": "Rainbow" }
+        { "id": "rainbow", "title": "Rainbow" },
+        { "id": "fill", "title": "Fill, Stroke, Dash" },
+        { "id": "linestyle", "title": "Line Styles" },
+        { "id": "text", "title": "Text" },
+        { "id": "poly", "title": "Polygon and Polyline" },
+        { "id": "ellipse", "title": "Ellipse" },
+        { "id": "curve", "title": "Curve" }
       ]
     },
     {
@@ -31,6 +37,7 @@
       "emoji": "🤹‍♀️",
       "units": [
         { "id": "movingdot", "title": "Moving Red Dot" },
+        { "id": "bounce", "title": "Bounce" },
         { "id": "juggle", "title": "Juggle" },
         { "id": "splashtrig", "title": "Splash of Trig" },
         { "id": "draw", "title": "Draw" }

frontend/courses/sample/animate/bounce.evy

@@ -0,0 +1,17 @@
+background := "hsl(0deg 0% 0% / 10%)"
+x := 10
+y := 50
+s := 1
+width 1
+fill background
+stroke "red"
+
+on animate
+    clear background
+    move x y
+    circle 10
+    x = x + s
+    if x < 10 or x > 90
+        s = -s
+    end
+end

frontend/courses/sample/animate/juggle.evy

@@ -48,12 +48,6 @@ func delta:num d:num n:num
     return -d
 end
 
-func clear
-    color "white"
-    move 0 0
-    rect 100 100
-end
-
 func draw dot:{}num col:string
     color col
     move dot.x dot.y

frontend/courses/sample/animate/movingdot.evy

@@ -5,12 +5,6 @@ for i := range 0 100 0.1
     sleep 0.01
 end
 
-func clear
-    color "white"
-    move 0 0
-    rect 100 100
-end
-
 func dot x:num y:num
     color "red"
     move x y

frontend/courses/sample/animate/splashtrig.evy

@@ -60,7 +60,8 @@ for i := range (len dots)
 end
 
 on animate
-    clear
+    // 2% opacity leaves trails on movement
+    clear "hsl(0deg 100% 100% / 2%)"
 
     for dot := range dots
         update dot
@@ -72,13 +73,6 @@ func update dot:{}num
     dot.phase = dot.phase + dot.s
 end
 
-func clear
-    // 2% opacity leaves trails on movement
-    color "hsl(0deg 100% 100% / 2%)"
-    move 0 0
-    rect 100 100
-end
-
 func draw dot:{}num col:string
     color col
     x := 50 + dot.orbit * (cos (tau * dot.phase))

frontend/courses/sample/draw/curve.evy

@@ -0,0 +1 @@
+print "todo"

frontend/courses/sample/draw/ellipse.evy

@@ -0,0 +1,68 @@
+// TODO: stop code scrolling for onkey with execution...
+labels := ["radiusX" "radiusY" "roation°" "start°" "end°"]
+vals := [5 10 45 90 360]
+cnt := len vals
+
+fontfamily "arial"
+textsize 3.5
+cur := 1
+draw_table
+draw_ellipses
+
+on key k:string
+    if k == "ArrowLeft"
+        cur = (cur + cnt - 1) % cnt
+    else if k == "ArrowRight"
+        cur = (cur + 1) % cnt
+    else if k == "ArrowUp"
+        vals[cur] = vals[cur] + 1
+    else if k == "ArrowDown"
+        vals[cur] = vals[cur] - 1
+    end
+    clear
+    draw_ellipses
+    draw_table
+end
+
+func draw_ellipses
+    width 0.5
+    stroke "red"
+    fill "black"
+    ellipse 20 80 vals[0]
+    ellipse 40 80 vals[0] vals[1]
+    ellipse 60 80 vals[0] vals[1] vals[2]
+    ellipse 80 80 vals[0] vals[1] vals[2] vals[3] vals[4]
+
+end
+
+func draw_table
+    fill "none"
+    stroke "black"
+    width 0.2
+    // TODO: broken: for i := range (len labels) // works with labels in local scope
+    for i := range cnt
+        draw_table_column i labels[i] vals[i]
+    end
+    stroke "red"
+    width 0.7
+    // TODO: broken with "" inlined; keeping this as bug report, though param passing not needed
+    s := ""
+    draw_table_column cur s -1
+end
+
+func draw_table_column i:num label:string val:num
+    x := i * 18 + 8
+    w := 18
+    move x-3 9
+    rect w 16
+    if label == ""
+        return // rectangle only
+    end
+    move x-3 18
+    line x+15 18
+    move x 20
+    text label
+    move x 13
+    text (sprintf "%2.0f" val)
+end
+

frontend/courses/sample/draw/fill.evy

@@ -0,0 +1,44 @@
+width 2
+
+move 10 65
+color "red"
+circle 7
+move 3 40
+rect 14 14
+move 3 35
+line 17 35
+
+move 30 65
+stroke "blue"
+circle 7
+move 23 40
+rect 14 14
+move 23 35
+line 37 35
+
+move 50 65
+color "green"
+fill "orange"
+circle 7
+move 43 40
+rect 14 14
+move 43 35
+line 57 35
+
+move 70 65
+stroke "deeppink"
+fill "cyan"
+circle 7
+move 63 40
+rect 14 14
+move 63 35
+line 77 35
+
+move 90 65
+stroke "violet"
+fill "none"
+circle 7
+move 83 40
+rect 14 14
+move 83 35
+line 97 35

frontend/courses/sample/draw/linestyle.evy

@@ -0,0 +1,22 @@
+width 3
+linecap "round"
+move 5 80
+line 95 80
+
+linecap "butt"
+move 5 70
+line 95 70
+
+linecap "square"
+move 5 60
+line 95 60
+
+width 1
+move 5 30
+dash 5 3 1 3
+line 95 30
+
+dash
+move 5 20
+line 95 20
+