From e8ba24a43e45ceb663380c81deb63c980ec4acfd Mon Sep 17 00:00:00 2001
From: Paul Kaplan <pkaplan@media.mit.edu>
Date: Fri, 11 May 2018 14:04:03 -0400
Subject: [PATCH 1/3] Prevent errors when testing empty silhouettes
---
src/Silhouette.js | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/Silhouette.js b/src/Silhouette.js
index ceef8abe..029fedb4 100644
--- a/src/Silhouette.js
+++ b/src/Silhouette.js
@@ -79,6 +79,7 @@ class Silhouette {
* @return {boolean} If the nearest pixel has an alpha value.
*/
isTouchingNearest (vec) {
+ if (!this._data) return;
return getPoint(
this,
Math.round(vec[0] * (this._width - 1)),
@@ -93,6 +94,7 @@ class Silhouette {
* @return {boolean} Any of the pixels have some alpha.
*/
isTouchingLinear (vec) {
+ if (!this._data) return;
const x = Math.floor(vec[0] * (this._width - 1));
const y = Math.floor(vec[1] * (this._height - 1));
return getPoint(this, x, y) > 0 ||
From d35a3205bde9af20a4d69c8c703932702bed1768 Mon Sep 17 00:00:00 2001
From: Paul Kaplan <pkaplan@media.mit.edu>
Date: Fri, 11 May 2018 14:41:39 -0400
Subject: [PATCH 2/3] Actually fix the font in the say bubbles
---
src/util/svg-text-bubble.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/util/svg-text-bubble.js b/src/util/svg-text-bubble.js
index d0288b4b..3d20dd00 100644
--- a/src/util/svg-text-bubble.js
+++ b/src/util/svg-text-bubble.js
@@ -149,7 +149,8 @@ class SVGTextBubble {
}
_textFragment () {
- return `<text fill="#575E75">${xmlescape(this.lines.join('\n'))}</text>`;
+ const attrs = `font-family="Helvetica, Arial, sans-serif" font-size="14px" fill="#575E75"`;
+ return `<text ${attrs}>${xmlescape(this.lines.join('\n'))}</text>`;
}
buildString (type, text, pointsLeft) {
From 7c5b41b97ed366ad20513642a21129f69fc0ea71 Mon Sep 17 00:00:00 2001
From: Paul Kaplan <pkaplan@media.mit.edu>
Date: Mon, 14 May 2018 13:18:26 -0400
Subject: [PATCH 3/3] Update the scratch-svg-renderer config
---
package.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package.json b/package.json
index 9e5f9fe0..b53fd2fc 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,7 @@
"linebreak": "0.3.0",
"raw-loader": "^0.5.1",
"scratch-storage": "^0.4.0",
- "scratch-svg-renderer": "0.1.0-prerelease.20180511144653",
+ "scratch-svg-renderer": "0.1.0-prerelease.20180514170126",
"scratch-vm": "0.1.0-prerelease.1525975472",
"tap": "^11.0.0",
"travis-after-all": "^1.4.4",