diff --git a/Makefile b/Makefile index e2a04c2b6..c3614f5ac 100644 --- a/Makefile +++ b/Makefile @@ -31,4 +31,4 @@ coverage: # ------------------------------------------------------------------------------ -.PHONY: build lint test coverage benchmark +.PHONY: build lint test coverage benchmark serve diff --git a/package.json b/package.json index 2b6d7335a..9f28cbd83 100644 --- a/package.json +++ b/package.json @@ -16,14 +16,14 @@ "dependencies": { "htmlparser2": "3.9.0", "memoizee": "0.3.10", - "promise": "7.1.1", - "scratch-render-webgl": "git+https://github.com/LLK/scratch-render-webgl.git" + "promise": "7.1.1" }, "devDependencies": { "eslint": "2.7.0", "highlightjs": "8.7.0", "json-loader": "0.5.4", "scratch-blocks": "git+https://git@github.com/LLK/scratch-blocks.git", + "scratch-render": "git+https://git@github.com/LLK/scratch-render.git", "tap": "5.7.1", "webpack": "1.13.0", "webpack-dev-server": "1.14.1" diff --git a/playground/index.html b/playground/index.html index e38c10793..bcfb4426f 100644 --- a/playground/index.html +++ b/playground/index.html @@ -735,7 +735,7 @@ <script src="../node_modules/scratch-blocks/blocks_compressed_vertical.js"></script> <script src="../node_modules/scratch-blocks/msg/messages.js"></script> <!-- Renderer --> - <script src="../node_modules/scratch-render-webgl/build/render-webgl.js"></script> + <script src="../node_modules/scratch-render/render.js"></script> <!-- VM Worker --> <script src="../vm.worker.js"></script> <!-- Playground --> diff --git a/src/index.js b/src/index.js index 965c8cd9a..db99f1d15 100644 --- a/src/index.js +++ b/src/index.js @@ -108,7 +108,7 @@ VirtualMachine.prototype.animationFrame = function () { */ if (ENV_WORKER) { self.importScripts( - './node_modules/scratch-render-webgl/build/render-webgl-worker.js' + './node_modules/scratch-render/render-worker.js' ); self.renderer = new self.RenderWebGLWorker(); self.vmInstance = new VirtualMachine();