Merge branch 'dev' into quickhull
Showing
此差异已折叠。
editor/main.js
0 → 100644
examples/js/MirrorRTT.js
0 → 100644
examples/js/loaders/XLoader.js
0 → 100644
此差异已折叠。
examples/js/vr/WebVRCamera.js
0 → 100644
文件已添加
文件已添加
3.1 MB
3.6 MB
129.7 KB
3.3 MB
3.2 MB
1.6 MB
3.5 MB
文件已添加
3.1 MB
129.7 KB
3.2 MB
1.6 MB
6.9 KB
此差异已折叠。
299.3 KB
927.3 KB
examples/webgl_loader_gltf2.html
0 → 100644
examples/webgl_loader_x.html
0 → 100644
... | @@ -31,9 +31,10 @@ | ... | @@ -31,9 +31,10 @@ |
"build-test": "rollup -c test/rollup.unit.config.js", | "build-test": "rollup -c test/rollup.unit.config.js", | ||
"build-uglify": "rollup -c && uglifyjs build/three.js -cm --preamble \"// threejs.org/license\" > build/three.min.js", | "build-uglify": "rollup -c && uglifyjs build/three.js -cm --preamble \"// threejs.org/license\" > build/three.min.js", | ||
"build-closure": "rollup -c && java -jar utils/build/compiler/closure-compiler-v20160713.jar --warning_level=VERBOSE --jscomp_off=globalThis --jscomp_off=checkTypes --externs utils/build/externs.js --language_in=ECMASCRIPT5_STRICT --js build/three.js --js_output_file build/three.min.js", | "build-closure": "rollup -c && java -jar utils/build/compiler/closure-compiler-v20160713.jar --warning_level=VERBOSE --jscomp_off=globalThis --jscomp_off=checkTypes --externs utils/build/externs.js --language_in=ECMASCRIPT5_STRICT --js build/three.js --js_output_file build/three.min.js", | ||
"dev": "rollup -c -w", | "dev": "rollup -c -w -m inline", | ||
"lint": "eslint src", | "lint": "eslint src", | ||
"test": "rollup -c test/rollup.unit.config.js -w" | "test": "rollup -c test/rollup.unit.config.js -w", | ||
"editor": "electron ./editor/main.js" | |||
}, | }, | ||
"keywords": [ | "keywords": [ | ||
"three", | "three", | ||
... | @@ -53,6 +54,7 @@ | ... | @@ -53,6 +54,7 @@ |
"qunitjs": "^2.1.1", | "qunitjs": "^2.1.1", | ||
"rollup": "^0.41.4", | "rollup": "^0.41.4", | ||
"rollup-watch": "^3.2.2", | "rollup-watch": "^3.2.2", | ||
"uglify-js": "^2.6.0" | "uglify-js": "^2.6.0", | ||
"electron": "^1.6.1" | |||
} | } | ||
} | } |
src/cameras/ArrayCamera.js
0 → 100644