Merge pull request #3169 from rschamp/fix-canvas-hack

Use new APIs for renderer and canvas
This commit is contained in:
Ray Schamp authored and GitHub committed 2018-09-19 16:28:56 -04:00
commit e076fcd721
2 files changed
+5 -5

No files matched your search

+2 -2
View File
@@ -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",
+3 -3
View File
@@ -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);