scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-07-02 17:20:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions2

Updates for newly released scratch-render repo

Browse source
This commit is contained in:
Tim Mickel 2016-08-08 15:43:52 -04:00
parent 30735bc06e
commit c47a061edb
4 changed files with 5 additions and 5 deletions

2
Makefile
View file

@ -31,4 +31,4 @@ coverage:
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
.PHONY: build lint test coverage benchmark .PHONY: build lint test coverage benchmark serve

4
package.json
View file

@ -16,14 +16,14 @@
"dependencies": { "dependencies": {
"htmlparser2": "3.9.0", "htmlparser2": "3.9.0",
"memoizee": "0.3.10", "memoizee": "0.3.10",
"promise": "7.1.1", "promise": "7.1.1"
"scratch-render-webgl": "git+https://github.com/LLK/scratch-render-webgl.git"
}, },
"devDependencies": { "devDependencies": {
"eslint": "2.7.0", "eslint": "2.7.0",
"highlightjs": "8.7.0", "highlightjs": "8.7.0",
"json-loader": "0.5.4", "json-loader": "0.5.4",
"scratch-blocks": "git+https://git@github.com/LLK/scratch-blocks.git", "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", "tap": "5.7.1",
"webpack": "1.13.0", "webpack": "1.13.0",
"webpack-dev-server": "1.14.1" "webpack-dev-server": "1.14.1"

2
playground/index.html
View file

@ -735,7 +735,7 @@
<script src="../node_modules/scratch-blocks/blocks_compressed_vertical.js"></script> <script src="../node_modules/scratch-blocks/blocks_compressed_vertical.js"></script>
<script src="../node_modules/scratch-blocks/msg/messages.js"></script> <script src="../node_modules/scratch-blocks/msg/messages.js"></script>
<!-- Renderer --> <!-- Renderer -->
<script src="../node_modules/scratch-render-webgl/build/render-webgl.js"></script> <script src="../node_modules/scratch-render/render.js"></script>
<!-- VM Worker --> <!-- VM Worker -->
<script src="../vm.worker.js"></script> <script src="../vm.worker.js"></script>
<!-- Playground --> <!-- Playground -->

2
src/index.js
View file

@ -108,7 +108,7 @@ VirtualMachine.prototype.animationFrame = function () {
*/ */
if (ENV_WORKER) { if (ENV_WORKER) {
self.importScripts( 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.renderer = new self.RenderWebGLWorker();
self.vmInstance = new VirtualMachine(); self.vmInstance = new VirtualMachine();