From 30460a5d357b2dfaee86c07f1f966312bea7800b Mon Sep 17 00:00:00 2001
From: Ray Schamp <ray@scratch.mit.edu>
Date: Tue, 18 Sep 2018 16:33:54 -0400
Subject: [PATCH] Use new APIs for renderer and canvas
Follow up on #2464, fix the hacky accessors into the vm and renderer internals.
---
package.json | 4 ++--
src/containers/stage.jsx | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
index 5b9e6cdc0..29814a704 100644
--- a/package.json
+++ b/package.json
@@ -99,10 +99,10 @@
"scratch-blocks": "0.1.0-prerelease.1535662135",
"scratch-l10n": "3.0.20180830210150",
"scratch-paint": "0.2.0-prerelease.20180914201930",
- "scratch-render": "0.1.0-prerelease.20180907144714",
+ "scratch-render": "0.1.0-prerelease.20180918201144",
"scratch-storage": "1.0.2",
"scratch-svg-renderer": "0.2.0-prerelease.20180907141232",
- "scratch-vm": "0.2.0-prerelease.20180912222010",
+ "scratch-vm": "0.2.0-prerelease.20180918201814",
"selenium-webdriver": "3.6.0",
"startaudiocontext": "1.2.1",
"style-loader": "^0.23.0",
diff --git a/src/containers/stage.jsx b/src/containers/stage.jsx
index 1ab84412e..0aa3f2a4b 100644
--- a/src/containers/stage.jsx
+++ b/src/containers/stage.jsx
@@ -52,9 +52,9 @@ class Stage extends React.Component {
colorInfo: null,
question: null
};
- if (this.props.vm.runtime.renderer) {
- this.renderer = this.props.vm.runtime.renderer;
- this.canvas = this.props.vm.runtime.renderer._gl.canvas;
+ if (this.props.vm.renderer) {
+ this.renderer = this.props.vm.renderer;
+ this.canvas = this.renderer.canvas;
} else {
this.canvas = document.createElement('canvas');
this.renderer = new Renderer(this.canvas);
--
GitLab