Ported some examples

desktop/sources/lisp/prelude.lisp

@@ -1,16 +1,10 @@
 ; 
 (echo "Loading prelude.lisp")
-;
-(def frame-rect (frame))
 ; translate
 (defn translate 
   (r p) 
   (clone r 
-    (rect 
+    (rect p:x p:y r:w r:h)))
-      (of p :x) 
-      (of p :y) 
-      (of r :w) 
-      (of r :h))))
 ; times
 (defn times 
   (v f) 

desktop/sources/scripts/commander.js

@@ -204,22 +204,18 @@ function Commander (ronin) {
 
   // Splash
 
-  this.splash = `; welcome to ronin - v2.1
+  this.splash = `; welcome to ronin - v2.2
 (clear) 
 ; ronin path 
 (def align {
-    :x (sub (of (frame) :c) 500) 
+    :x (sub frame-rect:c 500) 
-    :y (sub (of (frame) :m) 150)})
+    :y (sub frame-rect:m 150)})
 ; outline 
 (fill 
-  (svg 
+  (svg align:x align:y "M15,15 L15,15 L285,15 L285,285 L15,285 Z") "#fff")
-    (of align :x) 
-    (of align :y) "M15,15 L15,15 L285,15 L285,285 L15,285 Z") "#fff")
 ; stroke
 (stroke 
-  (svg 
+  (svg align:x align:y "M60,60 L195,60 A45,45 0 0,1 240,105 A45,45 0 0,1 195,150 L60,150 M195,150 A45,45 0 0,1 240,195 L240,240 ") 5 "#000")`
-    (of align :x) 
-    (of align :y) "M60,60 L195,60 A45,45 0 0,1 240,105 A45,45 0 0,1 195,150 L60,150 M195,150 A45,45 0 0,1 240,195 L240,240 ") 5 "#000")`
 
   String.prototype.insert = function (s, i) { return [this.slice(0, i), `${s}`, this.slice(i)].join('') }
 }

examples/basics/gradients.lisp

@@ -1,31 +1,25 @@
 ; gradients
 (clear)
 ;
-(def radius (of (frame) :m))
+(def radius frame-rect:m)
 ;
 (def gradient-line 
-  (line 
+  (line frame-rect:c 0 frame-rect:c 
-    (of (frame) :c) 0 
+    frame-rect:h))
-    (of (frame) :c) 
-    (of (frame) :h)))
 ;
 (fill 
-  (circle 
+  (circle frame-rect:c frame-rect:m radius) 
-    (of (frame) :c) 
+  (gradient gradient-line 
-    (of (frame) :m) 
+    ("#72dec2" "white")))
-    radius) 
-  (gradient gradient-line ("#72dec2" "white")))
 ;
 (fill 
-  (circle 
+  (circle frame-rect:c frame-rect:m 
-    (of (frame) :c) 
-    (of (frame) :m) 
     (mul radius 0.75)) 
-  (gradient gradient-line ("white" "#72dec2")))
+  (gradient gradient-line 
+    ("white" "#72dec2")))
 ;
 (fill 
-  (circle 
+  (circle frame-rect:c frame-rect:m 
-    (of (frame) :c) 
-    (of (frame) :m) 
     (mul radius 0.5)) 
-  (gradient gradient-line ("#72dec2" "white")))
+  (gradient gradient-line 
+    ("#72dec2" "white")))

examples/basics/shapes.lisp

@@ -3,9 +3,9 @@
 (clear)
 
 ; variables
-(def center-w (div (of (frame) "w") 2))
+(def center-w (div frame-rect:w 2))
-(def center-h (div (of (frame) "h") 2))
+(def center-h (div frame-rect:h 2))
-(def rad (div (of (frame) "h") 4))
+(def rad (div frame-rect:h 4))
 
 ; draw circle
 (stroke 

examples/demo/fog.lisp

@@ -2,7 +2,6 @@
 (resetTransform)
 (clear)
 ;
-(def frame-rect (frame))
 (def mouse-pos (pos))
 (def prev-pos (pos))
 ;

examples/demo/spiral.lisp

@@ -1,6 +1,5 @@
 ; animated recusive spiral
 ; by @local_guru 
-(def frame-rect (frame))
 (defn rec 
   (v) 
   (if (gt v 0) 

examples/events/on-animate.lisp

@@ -4,13 +4,11 @@
 ; 
 (def frame-middle 
   (div 
-    (of 
+    frame-rect:h 2)) 
-      (frame) :h) 2)) 
 ; 
 (def seg-width 
   (div 
-    (of 
+    frame-rect:w seg-count)) 
-      (frame) :w) seg-count)) 
 ;
 (defn elevation 
   (i) 
@@ -21,8 +19,7 @@
           (time 0.001) 
           (div i 5))) 
       (div 
-        (of 
+        frame-rect:h 5)) frame-middle))
-          (frame) :h) 5)) frame-middle))
 ;
 (defn draw-dash 
   (i) 
@@ -40,8 +37,7 @@
         (elevation i)) 4 
       (gradient 
         (line 50 0 
-          (of 
+          frame-rect:w 0) 
-            (frame) :w) 0) 
         ("#ffb545" "#72dec2")))))
 ;
 (defn redraw 

examples/events/on-mouse.lisp

@@ -4,15 +4,15 @@
   (
     (clear) 
     ; vertical line 
-    (stroke (line (of e :x) 0 (of e :x) (of e :y)) 2 "#ff0000") 
+    (stroke (line e:x 0 e:x e:y) 2 "#ff0000") 
     ; horizontal line 
     (stroke 
-      (line 0 (of e :y) (of e :x) (of e :y)) 2 "#72dec2") 
+      (line 0 (of e :y) e:x e:y) 2 "#72dec2") 
     ; circle 
     (stroke 
       (circle 
-        (of e :x) 
+        e:x 
-        (of e :y) 30) 2 "#ffffff")))
+        e:y 30) 2 "#ffffff")))
 ;
 (on "mouse-down" redraw)
 (on "mouse-up" redraw)

examples/misc/theme.lisp

@@ -25,8 +25,7 @@
           (circle 
             (add 
               (div 
-                (of 
+                frame-rect:w 1.6) 
-                  (frame) "w") 1.6) 
               (mul 1.5 v)) 
             (mul 10 v) 
             (mul v