From c8401c8cdc5a3457498bbef52efeda6a4bd99e44 Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Thu, 18 Jul 2019 14:44:12 +0900
Subject: [PATCH] Trying to fix the (rescale) async issue

---
 README.md                          |  8 +++---
 desktop/sources/scripts/library.js | 39 ++++++++++++++++--------------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/README.md b/README.md
index 36453b0..c953b45 100644
--- a/README.md
+++ b/README.md
@@ -62,13 +62,14 @@ npm start
 - `(range start end ~step)` 
 - `(get item key)` Gets an object's parameter with name.
 - `(set item key val)` Sets an object's parameter with name as value.
+- `(of h ...keys)` 
 - `(frame)` Returns a rect of the frame.
 - `(center)` Returns a position of the center of the frame.
 - `(scale rect w h)` 
-- `(resize ~w ~h)` 
+- `(resize w h)` Resizes the canvas to target w and h, returns the rect.
+- `(rescale w h)` Rescales the canvas to target ratio of w and h, returns the rect.
 - `(crop rect)` 
 - `(clone a b)` 
-- `(of h ...keys)` 
 - `(theme variable ~el)` 
 - `(gradient [x1 y1 x2 y2] ~colors 'black'])` 
 - `(pixels rect fn q)` 
@@ -79,10 +80,9 @@ npm start
 - `(open path)` Imports a graphic file and resizes the frame.
 - `(folder ~path)` Returns the content of a folder path.
 - `(exit ~force)` Exits Ronin.
-- `(ronin)` 
 - `(time)` Returns timestamp in milliseconds.
 - `(animate ~play)` Toggles animation.
-- `(js)` 
+- `(js)` Javascript interop.
 - `(test name a b)` 
 
 ## Extras
diff --git a/desktop/sources/scripts/library.js b/desktop/sources/scripts/library.js
index e9b4b03..c03e8e4 100644
--- a/desktop/sources/scripts/library.js
+++ b/desktop/sources/scripts/library.js
@@ -212,6 +212,12 @@ function Library (ronin) {
     return item[key]
   }
 
+  this.of = (h, ...keys) => {
+    return keys.reduce((acc, key) => {
+      return acc[key]
+    }, h)
+  }
+
   // Frame
 
   this.frame = () => { // Returns a rect of the frame.
@@ -227,8 +233,18 @@ function Library (ronin) {
     return { x: rect.x, y: rect.y, w: rect.w * w, h: rect.h * h }
   }
 
-  this.resize = async (w = 1, h = 1) => {
-    const rect = w <= 1 || h <= 1 ? { x: 0, y: 0, w: this.frame().w * w, h: this.frame().h * h } : { x: 0, y: 0, w, h }
+  this.resize = async (w, h) => { // Resizes the canvas to target w and h, returns the rect.
+    const rect = { x: 0, y: 0, w, h }
+    const a = document.createElement('img')
+    const b = document.createElement('img')
+    a.src = ronin.surface.el.toDataURL()
+    ronin.surface.resizeImage(a, b)
+    ronin.surface.resize(rect, true)
+    return ronin.surface.draw(b, rect)
+  }
+
+  this.rescale = async (w, h) => { // Rescales the canvas to target ratio of w and h, returns the rect.
+    const rect = { x: 0, y: 0, w: this.frame().w * w, h: this.frame().h * h }
     const a = document.createElement('img')
     const b = document.createElement('img')
     a.src = ronin.surface.el.toDataURL()
@@ -241,21 +257,11 @@ function Library (ronin) {
     return ronin.surface.crop(rect)
   }
 
-  // Copy/Paste
-
   this.clone = (a, b) => {
     ronin.surface.clone(a, b)
     return [a, b]
   }
 
-  // TODO: Should remove (of) for (get)?
-
-  this.of = (h, ...keys) => {
-    return keys.reduce((acc, key) => {
-      return acc[key]
-    }, h)
-  }
-
   this.theme = (variable, el = document.documentElement) => {
     // ex. (theme "f_main") -> :root { --f_main: "#fff" }
     return getComputedStyle(el).getPropertyValue(`--${variable}`)
@@ -316,10 +322,6 @@ function Library (ronin) {
     ronin.source.quit(force)
   }
 
-  // Client
-  this.ronin = ronin
-
-  // Livecoding
   this.time = () => { // Returns timestamp in milliseconds.
     return Date.now
   }
@@ -328,8 +330,9 @@ function Library (ronin) {
     ronin.animate(play)
   }
 
-  // javascript interop
-  this.js = window
+  this.js = () => { // Javascript interop.
+    return window
+  }
 
   this.test = (name, a, b) => {
     if (`${a}` !== `${b}`) {