From b694d6c8dbde7afaf81db58ba5da10cf75e5aa67 Mon Sep 17 00:00:00 2001 From: Devine Lu Linvega Date: Mon, 22 Jul 2019 15:56:35 +0900 Subject: [PATCH] Removed shapes, fixes #69 --- desktop/sources/links/main.css | 2 +- desktop/sources/scripts/surface.js | 10 +++++----- examples/{archives => basics}/basics.lisp | 0 examples/{archives => basics}/recursive.lisp | 0 examples/{archives => basics}/shapes.lisp | 0 examples/{archives => basics}/svg.lisp | 0 .../benchmark.lisp => benchmark/general.lisp} | 0 examples/{archives => demo}/dejong.lisp | 0 examples/{archives => demo}/spiral.lisp | 0 examples/{archives => pixels}/crop.lisp | 0 examples/{archives => pixels}/glitch.lisp | 0 examples/{archives => pixels}/open.lisp | 5 +---- examples/{archives => pixels}/pixels.lisp | 0 examples/{archives => pixels}/random.lisp | 0 14 files changed, 7 insertions(+), 10 deletions(-) rename examples/{archives => basics}/basics.lisp (100%) rename examples/{archives => basics}/recursive.lisp (100%) rename examples/{archives => basics}/shapes.lisp (100%) rename examples/{archives => basics}/svg.lisp (100%) rename examples/{archives/benchmark.lisp => benchmark/general.lisp} (100%) rename examples/{archives => demo}/dejong.lisp (100%) rename examples/{archives => demo}/spiral.lisp (100%) rename examples/{archives => pixels}/crop.lisp (100%) rename examples/{archives => pixels}/glitch.lisp (100%) rename examples/{archives => pixels}/open.lisp (66%) rename examples/{archives => pixels}/pixels.lisp (100%) rename examples/{archives => pixels}/random.lisp (100%) diff --git a/desktop/sources/links/main.css b/desktop/sources/links/main.css index e2db7d2..bdd4f7a 100644 --- a/desktop/sources/links/main.css +++ b/desktop/sources/links/main.css @@ -16,7 +16,7 @@ body { margin:0px; padding:0px; overflow:hidden; font-family:"input_mono_regular #ronin.hidden canvas#surface, #ronin.hidden canvas#guide { left:0; } #ronin.hidden #wrapper #commander { margin-left:calc(-40vw - 30px); } -#ronin canvas#surface,#ronin canvas#guide { left:40vw; } +#ronin canvas#surface,#ronin canvas#guide { left:calc(40vw + 30px); } #ronin canvas#guide { background:none; } #ronin canvas#surface { border-radius: 2px } diff --git a/desktop/sources/scripts/surface.js b/desktop/sources/scripts/surface.js index ab76faa..593979d 100644 --- a/desktop/sources/scripts/surface.js +++ b/desktop/sources/scripts/surface.js @@ -82,7 +82,7 @@ function Surface (ronin) { } else if (isSvg(shape)) { this.traceSVG(shape, context) } else { - console.warn('Unknown type') + console.warn('Unknown type', shape) } } @@ -236,18 +236,18 @@ function Surface (ronin) { } function isRect (shape) { - return shape.x && shape.y && shape.w && shape.h + return !isNaN(shape.x) && !isNaN(shape.y) && !isNaN(shape.w) && !isNaN(shape.h) } function isCircle (shape) { - return shape.cx && shape.cy && shape.r + return !isNaN(shape.cx) && !isNaN(shape.cy) && !isNaN(shape.r) } function isSvg (shape) { return shape.d } function isText (shape) { - return shape.x && shape.y && shape.p && shape.t && shape.f + return !isNaN(shape.x) && !isNaN(shape.y) && !isNaN(shape.p) && shape.t && shape.f } function isLine (shape) { - return shape.a && shape.a.x && shape.a.y && shape.b && shape.b.x && shape.b.y + return shape.a && !isNaN(shape.a.x) && !isNaN(shape.a.y) && shape.b && !isNaN(shape.b.x) && !isNaN(shape.b.y) } } diff --git a/examples/archives/basics.lisp b/examples/basics/basics.lisp similarity index 100% rename from examples/archives/basics.lisp rename to examples/basics/basics.lisp diff --git a/examples/archives/recursive.lisp b/examples/basics/recursive.lisp similarity index 100% rename from examples/archives/recursive.lisp rename to examples/basics/recursive.lisp diff --git a/examples/archives/shapes.lisp b/examples/basics/shapes.lisp similarity index 100% rename from examples/archives/shapes.lisp rename to examples/basics/shapes.lisp diff --git a/examples/archives/svg.lisp b/examples/basics/svg.lisp similarity index 100% rename from examples/archives/svg.lisp rename to examples/basics/svg.lisp diff --git a/examples/archives/benchmark.lisp b/examples/benchmark/general.lisp similarity index 100% rename from examples/archives/benchmark.lisp rename to examples/benchmark/general.lisp diff --git a/examples/archives/dejong.lisp b/examples/demo/dejong.lisp similarity index 100% rename from examples/archives/dejong.lisp rename to examples/demo/dejong.lisp diff --git a/examples/archives/spiral.lisp b/examples/demo/spiral.lisp similarity index 100% rename from examples/archives/spiral.lisp rename to examples/demo/spiral.lisp diff --git a/examples/archives/crop.lisp b/examples/pixels/crop.lisp similarity index 100% rename from examples/archives/crop.lisp rename to examples/pixels/crop.lisp diff --git a/examples/archives/glitch.lisp b/examples/pixels/glitch.lisp similarity index 100% rename from examples/archives/glitch.lisp rename to examples/pixels/glitch.lisp diff --git a/examples/archives/open.lisp b/examples/pixels/open.lisp similarity index 66% rename from examples/archives/open.lisp rename to examples/pixels/open.lisp index 399edf4..af80858 100644 --- a/examples/archives/open.lisp +++ b/examples/pixels/open.lisp @@ -1,7 +1,4 @@ ; saturate image - (open "../static/crystal.jpg") (pixels - (frame) - saturation - 12) \ No newline at end of file + (frame) saturation 12) \ No newline at end of file diff --git a/examples/archives/pixels.lisp b/examples/pixels/pixels.lisp similarity index 100% rename from examples/archives/pixels.lisp rename to examples/pixels/pixels.lisp diff --git a/examples/archives/random.lisp b/examples/pixels/random.lisp similarity index 100% rename from examples/archives/random.lisp rename to examples/pixels/random.lisp