language stringclasses 1 value | owner stringlengths 2 15 | repo stringlengths 2 21 | sha stringlengths 45 45 | message stringlengths 7 36.3k | path stringlengths 1 199 | patch stringlengths 15 102k | is_multipart bool 2 classes |
|---|---|---|---|---|---|---|---|
Other | mrdoob | three.js | 9f73975bf84836451c8ac3a7b033a714f027f603.json | fix code style | docs/index.html | @@ -70,7 +70,7 @@ <h1><a href="http://threejs.org">three.js</a> / docs</h1>
language = value;
createNavigation();
updateFilter();
- autoChangeUrlLanguage(language);
+ autoChangeUrlLanguage( language );
}
| false |
Other | mrdoob | three.js | 27f51da2ebc001bf8a9e908e12b5d804edb03b27.json | Add window resize support to god rays example
This adds window resizing support to the god rays example as well as refactoring some repeated code. | examples/webgl_postprocessing_godrays.html | @@ -59,16 +59,16 @@
var mouseX = 0, mouseY = 0;
- var windowHalfX = window.innerWidth / 2;
- var windowHalfY = window.innerHeight / 2;
-
var postprocessing = { enabled: true };
var orbitRadius = 200;
var bgColor = 0x000511;
var sunColor = 0xffee00;
+ // Use a smaller size for some of the god-ray render targets for better performance.
+ var godrayRenderTargetResolutionMultiplier = 1.0 / 4.0;
+
init();
animate();
@@ -129,19 +129,20 @@
document.addEventListener( 'mousemove', onDocumentMouseMove, false );
document.addEventListener( 'touchstart', onDocumentTouchStart, false );
document.addEventListener( 'touchmove', onDocumentTouchMove, false );
+ window.addEventListener( 'resize', onResize, false );
//
- initPostprocessing();
+ initPostprocessing( window.innerWidth, window.innerHeight );
}
//
function onDocumentMouseMove( event ) {
- mouseX = event.clientX - windowHalfX;
- mouseY = event.clientY - windowHalfY;
+ mouseX = event.clientX - window.innerWidth / 2;
+ mouseY = event.clientY - window.innerHeight / 2;
}
@@ -151,8 +152,8 @@
event.preventDefault();
- mouseX = event.touches[ 0 ].pageX - windowHalfX;
- mouseY = event.touches[ 0 ].pageY - windowHalfY;
+ mouseX = event.touches[ 0 ].pageX - window.innerWidth / 2;
+ mouseY = event.touches[ 0 ].pageY - window.innerHeight / 2;
}
@@ -164,26 +165,46 @@
event.preventDefault();
- mouseX = event.touches[ 0 ].pageX - windowHalfX;
- mouseY = event.touches[ 0 ].pageY - windowHalfY;
+ mouseX = event.touches[ 0 ].pageX - window.innerWidth / 2;
+ mouseY = event.touches[ 0 ].pageY - window.innerHeight / 2;
}
}
//
- function initPostprocessing() {
+ function onResize() {
+
+ renderTargetWidth = window.innerWidth;
+ renderTargetHeight = window.innerHeight;
+
+ camera.aspect = renderTargetWidth / renderTargetHeight;
+ camera.updateProjectionMatrix();
+
+ renderer.setSize( renderTargetWidth, renderTargetHeight );
+ postprocessing.rtTextureColors.setSize( renderTargetWidth, renderTargetHeight );
+ postprocessing.rtTextureDepth.setSize( renderTargetWidth, renderTargetHeight );
+ postprocessing.rtTextureDepthMask.setSize( renderTargetWidth, renderTargetHeight );
+
+ var adjustedWidth = renderTargetWidth * godrayRenderTargetResolutionMultiplier;
+ var adjustedHeight = renderTargetHeight * godrayRenderTargetResolutionMultiplier;
+ postprocessing.rtTextureGodRays1.setSize( adjustedWidth, adjustedHeight );
+ postprocessing.rtTextureGodRays2.setSize( adjustedWidth, adjustedHeight );
+
+ }
+
+ function initPostprocessing( renderTargetWidth, renderTargetHeight ) {
postprocessing.scene = new THREE.Scene();
- postprocessing.camera = new THREE.OrthographicCamera( window.innerWidth / - 2, window.innerWidth / 2, window.innerHeight / 2, window.innerHeight / - 2, - 10000, 10000 );
+ postprocessing.camera = new THREE.OrthographicCamera( - 0.5, 0.5, 0.5, - 0.5, - 10000, 10000 );
postprocessing.camera.position.z = 100;
postprocessing.scene.add( postprocessing.camera );
var pars = { minFilter: THREE.LinearFilter, magFilter: THREE.LinearFilter, format: THREE.RGBFormat };
- postprocessing.rtTextureColors = new THREE.WebGLRenderTarget( window.innerWidth, window.innerHeight, pars );
+ postprocessing.rtTextureColors = new THREE.WebGLRenderTarget( renderTargetWidth, renderTargetHeight, pars );
// Switching the depth formats to luminance from rgb doesn't seem to work. I didn't
// investigate further for now.
@@ -192,15 +213,15 @@
// I would have this quarter size and use it as one of the ping-pong render
// targets but the aliasing causes some temporal flickering
- postprocessing.rtTextureDepth = new THREE.WebGLRenderTarget( window.innerWidth, window.innerHeight, pars );
- postprocessing.rtTextureDepthMask = new THREE.WebGLRenderTarget( window.innerWidth, window.innerHeight, pars );
+ postprocessing.rtTextureDepth = new THREE.WebGLRenderTarget( renderTargetWidth, renderTargetHeight, pars );
+ postprocessing.rtTextureDepthMask = new THREE.WebGLRenderTarget( renderTargetWidth, renderTargetHeight, pars );
- // Aggressive downsize god-ray ping-pong render targets to minimize cost
+ // The ping-pong render targets can use an adjusted resolution to minimize cost
- var w = window.innerWidth / 4.0;
- var h = window.innerHeight / 4.0;
- postprocessing.rtTextureGodRays1 = new THREE.WebGLRenderTarget( w, h, pars );
- postprocessing.rtTextureGodRays2 = new THREE.WebGLRenderTarget( w, h, pars );
+ var adjustedWidth = renderTargetWidth * godrayRenderTargetResolutionMultiplier;
+ var adjustedHeight = renderTargetHeight * godrayRenderTargetResolutionMultiplier;
+ postprocessing.rtTextureGodRays1 = new THREE.WebGLRenderTarget( adjustedWidth, adjustedHeight, pars );
+ postprocessing.rtTextureGodRays2 = new THREE.WebGLRenderTarget( adjustedWidth, adjustedHeight, pars );
// god-ray shaders
@@ -250,7 +271,7 @@
postprocessing.godrayCombineUniforms.fGodRayIntensity.value = 0.75;
postprocessing.quad = new THREE.Mesh(
- new THREE.PlaneBufferGeometry( window.innerWidth, window.innerHeight ),
+ new THREE.PlaneBufferGeometry( 1.0, 1.0 ),
postprocessing.materialGodraysGenerate
);
postprocessing.quad.position.z = - 9900;
@@ -268,6 +289,24 @@
}
+ function getStepSize( filterLen, tapsPerPass, pass ) {
+
+ return filterLen * Math.pow( tapsPerPass, - pass );
+
+ }
+
+ function filterGodRays( inputTex, renderTarget, stepSize ) {
+
+ postprocessing.scene.overrideMaterial = postprocessing.materialGodraysGenerate;
+
+ postprocessing.godrayGenUniforms[ "fStepSize" ].value = stepSize;
+ postprocessing.godrayGenUniforms[ "tInput" ].value = inputTex;
+
+ renderer.render( postprocessing.scene, postprocessing.camera, renderTarget );
+ postprocessing.scene.overrideMaterial = null;
+
+ }
+
function render() {
var time = Date.now() / 4000;
@@ -360,36 +399,13 @@
// appear as a glimmer along the length of the beams
// pass 1 - render into first ping-pong target
-
- var pass = 1.0;
- var stepLen = filterLen * Math.pow( TAPS_PER_PASS, - pass );
-
- postprocessing.godrayGenUniforms[ "fStepSize" ].value = stepLen;
- postprocessing.godrayGenUniforms[ "tInput" ].value = postprocessing.rtTextureDepthMask.texture;
-
- postprocessing.scene.overrideMaterial = postprocessing.materialGodraysGenerate;
-
- renderer.render( postprocessing.scene, postprocessing.camera, postprocessing.rtTextureGodRays2 );
+ filterGodRays( postprocessing.rtTextureDepthMask.texture, postprocessing.rtTextureGodRays2, getStepSize( filterLen, TAPS_PER_PASS, 1.0 ) );
// pass 2 - render into second ping-pong target
-
- pass = 2.0;
- stepLen = filterLen * Math.pow( TAPS_PER_PASS, - pass );
-
- postprocessing.godrayGenUniforms[ "fStepSize" ].value = stepLen;
- postprocessing.godrayGenUniforms[ "tInput" ].value = postprocessing.rtTextureGodRays2.texture;
-
- renderer.render( postprocessing.scene, postprocessing.camera, postprocessing.rtTextureGodRays1 );
+ filterGodRays( postprocessing.rtTextureGodRays2.texture, postprocessing.rtTextureGodRays1, getStepSize( filterLen, TAPS_PER_PASS, 2.0 ) );
// pass 3 - 1st RT
-
- pass = 3.0;
- stepLen = filterLen * Math.pow( TAPS_PER_PASS, - pass );
-
- postprocessing.godrayGenUniforms[ "fStepSize" ].value = stepLen;
- postprocessing.godrayGenUniforms[ "tInput" ].value = postprocessing.rtTextureGodRays1.texture;
-
- renderer.render( postprocessing.scene, postprocessing.camera, postprocessing.rtTextureGodRays2 );
+ filterGodRays( postprocessing.rtTextureGodRays1.texture, postprocessing.rtTextureGodRays2, getStepSize( filterLen, TAPS_PER_PASS, 3.0 ) );
// final pass - composite god-rays onto colors
| false |
Other | mrdoob | three.js | a8794dc6bc9de076c07ddacf171fde541436aa7c.json | Upgrade dev dependencies | package-lock.json | @@ -1,6 +1,6 @@
{
"name": "three",
- "version": "0.98.0",
+ "version": "0.100.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -43,9 +43,9 @@
"dev": true
},
"acorn-jsx": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.0.tgz",
- "integrity": "sha512-XkB50fn0MURDyww9+UYL3c1yLbOBz0ZFvrdYlGB8l+Ije1oSC75qAqrzSPjYQbdnQUzhlUGNKuesryAv0gxZOg==",
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.0.1.tgz",
+ "integrity": "sha512-HJ7CfNHrfJLlNTzIEUTj43LNWGkqpRLxm3YjAlcD0ACydk9XynzYsCBHxut+iqt+1aBXkx9UP/w/ZqMr13XIzg==",
"dev": true
},
"ajv": {
@@ -109,7 +109,7 @@
"arr-flatten": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
- "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+ "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=",
"dev": true
},
"arr-union": {
@@ -124,21 +124,6 @@
"integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
"dev": true
},
- "array-union": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
- "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
- "dev": true,
- "requires": {
- "array-uniq": "^1.0.1"
- }
- },
- "array-uniq": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
- "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
- "dev": true
- },
"array-unique": {
"version": "0.3.2",
"resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
@@ -166,6 +151,12 @@
"integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
"dev": true
},
+ "astral-regex": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+ "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
+ "dev": true
+ },
"async": {
"version": "1.5.2",
"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
@@ -205,7 +196,7 @@
"base": {
"version": "0.11.2",
"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
- "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+ "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=",
"dev": true,
"requires": {
"cache-base": "^1.0.1",
@@ -329,7 +320,7 @@
"cache-base": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
- "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+ "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=",
"dev": true,
"requires": {
"collection-visit": "^1.0.0",
@@ -359,14 +350,14 @@
"dev": true
},
"camelcase": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
- "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.0.0.tgz",
+ "integrity": "sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==",
"dev": true
},
"camelcase-keys": {
"version": "2.1.0",
- "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
+ "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
"integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
"dev": true,
"requires": {
@@ -434,7 +425,7 @@
"class-utils": {
"version": "0.3.6",
"resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
- "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+ "integrity": "sha1-+TNprouafOAv1B+q0MqDAzGQxGM=",
"dev": true,
"requires": {
"arr-union": "^3.1.0",
@@ -501,7 +492,7 @@
"cloneable-readable": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.2.tgz",
- "integrity": "sha1-1ZHe5Kj4vBXaQ86X3O66E9Q+KmU=",
+ "integrity": "sha512-Bq6+4t+lbM8vhTs/Bef5c5AdEMtapp/iFb6+s4/Hh9MVTt8OLKH7ZOOZSCT+Ys7hsHvqv0GuMPJ1lnQJVHvxpg==",
"dev": true,
"requires": {
"inherits": "^2.0.1",
@@ -650,20 +641,31 @@
}
},
"concurrently": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-4.0.1.tgz",
- "integrity": "sha512-D8UI+mlI/bfvrA57SeKOht6sEpb01dKk+8Yee4fbnkk1Ue8r3S+JXoEdFZIpzQlXJGtnxo47Wvvg/kG4ba3U6Q==",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-4.1.0.tgz",
+ "integrity": "sha512-pwzXCE7qtOB346LyO9eFWpkFJVO3JQZ/qU/feGeaAHiX1M3Rw3zgXKc5cZ8vSH5DGygkjzLFDzA/pwoQDkRNGg==",
"dev": true,
"requires": {
"chalk": "^2.4.1",
"date-fns": "^1.23.0",
"lodash": "^4.17.10",
"read-pkg": "^4.0.1",
- "rxjs": "6.2.2",
+ "rxjs": "^6.3.3",
"spawn-command": "^0.0.2-1",
"supports-color": "^4.5.0",
"tree-kill": "^1.1.0",
"yargs": "^12.0.1"
+ },
+ "dependencies": {
+ "rxjs": {
+ "version": "6.3.3",
+ "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz",
+ "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==",
+ "dev": true,
+ "requires": {
+ "tslib": "^1.9.0"
+ }
+ }
}
},
"copy-descriptor": {
@@ -685,12 +687,14 @@
"dev": true
},
"cross-spawn": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz",
- "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=",
+ "version": "6.0.5",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
"dev": true,
"requires": {
- "lru-cache": "^4.0.1",
+ "nice-try": "^1.0.4",
+ "path-key": "^2.0.1",
+ "semver": "^5.5.0",
"shebang-command": "^1.2.0",
"which": "^1.2.9"
}
@@ -714,9 +718,9 @@
}
},
"date-fns": {
- "version": "1.29.0",
- "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.29.0.tgz",
- "integrity": "sha1-EuYJzcuTUScxHQTTMzTilgoqVOY=",
+ "version": "1.30.1",
+ "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz",
+ "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==",
"dev": true
},
"debug": {
@@ -729,13 +733,10 @@
}
},
"decamelize": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
- "integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
- "dev": true,
- "requires": {
- "xregexp": "4.0.0"
- }
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+ "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+ "dev": true
},
"decode-uri-component": {
"version": "0.2.0",
@@ -758,7 +759,7 @@
"define-property": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
- "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+ "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=",
"dev": true,
"requires": {
"is-descriptor": "^1.0.2",
@@ -796,20 +797,6 @@
}
}
},
- "del": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
- "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
- "dev": true,
- "requires": {
- "globby": "^6.1.0",
- "is-path-cwd": "^1.0.0",
- "is-path-in-cwd": "^1.0.0",
- "p-map": "^1.1.1",
- "pify": "^3.0.0",
- "rimraf": "^2.2.8"
- }
- },
"delayed-stream": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -897,9 +884,9 @@
}
},
"electron": {
- "version": "3.0.8",
- "resolved": "https://registry.npmjs.org/electron/-/electron-3.0.8.tgz",
- "integrity": "sha512-UVj+K59lYU/vH/7TxrmDidPssFwGQZ6Ljuupugdr9h6ipMuhwgk3WRO+OlJ2TsyhKhJ6tp3AcJunuN4mprblhQ==",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/electron/-/electron-4.0.0.tgz",
+ "integrity": "sha512-3XPG/3IXlvnT1oe1K6zEushoD0SKbP8xwdrL10EWGe6k2iOV4hSHqJ8vWnR8yZ7VbSXmBRfomEFDNAo/q/cwKw==",
"dev": true,
"requires": {
"@types/node": "^8.0.24",
@@ -984,9 +971,9 @@
"dev": true
},
"eslint": {
- "version": "5.9.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.9.0.tgz",
- "integrity": "sha512-g4KWpPdqN0nth+goDNICNXGfJF7nNnepthp46CAlJoJtC5K/cLu3NgCM3AHu1CkJ5Hzt9V0Y0PBAO6Ay/gGb+w==",
+ "version": "5.11.1",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.11.1.tgz",
+ "integrity": "sha512-gOKhM8JwlFOc2acbOrkYR05NW8M6DCMSvfcJiBB5NDxRE1gv8kbvxKaC9u69e6ZGEMWXcswA/7eKR229cEIpvg==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0",
@@ -998,7 +985,7 @@
"eslint-scope": "^4.0.0",
"eslint-utils": "^1.3.1",
"eslint-visitor-keys": "^1.0.0",
- "espree": "^4.0.0",
+ "espree": "^5.0.0",
"esquery": "^1.0.1",
"esutils": "^2.0.2",
"file-entry-cache": "^2.0.0",
@@ -1008,7 +995,6 @@
"ignore": "^4.0.6",
"imurmurhash": "^0.1.4",
"inquirer": "^6.1.0",
- "is-resolvable": "^1.1.0",
"js-yaml": "^3.12.0",
"json-stable-stringify-without-jsonify": "^1.0.1",
"levn": "^0.3.0",
@@ -1043,9 +1029,9 @@
}
},
"debug": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz",
- "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
"dev": true,
"requires": {
"ms": "^2.1.1"
@@ -1097,9 +1083,9 @@
"dev": true
},
"espree": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/espree/-/espree-4.1.0.tgz",
- "integrity": "sha512-I5BycZW6FCVIub93TeVY1s7vjhP9CY6cXCznIRfiig7nRviKZYdRnj/sHEWC6A7WE9RDWOFq9+7OsWSYz8qv2w==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.0.tgz",
+ "integrity": "sha512-1MpUfwsdS9MMoN7ZXqAr9e9UKdVHDcvrJpyx7mm1WuQlx/ygErEQBzgi5Nh5qBHIoYweprhtMkTCb9GhcAIcsA==",
"dev": true,
"requires": {
"acorn": "^6.0.2",
@@ -1156,13 +1142,13 @@
"dev": true
},
"execa": {
- "version": "0.7.0",
- "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz",
- "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=",
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+ "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
"dev": true,
"requires": {
- "cross-spawn": "^5.0.1",
- "get-stream": "^3.0.0",
+ "cross-spawn": "^6.0.0",
+ "get-stream": "^4.0.0",
"is-stream": "^1.1.0",
"npm-run-path": "^2.0.0",
"p-finally": "^1.0.0",
@@ -1239,7 +1225,7 @@
"is-extendable": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
- "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+ "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
"dev": true,
"requires": {
"is-plain-object": "^2.0.4"
@@ -1441,14 +1427,14 @@
}
},
"flat-cache": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.2.tgz",
- "integrity": "sha512-KByBY8c98sLUAGpnmjEdWTrtrLZRtZdwds+kAL/ciFXTCb7AZgqKsAnVnYFQj1hxepwO8JKN/8AsRWwLq+RK0A==",
+ "version": "1.3.4",
+ "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz",
+ "integrity": "sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==",
"dev": true,
"requires": {
"circular-json": "^0.3.1",
- "del": "^3.0.0",
"graceful-fs": "^4.1.2",
+ "rimraf": "~2.6.2",
"write": "^0.2.1"
}
},
@@ -1540,10 +1526,13 @@
"dev": true
},
"get-stream": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
- "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
- "dev": true
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+ "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+ "dev": true,
+ "requires": {
+ "pump": "^3.0.0"
+ }
},
"get-value": {
"version": "2.0.6",
@@ -1604,38 +1593,17 @@
"integrity": "sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg==",
"dev": true
},
- "globby": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
- "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
- "dev": true,
- "requires": {
- "array-union": "^1.0.1",
- "glob": "^7.0.3",
- "object-assign": "^4.0.1",
- "pify": "^2.0.0",
- "pinkie-promise": "^2.0.0"
- },
- "dependencies": {
- "pify": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
- "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
- "dev": true
- }
- }
- },
"google-closure-compiler": {
- "version": "20181028.0.1",
- "resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20181028.0.1.tgz",
- "integrity": "sha512-Gj+hNFJzxpNbnkZWRe+Gag2IeUfYSfl93qZ5TkRzXZAFznRhL1JpA/0v6nckly8QQDsEjVNMQOloOgfQP6Itkg==",
+ "version": "20181210.0.0",
+ "resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20181210.0.0.tgz",
+ "integrity": "sha512-GCMLakdibnc+jpdNTvF3M/ET5i6I4zzxGKw67A4bQahxc0TPLXQdkVfhF3kwBSoPfK8xwgU5kA+KO0qvDZHKHw==",
"dev": true,
"requires": {
"chalk": "^1.0.0",
- "google-closure-compiler-java": "^20181028.0.0",
- "google-closure-compiler-js": "^20181028.0.0",
- "google-closure-compiler-linux": "^20181028.0.1",
- "google-closure-compiler-osx": "^20181028.0.1",
+ "google-closure-compiler-java": "^20181210.0.0",
+ "google-closure-compiler-js": "^20181210.0.0",
+ "google-closure-compiler-linux": "^20181210.0.0",
+ "google-closure-compiler-osx": "^20181210.0.0",
"minimist": "^1.2.0",
"vinyl": "^2.0.1",
"vinyl-sourcemaps-apply": "^0.2.0"
@@ -1684,28 +1652,28 @@
}
},
"google-closure-compiler-java": {
- "version": "20181028.0.0",
- "resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20181028.0.0.tgz",
- "integrity": "sha512-msRSt+BqBsFQlE3kwbQN+RDlW8bzbFrA+YWxXAN7jalm1RAYyFdU7KH30nYSmwmuKgYQYsBTnc7PFwdZNk003Q==",
+ "version": "20181210.0.0",
+ "resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20181210.0.0.tgz",
+ "integrity": "sha512-FMGzY+vp25DePolYNyVcXz8UI2PV/I3AYU3nuFexmHcKn5XiBVy4CqK7em6NpVbZdDXJYUF3GUv5A0x0gLvbfw==",
"dev": true
},
"google-closure-compiler-js": {
- "version": "20181028.0.0",
- "resolved": "https://registry.npmjs.org/google-closure-compiler-js/-/google-closure-compiler-js-20181028.0.0.tgz",
- "integrity": "sha512-yTF8uBR8TMf5SW76+1LU1ywvgeVyeNCQ+Jj3KJfMiIShoYhxPtVfLn99nx9r3uwIVNNyMxdQVc9zUFD2DEkTaA==",
+ "version": "20181210.0.0",
+ "resolved": "https://registry.npmjs.org/google-closure-compiler-js/-/google-closure-compiler-js-20181210.0.0.tgz",
+ "integrity": "sha512-gn+2hT4uQtYKD/jXJqGIXzPMln3/JD7R4caAKDPJm7adqqDvrCAw7qxAiK4Vz1rNec7hJXPXh9TeKQjzz03ZaQ==",
"dev": true
},
"google-closure-compiler-linux": {
- "version": "20181028.0.1",
- "resolved": "https://registry.npmjs.org/google-closure-compiler-linux/-/google-closure-compiler-linux-20181028.0.1.tgz",
- "integrity": "sha512-yMfqIBkc9mg9D8wWTBJ/It+IY2NIMmwZDThYK6bfkcq3ZpeJI3GBfb3cA8GxOrHQgtopKysDwQQRrMq9UNscqw==",
+ "version": "20181210.0.0",
+ "resolved": "https://registry.npmjs.org/google-closure-compiler-linux/-/google-closure-compiler-linux-20181210.0.0.tgz",
+ "integrity": "sha512-Gp+yp+Vb6QWEhtYkePKxkspRlzX5dx6L46zUoHGWW7Henuk3ACYoUXuaHLQQ+tF0lmi2QAmFXEkvdnKVDIxR+Q==",
"dev": true,
"optional": true
},
"google-closure-compiler-osx": {
- "version": "20181028.0.1",
- "resolved": "https://registry.npmjs.org/google-closure-compiler-osx/-/google-closure-compiler-osx-20181028.0.1.tgz",
- "integrity": "sha512-A3g1Ri5dNU1P6dGtY88/3xIAkMt5cQpIG4YqAwwBMTbG5fG7jRfExTetLaUsAaJwQQXG3TYWUELV3kSAMr/bAg==",
+ "version": "20181210.0.0",
+ "resolved": "https://registry.npmjs.org/google-closure-compiler-osx/-/google-closure-compiler-osx-20181210.0.0.tgz",
+ "integrity": "sha512-SYUakmEpq8BorJU/O5CfrC+ABYjXR0rTvBd3Khwd1sml9B2aKEiHArdHC5SCmBRZd3ccUhp/XyrVO6PoxHKeZA==",
"dev": true,
"optional": true
},
@@ -1934,9 +1902,9 @@
"dev": true
},
"inquirer": {
- "version": "6.2.0",
- "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.0.tgz",
- "integrity": "sha512-QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg==",
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.2.1.tgz",
+ "integrity": "sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==",
"dev": true,
"requires": {
"ansi-escapes": "^3.0.0",
@@ -1950,14 +1918,31 @@
"run-async": "^2.2.0",
"rxjs": "^6.1.0",
"string-width": "^2.1.0",
- "strip-ansi": "^4.0.0",
+ "strip-ansi": "^5.0.0",
"through": "^2.3.6"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.0.0.tgz",
+ "integrity": "sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==",
+ "dev": true
+ },
+ "strip-ansi": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.0.0.tgz",
+ "integrity": "sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "^4.0.0"
+ }
+ }
}
},
"invert-kv": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
- "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+ "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
"dev": true
},
"is-accessor-descriptor": {
@@ -2096,34 +2081,10 @@
}
}
},
- "is-path-cwd": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
- "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
- "dev": true
- },
- "is-path-in-cwd": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
- "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
- "dev": true,
- "requires": {
- "is-path-inside": "^1.0.0"
- }
- },
- "is-path-inside": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
- "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
- "dev": true,
- "requires": {
- "path-is-inside": "^1.0.1"
- }
- },
"is-plain-object": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
- "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+ "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=",
"dev": true,
"requires": {
"isobject": "^3.0.1"
@@ -2135,12 +2096,6 @@
"integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
"dev": true
},
- "is-resolvable": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz",
- "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==",
- "dev": true
- },
"is-stream": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
@@ -2275,12 +2230,12 @@
"dev": true
},
"lcid": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
- "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+ "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
"dev": true,
"requires": {
- "invert-kv": "^1.0.0"
+ "invert-kv": "^2.0.0"
}
},
"levn": {
@@ -2295,7 +2250,7 @@
},
"load-json-file": {
"version": "1.1.0",
- "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
+ "resolved": "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
"integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
"dev": true,
"requires": {
@@ -2317,7 +2272,7 @@
},
"pify": {
"version": "2.3.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+ "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
"dev": true
}
@@ -2349,16 +2304,6 @@
"signal-exit": "^3.0.0"
}
},
- "lru-cache": {
- "version": "4.1.3",
- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
- "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
- "dev": true,
- "requires": {
- "pseudomap": "^1.0.2",
- "yallist": "^2.1.2"
- }
- },
"makeerror": {
"version": "1.0.11",
"resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
@@ -2368,6 +2313,15 @@
"tmpl": "1.0.x"
}
},
+ "map-age-cleaner": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+ "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+ "dev": true,
+ "requires": {
+ "p-defer": "^1.0.0"
+ }
+ },
"map-cache": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -2392,24 +2346,26 @@
"matcher-collection": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.5.tgz",
- "integrity": "sha512-nUCmzKipcJEwYsBVAFh5P+d7JBuhJaW1xs85Hara9xuMLqtCVUrW6DSC0JVIkluxEH2W45nPBM/wjHtBXa/tYA==",
+ "integrity": "sha1-LuCVQ4Nyy4iE8FgjQTjAXGROwzk=",
"dev": true,
"requires": {
"minimatch": "^3.0.2"
}
},
"mem": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz",
- "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/mem/-/mem-4.0.0.tgz",
+ "integrity": "sha512-WQxG/5xYc3tMbYLXoXPm81ET2WDULiU5FxbuIoNbJqLOOI8zehXFdZuiUEgfdrU2mVB1pxBZUGlYORSrpuJreA==",
"dev": true,
"requires": {
- "mimic-fn": "^1.0.0"
+ "map-age-cleaner": "^0.1.1",
+ "mimic-fn": "^1.0.0",
+ "p-is-promise": "^1.1.0"
}
},
"meow": {
"version": "3.7.0",
- "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
+ "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
"integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
"dev": true,
"requires": {
@@ -2505,7 +2461,7 @@
"mixin-deep": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
- "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+ "integrity": "sha1-pJ5yaNzhoNlpjkUybFYm3zVD0P4=",
"dev": true,
"requires": {
"for-in": "^1.0.2",
@@ -2515,7 +2471,7 @@
"is-extendable": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
- "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+ "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
"dev": true,
"requires": {
"is-plain-object": "^2.0.4"
@@ -2770,32 +2726,44 @@
}
},
"os-locale": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz",
- "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+ "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
"dev": true,
"requires": {
- "execa": "^0.7.0",
- "lcid": "^1.0.0",
- "mem": "^1.1.0"
+ "execa": "^1.0.0",
+ "lcid": "^2.0.0",
+ "mem": "^4.0.0"
}
},
"os-tmpdir": {
"version": "1.0.2",
- "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+ "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
"dev": true
},
+ "p-defer": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+ "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
+ "dev": true
+ },
"p-finally": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
"integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
"dev": true
},
+ "p-is-promise": {
+ "version": "1.1.0",
+ "resolved": "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz",
+ "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=",
+ "dev": true
+ },
"p-limit": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.0.0.tgz",
- "integrity": "sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.1.0.tgz",
+ "integrity": "sha512-NhURkNcrVB+8hNfLuysU8enY5xn2KXphsHBaC2YmRNTZRc7RWusw6apSpdEj3jo4CMb6W9nrF6tTnsJsJeyu6g==",
"dev": true,
"requires": {
"p-try": "^2.0.0"
@@ -2810,12 +2778,6 @@
"p-limit": "^2.0.0"
}
},
- "p-map": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
- "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
- "dev": true
- },
"p-try": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
@@ -2852,7 +2814,7 @@
},
"path-is-absolute": {
"version": "1.0.1",
- "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+ "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
"dev": true
},
@@ -2972,9 +2934,9 @@
"dev": true
},
"progress": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.1.tgz",
- "integrity": "sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==",
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
"dev": true
},
"progress-stream": {
@@ -2987,16 +2949,10 @@
"through2": "~0.2.3"
}
},
- "pseudomap": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
- "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
- "dev": true
- },
"psl": {
- "version": "1.1.29",
- "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz",
- "integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==",
+ "version": "1.1.31",
+ "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz",
+ "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==",
"dev": true
},
"pump": {
@@ -3103,7 +3059,7 @@
},
"readable-stream": {
"version": "1.1.14",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+ "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
"integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
"dev": true,
"requires": {
@@ -3126,7 +3082,7 @@
"regex-not": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
- "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+ "integrity": "sha1-H07OJ+ALC2XgJHpoEOaoXYOldSw=",
"dev": true,
"requires": {
"extend-shallow": "^3.0.2",
@@ -3214,7 +3170,7 @@
},
"require-uncached": {
"version": "1.0.3",
- "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
+ "resolved": "http://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
"integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
"dev": true,
"requires": {
@@ -3272,7 +3228,7 @@
"ret": {
"version": "0.1.15",
"resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
- "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+ "integrity": "sha1-uKSCXVvbH8P29Twrwz+BOIaBx7w=",
"dev": true
},
"rimraf": {
@@ -3285,13 +3241,14 @@
}
},
"rollup": {
- "version": "0.67.1",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.67.1.tgz",
- "integrity": "sha512-BfwL9pw5VyxrAWx/G1tP8epgG+NH4KcR78aoWacV7+dFp1Mj6ynH8QTIC/lDQ3KlwzDakqZmJQ4LQ7TmLg+pBA==",
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.0.0.tgz",
+ "integrity": "sha512-LV6Qz+RkuDAfxr9YopU4k5o5P/QA7YNq9xi2Ug2IqOmhPt9sAm89vh3SkNtFok3bqZHX54eMJZ8F68HPejgqtw==",
"dev": true,
"requires": {
"@types/estree": "0.0.39",
- "@types/node": "*"
+ "@types/node": "*",
+ "acorn": "^6.0.4"
}
},
"rsvp": {
@@ -3326,7 +3283,7 @@
},
"safe-regex": {
"version": "1.1.0",
- "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+ "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
"integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
"dev": true,
"requires": {
@@ -3410,7 +3367,7 @@
"set-value": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
- "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+ "integrity": "sha1-ca5KiPD+77v1LR6mBPP7MV67YnQ=",
"dev": true,
"requires": {
"extend-shallow": "^2.0.1",
@@ -3498,18 +3455,20 @@
}
},
"slice-ansi": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz",
- "integrity": "sha512-POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.0.0.tgz",
+ "integrity": "sha512-4j2WTWjp3GsZ+AOagyzVbzp4vWGtZ0hEZ/gDY/uTvm6MTxUfTUIsnMIFb1bn8o0RuXiqUw15H1bue8f22Vw2oQ==",
"dev": true,
"requires": {
+ "ansi-styles": "^3.2.0",
+ "astral-regex": "^1.0.0",
"is-fullwidth-code-point": "^2.0.0"
}
},
"snapdragon": {
"version": "0.8.2",
"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
- "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+ "integrity": "sha1-ZJIufFZbDhQgS6GqfWlkJ40lGC0=",
"dev": true,
"requires": {
"base": "^0.11.1",
@@ -3545,7 +3504,7 @@
"snapdragon-node": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
- "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+ "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=",
"dev": true,
"requires": {
"define-property": "^1.0.0",
@@ -3596,7 +3555,7 @@
"snapdragon-util": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
- "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+ "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=",
"dev": true,
"requires": {
"kind-of": "^3.2.0"
@@ -3685,7 +3644,7 @@
"split-string": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
- "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+ "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=",
"dev": true,
"requires": {
"extend-shallow": "^3.0.0"
@@ -3698,9 +3657,9 @@
"dev": true
},
"sshpk": {
- "version": "1.15.2",
- "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.15.2.tgz",
- "integrity": "sha512-Ra/OXQtuh0/enyl4ETZAfTaeksa6BXks5ZcjpSUNrjBr0DvrJKX+1fsKDPpT9TBXgHAFsa4510aNVgI8g/+SzA==",
+ "version": "1.16.0",
+ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.0.tgz",
+ "integrity": "sha512-Zhev35/y7hRMcID/upReIvRse+I9SVhyVre/KTJSJQWMz3C3+G+HpO7m1wK/yckEtujKZ7dS4hkVxAnmHaIGVQ==",
"dev": true,
"requires": {
"asn1": "~0.2.3",
@@ -3817,15 +3776,35 @@
}
},
"table": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/table/-/table-5.1.0.tgz",
- "integrity": "sha512-e542in22ZLhD/fOIuXs/8yDZ9W61ltF8daM88rkRNtgTIct+vI2fTnAyu/Db2TCfEcI8i7mjZz6meLq0nW7TYg==",
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/table/-/table-5.1.1.tgz",
+ "integrity": "sha512-NUjapYb/qd4PeFW03HnAuOJ7OMcBkJlqeClWxeNlQ0lXGSb52oZXGzkO0/I0ARegQ2eUT1g2VDJH0eUxDRcHmw==",
"dev": true,
"requires": {
- "ajv": "^6.5.3",
- "lodash": "^4.17.10",
- "slice-ansi": "1.0.0",
+ "ajv": "^6.6.1",
+ "lodash": "^4.17.11",
+ "slice-ansi": "2.0.0",
"string-width": "^2.1.1"
+ },
+ "dependencies": {
+ "ajv": {
+ "version": "6.6.2",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.2.tgz",
+ "integrity": "sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g==",
+ "dev": true,
+ "requires": {
+ "fast-deep-equal": "^2.0.1",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.4.1",
+ "uri-js": "^4.2.2"
+ }
+ },
+ "lodash": {
+ "version": "4.17.11",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+ "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+ "dev": true
+ }
}
},
"text-table": {
@@ -3842,13 +3821,13 @@
},
"through": {
"version": "2.3.8",
- "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+ "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
"dev": true
},
"through2": {
"version": "0.2.3",
- "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
+ "resolved": "http://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
"integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
"dev": true,
"requires": {
@@ -3894,7 +3873,7 @@
"to-regex": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
- "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+ "integrity": "sha1-E8/dmzNlUvMLUfM6iuG0Knp1mc4=",
"dev": true,
"requires": {
"define-property": "^2.0.2",
@@ -3924,9 +3903,9 @@
}
},
"tree-kill": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.0.tgz",
- "integrity": "sha1-WEZ4Yje0I5AU8F2xVrZDIS1MbzY=",
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz",
+ "integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==",
"dev": true
},
"trim-newlines": {
@@ -4289,12 +4268,6 @@
"mkdirp": "^0.5.1"
}
},
- "xregexp": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz",
- "integrity": "sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==",
- "dev": true
- },
"xtend": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
@@ -4310,39 +4283,34 @@
"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
"dev": true
},
- "yallist": {
- "version": "2.1.2",
- "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
- "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
- "dev": true
- },
"yargs": {
- "version": "12.0.1",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.1.tgz",
- "integrity": "sha512-B0vRAp1hRX4jgIOWFtjfNjd9OA9RWYZ6tqGA9/I/IrTMsxmKvtWy+ersM+jzpQqbC3YfLzeABPdeTgcJ9eu1qQ==",
+ "version": "12.0.5",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
+ "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
"dev": true,
"requires": {
"cliui": "^4.0.0",
- "decamelize": "^2.0.0",
+ "decamelize": "^1.2.0",
"find-up": "^3.0.0",
"get-caller-file": "^1.0.1",
- "os-locale": "^2.0.0",
+ "os-locale": "^3.0.0",
"require-directory": "^2.1.1",
"require-main-filename": "^1.0.1",
"set-blocking": "^2.0.0",
"string-width": "^2.0.0",
"which-module": "^2.0.0",
"y18n": "^3.2.1 || ^4.0.0",
- "yargs-parser": "^10.1.0"
+ "yargs-parser": "^11.1.1"
}
},
"yargs-parser": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
- "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
+ "version": "11.1.1",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
+ "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
"dev": true,
"requires": {
- "camelcase": "^4.1.0"
+ "camelcase": "^5.0.0",
+ "decamelize": "^1.2.0"
}
},
"yauzl": { | true |
Other | mrdoob | three.js | a8794dc6bc9de076c07ddacf171fde541436aa7c.json | Upgrade dev dependencies | package.json | @@ -53,15 +53,15 @@
},
"homepage": "https://threejs.org/",
"devDependencies": {
- "concurrently": "^4.0.1",
- "electron": "^3.0.8",
- "eslint": "^5.9.0",
+ "concurrently": "^4.1.0",
+ "electron": "^4.0.0",
+ "eslint": "^5.11.1",
"eslint-config-mdcs": "^4.2.3",
"eslint-plugin-html": "^5.0.0",
- "google-closure-compiler": "20181028.0.1",
+ "google-closure-compiler": "20181210.0.0",
"http-server": "^0.11.1",
"qunit": "^2.8.0",
- "rollup": "^0.67.1"
+ "rollup": "^1.0.0"
},
"jspm": {
"files": [ | true |
Other | mrdoob | three.js | a79f8770fd7e41229810fd1b3e2fa5d4f9ede30d.json | Beautify model dropdown list with labels | examples/webgl_loader_ldraw.html | @@ -49,24 +49,24 @@
var ldrawPath = 'models/ldraw/officialLibrary/';
- var modelFileList = [
- 'models/car.ldr_Packed.mpd',
- 'models/1621-1-LunarMPVVehicle.mpd_Packed.mpd',
- 'models/889-1-RadarTruck.mpd_Packed.mpd',
- 'models/4838-1-MiniVehicles.mpd_Packed.mpd',
- 'models/4915-1-MiniConstruction.mpd_Packed.mpd',
- 'models/4918-1-MiniFlyers.mpd_Packed.mpd',
- 'models/5935-1-IslandHopper.mpd_Packed.mpd',
- 'models/30023-1-Lighthouse.ldr_Packed.mpd',
- 'models/30051-1-X-wingFighter-Mini.mpd_Packed.mpd',
- 'models/30054-1-AT-ST-Mini.mpd_Packed.mpd',
- 'models/4489-1-AT-AT-Mini.mpd_Packed.mpd',
- 'models/4494-1-Imperial Shuttle-Mini.mpd_Packed.mpd',
- 'models/6965-1-TIEIntercep_4h4MXk5.mpd_Packed.mpd',
- 'models/6966-1-JediStarfighter-Mini.mpd_Packed.mpd',
- 'models/7140-1-X-wingFighter.mpd_Packed.mpd',
- 'models/10174-1-ImperialAT-ST-UCS.mpd_Packed.mpd'
- ];
+ var modelFileList = {
+ 'Car': 'models/car.ldr_Packed.mpd',
+ 'Lunar Vehicle': 'models/1621-1-LunarMPVVehicle.mpd_Packed.mpd',
+ 'Radar Truck': 'models/889-1-RadarTruck.mpd_Packed.mpd',
+ 'Trailer': 'models/4838-1-MiniVehicles.mpd_Packed.mpd',
+ 'Bulldozer': 'models/4915-1-MiniConstruction.mpd_Packed.mpd',
+ 'Helicopter': 'models/4918-1-MiniFlyers.mpd_Packed.mpd',
+ 'Plane': 'models/5935-1-IslandHopper.mpd_Packed.mpd',
+ 'Lighthouse': 'models/30023-1-Lighthouse.ldr_Packed.mpd',
+ 'X-Wing mini': 'models/30051-1-X-wingFighter-Mini.mpd_Packed.mpd',
+ 'AT-ST mini': 'models/30054-1-AT-ST-Mini.mpd_Packed.mpd',
+ 'AT-AT mini': 'models/4489-1-AT-AT-Mini.mpd_Packed.mpd',
+ 'Shuttle': 'models/4494-1-Imperial Shuttle-Mini.mpd_Packed.mpd',
+ 'TIE Interceptor': 'models/6965-1-TIEIntercep_4h4MXk5.mpd_Packed.mpd',
+ 'Star fighter': 'models/6966-1-JediStarfighter-Mini.mpd_Packed.mpd',
+ 'X-Wing': 'models/7140-1-X-wingFighter.mpd_Packed.mpd',
+ 'AT-ST': 'models/10174-1-ImperialAT-ST-UCS.mpd_Packed.mpd'
+ };
init();
animate();
@@ -103,7 +103,7 @@
//
guiData = {
- modelFileName: modelFileList[ 0 ],
+ modelFileName: modelFileList[ 'Car' ],
envMapActivated: false
};
| false |
Other | mrdoob | three.js | 2f350889c9a3d6696f08006db30c35eeb16c6a9d.json | Copy color to uniforms value | src/renderers/WebGLRenderer.js | @@ -1855,7 +1855,7 @@ function WebGLRenderer( parameters ) {
} else if ( material.isShadowMaterial ) {
- m_uniforms.color.value = material.color;
+ m_uniforms.color.value.copy( material.color );
m_uniforms.opacity.value = material.opacity;
}
@@ -1901,7 +1901,7 @@ function WebGLRenderer( parameters ) {
if ( material.color ) {
- uniforms.diffuse.value = material.color;
+ uniforms.diffuse.value.copy( material.color );
}
@@ -2031,7 +2031,7 @@ function WebGLRenderer( parameters ) {
function refreshUniformsLine( uniforms, material ) {
- uniforms.diffuse.value = material.color;
+ uniforms.diffuse.value.copy( material.color );
uniforms.opacity.value = material.opacity;
}
@@ -2046,7 +2046,7 @@ function WebGLRenderer( parameters ) {
function refreshUniformsPoints( uniforms, material ) {
- uniforms.diffuse.value = material.color;
+ uniforms.diffuse.value.copy( material.color );
uniforms.opacity.value = material.opacity;
uniforms.size.value = material.size * _pixelRatio;
uniforms.scale.value = _height * 0.5;
@@ -2069,7 +2069,7 @@ function WebGLRenderer( parameters ) {
function refreshUniformsSprites( uniforms, material ) {
- uniforms.diffuse.value = material.color;
+ uniforms.diffuse.value.copy( material.color );
uniforms.opacity.value = material.opacity;
uniforms.rotation.value = material.rotation;
uniforms.map.value = material.map;
@@ -2090,7 +2090,7 @@ function WebGLRenderer( parameters ) {
function refreshUniformsFog( uniforms, fog ) {
- uniforms.fogColor.value = fog.color;
+ uniforms.fogColor.value.copy( fog.color );
if ( fog.isFog ) {
@@ -2117,7 +2117,7 @@ function WebGLRenderer( parameters ) {
function refreshUniformsPhong( uniforms, material ) {
- uniforms.specular.value = material.specular;
+ uniforms.specular.value.copy( material.specular );
uniforms.shininess.value = Math.max( material.shininess, 1e-4 ); // to prevent pow( 0.0, 0.0 )
if ( material.emissiveMap ) { | false |
Other | mrdoob | three.js | 2c32a6f18961904cfb8366e48ed56db984571928.json | Use standard for instead for of
Signed-off-by: Riccardo Padovani <rpadovani@nextbit.it> | examples/js/loaders/GLTFLoader.js | @@ -1555,9 +1555,9 @@ THREE.GLTFLoader = ( function () {
var keys = Object.keys( attributes ).sort();
- for ( var key of keys ) {
+ for ( var i = 0, il = keys.length; i < il; i ++ ) {
- attributesKey += key + attributes[ key ];
+ attributesKey += keys[ i ] + attributes[ keys[ i ] ];
}
| false |
Other | mrdoob | three.js | 2da12cc9e312247afe205ef3610be023cdae702e.json | Pull request comments
Signed-off-by: Riccardo Padovani <rpadovani@nextbit.it> | examples/js/loaders/GLTFLoader.js | @@ -1553,7 +1553,9 @@ THREE.GLTFLoader = ( function () {
var attributesKey = '';
- for ( var key in attributes ) {
+ var keys = Object.keys( attributes ).sort();
+
+ for ( var key of keys ) {
attributesKey += key + attributes[ key ];
@@ -1569,13 +1571,7 @@ THREE.GLTFLoader = ( function () {
for ( var i = 0, il = a.length; i < il; i ++ ) {
- arrayKey += i;
-
- for ( var j = 0, jl = a[ i ].lenght; j < jl; j ++ ) {
-
- arrayKey += j + a[ i ][ j ];
-
- }
+ arrayKey += i + createAttributesKey( a[ i ] );
}
| false |
Other | mrdoob | three.js | df301630d6c17960ca190d97928f3ea0d7b5abd7.json | Translate some pages in Math | docs/api/zh/extras/core/Curve.html | @@ -8,7 +8,7 @@
<link type="text/css" rel="stylesheet" href="page.css" />
</head>
<body>
- <h1>[name]</h1>
+ <h1>曲线（[name]）</h1>
<p class="desc">
An abstract base class for creating a [name] object that contains methods for interpolation. | true |
Other | mrdoob | three.js | df301630d6c17960ca190d97928f3ea0d7b5abd7.json | Translate some pages in Math | docs/api/zh/math/Quaternion.html | @@ -8,18 +8,16 @@
<link type="text/css" rel="stylesheet" href="page.css" />
</head>
<body>
- <h1>[name]</h1>
+ <h1>四元数（[name]）</h1>
<p class="desc">
- Implementation of a [link:http://en.wikipedia.org/wiki/Quaternion quaternion].
- This is used for [link:https://en.wikipedia.org/wiki/Quaternions_and_spatial_rotation rotating things]
- without encountering the dreaded
- [link:http://en.wikipedia.org/wiki/Gimbal_lock gimbal lock] issue, amongst other
- advantages.
+ 这个类是对[link:http://en.wikipedia.org/wiki/Quaternion quaternion]（四元数）的实现。
+ 它用于排除万向锁（[link:http://en.wikipedia.org/wiki/Gimbal_lock gimbal lock]）问题，而对物体进行旋转（[link:https://en.wikipedia.org/wiki/Quaternions_and_spatial_rotation rotating things]），
+ 同时它还具有其它优点。
</p>
- <h2>Example</h2>
+ <h2>示例</h2>
<code>
var quaternion = new THREE.Quaternion();
@@ -30,7 +28,7 @@ <h2>Example</h2>
</code>
- <h2>Constructor</h2>
+ <h2>构造函数</h2>
<h3>[name]( [param:Float x], [param:Float y], [param:Float z], [param:Float w] )</h3>
@@ -42,36 +40,36 @@ <h3>[name]( [param:Float x], [param:Float y], [param:Float z], [param:Float w] )
</p>
- <h2>Properties</h2>
+ <h2>属性</h2>
<h3>[property:Float x]</h3>
- <p>Changing this property will result in [page:.onChangeCallback onChangeCallback] being called.</p>
+ <p>改变这一属性将会导致[page:.onChangeCallback onChangeCallback]被调用。</p>
<h3>[property:Float y]</h3>
- <p>Changing this property will result in [page:.onChangeCallback onChangeCallback] being called.</p>
+ <p>改变这一属性将会导致[page:.onChangeCallback onChangeCallback]被调用。</p>
<h3>[property:Float z]</h3>
- <p>Changing this property will result in [page:.onChangeCallback onChangeCallback] being called.</p>
+ <p>改变这一属性将会导致[page:.onChangeCallback onChangeCallback]被调用。</p>
<h3>[property:Float w]</h3>
- <p>Changing this property will result in [page:.onChangeCallback onChangeCallback] being called.</p>
+ <p>改变这一属性将会导致[page:.onChangeCallback onChangeCallback]被调用。</p>
- <h2>Methods</h2>
+ <h2>方法</h2>
<h3>[method:Float angleTo]( [param:Quaternion q] )</h3>
<p>
- Returns the angle between this quaternion and quaternion [page:Quaternion q] in radians.
+ 以弧度的形式返回这一四元数与四元数[page:Quaternion q]之间的夹角。
</p>
<h3>[method:Quaternion clone]()</h3>
<p>
- Creates a new Quaternion with identical [page:.x x], [page:.y y],
- [page:.z z] and [page:.w w] properties to this one.
+ 以和这一四元数相同的[page:.x x]、[page:.y y]、[page:.z z]和[page:.w w]属性来创建一个新的四元数。
</p>
<h3>[method:Quaternion conjugate]()</h3>
<p>
+ 返回该四元数的旋转共轭。四元数
Returns the rotational conjugate of this quaternion. The conjugate of a quaternion
represents the same rotation in the opposite direction about the rotational axis.
</p> | true |
Other | mrdoob | three.js | df301630d6c17960ca190d97928f3ea0d7b5abd7.json | Translate some pages in Math | docs/api/zh/math/Sphere.html | @@ -8,22 +8,22 @@
<link type="text/css" rel="stylesheet" href="page.css" />
</head>
<body>
- <h1>[name]</h1>
+ <h1>球（[name]）</h1>
- <p class="desc">A sphere defined by a center and radius.</p>
+ <p class="desc">一个球由球心和半径所定义。</p>
- <h2>Constructor</h2>
+ <h2>构造函数</h2>
<h3>[name]( [param:Vector3 center], [param:Float radius] )</h3>
<p>
- [page:Vector3 center] - center of the sphere. Default is a [page:Vector3] at (0, 0, 0). <br />
- [page:Float radius] - radius of the sphere. Default is 0.<br /><br />
+ [page:Vector3 center] - 球心的位置，默认值是一个位于(0, 0, 0)的[page:Vector3]。<br />
+ [page:Float radius] - 球的半径，默认值是0。<br /><br />
- Creates a new [name].
+ 创建一个新的[name]。
</p>
- <h2>Properties</h2>
+ <h2>属性</h2>
<h3>[property:Vector3 center]</h3> | true |
Other | mrdoob | three.js | df301630d6c17960ca190d97928f3ea0d7b5abd7.json | Translate some pages in Math | docs/api/zh/math/Triangle.html | @@ -8,135 +8,132 @@
<link type="text/css" rel="stylesheet" href="page.css" />
</head>
<body>
- <h1>[name]</h1>
+ <h1>三角形（[name]）</h1>
<p class="desc">
- A geometric triangle as defined by three [page:Vector3 Vector3s] representing its
- three corners.
+ 一个三角形由三个表示其三个角的[page:Vector3 Vector3]所定义。
</p>
- <h2>Constructor</h2>
+ <h2>构造函数</h2>
<h3>[name]( [param:Vector3 a], [param:Vector3 b], [param:Vector3 c] )</h3>
<p>
- [page:Vector3 a] - the first corner of the triangle. Default is a [page:Vector3] at (0, 0, 0).<br />
- [page:Vector3 b] - the second corner of the triangle. Default is a [page:Vector3] at (0, 0, 0).<br />
- [page:Vector3 c] - the final corner of the triangle. Default is a [page:Vector3] at (0, 0, 0).<br /><br />
+ [page:Vector3 a] - 三角形的第一个角，默认值是一个在(0, 0, 0)处的[page:Vector3]。<br />
+ [page:Vector3 b] - 三角形的第二个角，默认值是一个在(0, 0, 0)处的[page:Vector3]。<br />
+ [page:Vector3 c] - 三角形的第三个角（最后一个角），默认值是一个在(0, 0, 0)处的[page:Vector3]。<br /><br />
- Creates a new [name].
+ 创建一个新的[name]。
</p>
- <h2>Properties</h2>
+ <h2>属性</h2>
<h3>[property:Vector3 a]</h3>
<p>
- The first corner of the triangle. Default is a [page:Vector3] at (0, 0, 0).
+ 三角形的第一个角，默认值是一个在(0, 0, 0)处的[page:Vector3]。
</p>
<h3>[property:Vector3 b]</h3>
<p>
- The second corner of the triangle. Default is a [page:Vector3] at (0, 0, 0).
+ 三角形的第二个角，默认值是一个在(0, 0, 0)处的[page:Vector3]。
</p>
<h3>[property:Vector3 c]</h3>
<p>
- the final corner of the triangle. Default is a [page:Vector3] at (0, 0, 0)
+ 三角形的第三个角（最后一个角），默认值是一个在(0, 0, 0)处的[page:Vector3]。
</p>
- <h2>Methods</h2>
+ <h2>方法</h2>
<h3>[method:Triangle clone]()</h3>
<p>
- Returns a new triangle with the same [page:.a a], [page:.b b] and [page:.c c] properties as this one.
+ 返回一个和该三角形具有相同[page:.a a]、[page:.b b]和[page:.c c]属性的新三角形。
</p>
<h3>[method:Vector3 closestPointToPoint]( [param:Vector3 point], [param:Vector3 target] )</h3>
<p>
[page:Vector3 point] - [page:Vector3] <br />
- [page:Vector3 target] — the result will be copied into this Vector3.<br /><br />
+ [page:Vector3 target] — 结果将被拷贝到这一Vector3中。<br /><br />
- Returns the closest point on the triangle to [page:Vector3 point].
+ 返回三角形上最靠近所给定的[page:Vector3 point]的点。
</p>
<h3>[method:Boolean containsPoint]( [param:Vector3 point] )</h3>
<p>
- [page:Vector3 point] - [page:Vector3] to check.<br /><br />
+ [page:Vector3 point] - 将被检测的[page:Vector3]。<br /><br />
- Returns true if the passed point, when projected onto the plane of the triangle, lies within the triangle.
+ 如果传入的点投影到三角形的平面内，则返回true。
</p>
<h3>[method:Triangle copy]( [param:Triangle triangle] )</h3>
<p>
- Copies the values of the passed triangles's [page:.a a], [page:.b b] and [page:.c c]
- properties to this triangle.
+ 将传入的三角形的[page:.a a]、[page:.b b]和[page:.c c]属性复制给这一三角形。
</p>
<h3>[method:Boolean equals]( [param:Triangle triangle] )</h3>
<p>
- Returns true if the two triangles have identical [page:.a a], [page:.b b] and [page:.c c] properties.
+ 若这两个三角形具有相同的[page:.a a]、[page:.b b]和[page:.c c]属性，则返回true。
</p>
<h3>[method:Float getArea]()</h3>
- <p>Return the area of the triangle.</p>
+ <p>返回三角形的面积。</p>
<h3>[method:Vector3 getBarycoord]( [param:Vector3 point], [param:Vector3 target] )</h3>
<p>
[page:Vector3 point] - [page:Vector3] <br />
- [page:Vector3 target] — the result will be copied into this Vector3.<br /><br />
+ [page:Vector3 target] — 结果将会被拷贝到这一Vector3中。<br /><br />
- Return a [link:https://en.wikipedia.org/wiki/Barycentric_coordinate_system barycentric coordinate]
- from the given vector. <br/><br/>
+ 从给定的向量中返回一个[link:https://en.wikipedia.org/wiki/Barycentric_coordinate_system barycentric coordinate]（重心坐标）。<br/><br/>
- [link:http://commons.wikimedia.org/wiki/File:Barycentric_coordinates_1.png Picture of barycentric coordinates]
+ 请参阅关于这一概念的相关图片：[link:http://commons.wikimedia.org/wiki/File:Barycentric_coordinates_1.png Picture of barycentric coordinates]。
</p>
<h3>[method:Vector3 getMidpoint]( [param:Vector3 target] )</h3>
<p>
- [page:Vector3 target] — the result will be copied into this Vector3.<br /><br />
+ [page:Vector3 target] — 结果将会被拷贝到这一Vector3中。<br /><br />
- Calculate the midpoint of the triangle.
+ 计算三角形的中点。
</p>
<h3>[method:Vector3 getNormal]( [param:Vector3 target] )</h3>
<p>
- [page:Vector3 target] — the result will be copied into this Vector3.<br /><br />
+ [page:Vector3 target] — 结果将会被拷贝到这一Vector3中。<br /><br />
- Calculate the [link:https://en.wikipedia.org/wiki/Normal_(geometry) normal vector] of the triangle.
+ 计算三角形的法向量（[link:https://en.wikipedia.org/wiki/Normal_(geometry) normal vector]）。
</p>
<h3>[method:Plane getPlane]( [param:Plane target] )</h3>
<p>
- [page:Vector3 target] — the result will be copied into this Plane.<br /><br />
+ [page:Vector3 target] — 结果将会被拷贝到这一Plane中。<br /><br />
- Calculate a [page:Plane plane] based on the triangle. .
+ 基于三角形计算出一个平面（[page:Plane plane]）。
</p>
<h3>[method:Boolean intersectsBox]( [param:Box3 box] )</h3>
<p>
- [page:Box3 box] - Box to check for intersection against.<br /><br />
+ [page:Box3 box] - 将被用于检测是否与三角形有交集的box。<br /><br />
- Determines whether or not this triangle intersects [page:Box3 box].
+ 判定三角形与传入的[page:Box3 box]是否相交。
</p>
<h3>[method:Triangle set]( [param:Vector3 a], [param:Vector3 b], [param:Vector3 c] ) [param:Triangle this]</h3>
<p>
- Sets the triangle's [page:.a a], [page:.b b] and [page:.c c] properties to the passed [page:vector3 vector3s].
+ 将三角形的[page:.a a]、[page:.b b]和[page:.c c]属性设置为所传入的[page:vector3 vector3]。
</p>
<h3>[method:Triangle setFromPointsAndIndices]( [param:Array points], [param:Integer i0], [param:Integer i1], [param:Integer i2] ) [param:Triangle this]</h3>
<p>
- points - [page:Array] of [page:Vector3]s <br />
- i0 - [page:Integer] index <br />
- i1 - [page:Integer] index <br />
- i2 - [page:Integer] index<br /><br />
+ points - [page:Vector3]数组（[page:Array]） <br />
+ i0 - 整数（[page:Integer]）索引 <br />
+ i1 - 整数（[page:Integer]）索引 <br />
+ i2 - 整数（[page:Integer]）索引<br /><br />
- Sets the triangle's vectors to the vectors in the array.
+ 设置三角形的向量为数组中的向量。
</p>
- <h2>Source</h2>
+ <h2>源代码</h2>
[link:https://github.com/mrdoob/three.js/blob/master/src/[path].js src/[path].js]
</body> | true |
Other | mrdoob | three.js | 9577c9d4d84e086f55dd1fc236549e78c37e8e90.json | Complete those untranslated | docs/api/zh/core/bufferAttributeTypes/BufferAttributeTypes.html | @@ -31,14 +31,14 @@ <h1>BufferAttribute Types</h1>
<h2>构造函数</h2>
- All of the above are called in the same way.
+ 所有上述内容都以相同的方式调用。
<h3>TypedBufferAttribute( [param:Array array], [param:Integer itemSize], [param:Boolean normalized] )</h3>
<p>
- array -- this can be a typed or untyped (normal) array. It will be converted to the Type specified.<br /><br />
+ array -- 这可以是类型化或非类型化的（普通）数组。它将被转换为指定的类型。<br /><br />
- itemSize -- the number of values of the array that should be associated with a particular vertex.<br /><br />
+ itemSize -- 应与特定顶点关联的数组值的数量。<br /><br />
- normalized -- (optional) indicates how the underlying data in the buffer maps to the values in the GLSL code.
+ normalized -- （可选）表示缓冲区中的基础数据如何映射到GLSL代码中的值。
</p>
<h2>属性</h2> | false |
Other | mrdoob | three.js | 6efb8be5dca8b87f643b9dff9fa056cbdb3e9f57.json | Adjust links and line-breaks. | docs/manual/zh/introduction/Animation-system.html | @@ -8,77 +8,79 @@
<link type="text/css" rel="stylesheet" href="page.css" />
</head>
<body>
- <h1>动画系统[name]</h1>
+ <h1>动画系统（[name]）</h1>
<h2>概述</h2>
<p class="desc">
在three.js动画系统中，您可以为模型的各种属性设置动画：
- [page:SkinnedMesh 蒙皮和装配模型]的骨头，[page:Geometry.morphTargets 变形目标]，不同的材料属性（颜色，
- 不透明度，布尔运算），可见性和变换。动画属性可以淡入、淡出、交叉淡化和扭曲。在相同或不同物体上同时发生的
- 动画的权重和时间上的规模变化可以独立地进行。相同或不同物体的动画也可以同步发生。
+ [page:SkinnedMesh]（蒙皮和装配模型）的骨骼，[page:Geometry.morphTargets]（变形目标），
+ 不同的材料属性（颜色，不透明度，布尔运算），可见性和变换。动画属性可以淡入、淡出、交叉淡化和扭曲。
+ 在相同或不同物体上同时发生的动画的权重和时间上的规模变化可以独立地进行。
+ 相同或不同物体的动画也可以同步发生。
<br /><br />
- 为了在一个同构系统中实现所有这一切，three.js的动画系统
- [link:https://github.com/mrdoob/three.js/issues/6881 在2015年彻底改变]（注意过时的信息！），
+ 为了在一个同构系统中实现所有这一切，
+ three.js的动画系统<a href="https://github.com/mrdoob/three.js/issues/6881">在2015年彻底改变</a>（注意过时的信息！），
它现在有一个与Unity/虚幻4引擎类似的架构。此页面简要阐述了这个系统中的主要组件以及它们如何协同工作。
</p>
- <h3>动画片段(Animation Clips)</h3>
+ <h3>动画片段（Animation Clips）</h3>
<p class="desc">
- 如果您已成功导入3D动画对象（无论它是否有骨骼或变形目标或两者皆有都不要紧）—— 例如使用
- [link:https://github.com/KhronosGroup/glTF-Blender-Exporter glTF Blender导出器]从Blender导出它并
- 使用[page:GLTFLoader]将其加载到three.js场景中 —— 其中一个响应字段应该是一个名为“animations”的数组，
+ 如果您已成功导入3D动画对象（无论它是否有骨骼或变形目标或两者皆有都不要紧）——
+ 例如使用<a href="https://github.com/KhronosGroup/glTF-Blender-Exporter">glTF Blender导出器</a>
+ 从Blender导出它并使用[page:GLTFLoader]将其加载到three.js场景中
+ —— 其中一个响应字段应该是一个名为“animations”的数组，
其中包含此模型的[page:AnimationClip AnimationClips]（请参阅下面可用的加载器列表）。
<br /><br />
- 每个*AnimationClip*通常保存对象某个活动的数据。举个例子，假如mesh是一个角色，可能有一个AnimationClip
- 实现步行循环，第二个AnimationClip实现跳跃，第三个AnimationClip实现闪避等等。
+ 每个*AnimationClip*通常保存对象某个活动的数据。
+ 举个例子，假如mesh是一个角色，可能有一个AnimationClip实现步行循环，
+ 第二个AnimationClip实现跳跃，第三个AnimationClip实现闪避等等。
</p>
- <h3>关键帧轨道(Keyframe Tracks)</h3>
+ <h3>关键帧轨道（Keyframe Tracks）</h3>
<p class="desc">
- 在这样的*AnimationClip*里面，每个动画属性的数据都存储在一个
- 单独的[page:KeyframeTrack]中。假设一个角色对象有[page:Skeleton 骨架]，
+ 在这样的*AnimationClip*里面，每个动画属性的数据都存储在一个单独的[page:KeyframeTrack]中。
+ 假设一个角色对象有[page:Skeleton]（骨架），
一个关键帧轨道可以存储下臂骨骼位置随时间变化的数据，
另一个轨道追踪同一块骨骼的旋转变化，第三个追踪另外一块骨骼的位置、转角和尺寸，等等。
应该很清楚，AnimationClip可以由许多这样的轨道组成。
<br /><br />
- 假设模型具有[page:Geometry.morphTargets 变形目标]（例如一个变形
- 目标显示一个笑脸，另一个显示愤怒的脸），每个轨道都持有某个变形目标在AnimationClip
- 运行期间产生的[page:Mesh.morphTargetInfluences 影响]如何变化的信息。
+ 假设模型具有[page:Geometry.morphTargets]（变形目标）——
+ 例如一个变形目标显示一个笑脸，另一个显示愤怒的脸 ——
+ 每个轨道都持有某个变形目标在AnimationClip运行期间产生的[page:Mesh.morphTargetInfluences]（变形目标影响）如何变化的信息。
</p>
- <h3>动画混合器(Animation Mixer)</h3>
+ <h3>动画混合器（Animation Mixer）</h3>
<p class="desc">
存储的数据仅构成动画的基础 —— 实际播放由[page:AnimationMixer]控制。
- 你可以想象这不仅仅是动画的播放器，而是作为硬件的模拟，
- 如真正的调音台，可以同时控制和混合若干动画。
+ 你可以想象这不仅仅是动画的播放器，而是作为硬件的模拟，如真正的调音台，可以同时控制和混合若干动画。
</p>
- <h3>动画行为(Animation Actions)</h3>
+ <h3>动画行为（Animation Actions）</h3>
<p class="desc">
- *AnimationMixer*本身只有很少的（大体上）属性和方法，因为它
- 可以通过[page:AnimationAction AnimationActions]来控制。通过配置
- *AnimationAction*，您可以决定何时播放、暂停或停止其中一个混合器中的
- 某个*AnimationClip*，这个*AnimationClip*是否需要重复播放以及重复的频率，
+ *AnimationMixer*本身只有很少的（大体上）属性和方法，
+ 因为它可以通过[page:AnimationAction AnimationActions]来控制。
+ 通过配置*AnimationAction*，您可以决定何时播放、暂停或停止其中一个混合器中的某个*AnimationClip*，
+ 这个*AnimationClip*是否需要重复播放以及重复的频率，
是否需要使用淡入淡出或时间缩放，以及一些其他内容（例如交叉渐变和同步）。
</p>
- <h3>动画对象组(Animation Object Groups)</h3>
+ <h3>动画对象组（Animation Object Groups）</h3>
<p class="desc">
如果您希望一组对象接收共享的动画状态，则可以使用[page:AnimationObjectGroup]。
</p>
- <h3>支持的格式和加载器(Supported Formats and Loaders)</h3>
+ <h3>支持的格式和加载器（Supported Formats and Loaders）</h3>
<p class="desc">
- 请注意，并非所有模型格式都包含动画（尤其是OBJ，没有），而且只有某些
- three.js加载器支持[page:AnimationClip AnimationClip]序列。以下几个<i>确实</i>
- 支持此动画类型：
+ 请注意，并非所有模型格式都包含动画（尤其是OBJ，没有），
+ 而且只有某些three.js加载器支持[page:AnimationClip AnimationClip]序列。
+ 以下几个<i>确实</i>支持此动画类型：
</p>
<ul>
@@ -92,8 +94,7 @@ <h3>支持的格式和加载器(Supported Formats and Loaders)</h3>
</ul>
<p class="desc">
- 请注意，3ds max和Maya当前无法直接导出多个动画（这意味着动画不是
- 在同一时间线上）到一个文件中。
+ 请注意，3ds max和Maya当前无法直接导出多个动画（这意味着动画不是在同一时间线上）到一个文件中。
</p>
<h2>范例</h2> | false |
Other | mrdoob | three.js | 461f4f68931cbf0b954aeee54fa6dea711ff9d68.json | Fix GLBufferAttribute example | examples/webgl_buffergeometry_points_glbufferattribute.html | @@ -34,12 +34,16 @@
<script src="../build/three.js"></script>
- <script src="js/Detector.js"></script>
+ <script src="js/WebGL.js"></script>
<script src="js/libs/stats.min.js"></script>
<script>
- if ( ! Detector.webgl ) Detector.addGetWebGLMessage();
+ if ( WEBGL.isWebGLAvailable() === false ) {
+
+ document.body.appendChild( WEBGL.getWebGLErrorMessage() );
+
+ }
var container, stats;
| false |
Other | mrdoob | three.js | 65afc8d66e120264e1138a2166664d96fdd437f2.json | translate this page into Chinese. | docs/manual/zh/introduction/Loading-3D-models.html | @@ -14,44 +14,36 @@ <h1>[name]</h1>
<br />
<p>
- 3D models are available in hundreds of file formats, each with different
- purposes, assorted features, and varying complexity. Although
- <a href="https://github.com/mrdoob/three.js/tree/dev/examples/js/loaders" target="_blank" rel="noopener">
- three.js provides many loaders</a>, choosing the right format and
- workflow will save time and frustration later on. Some formats are
- difficult to work with, inefficient for realtime experiences, or simply not
- fully supported at this time.
+ 3D模型目前的有成千上万钟格式，每一种格式都具有不同的目的、用途以及复杂性。
+ 虽然<a href="https://github.com/mrdoob/three.js/tree/dev/examples/js/loaders" target="_blank" rel="noopener">
+ three.js已经提供了多种导入工具</a>
+ 选择正确的文件格式以及工作流程将可以节省很多时间，以及避免很多挫折。某些格式难以使用，或者实时体验效率低下，或者目前尚未得到完全支持。
</p>
<p>
- This guide provides a workflow recommended for most users, and suggestions
- for what to try if things don't go as expected.
+ 对大多数用户，本指南针推荐了以一个工作流程，以及当没有达到预期的效果时的建议。
+
</p>
- <h2>Before we start</h2>
+ <h2>在开始之前</h2>
<p>
- If you're new to running a local server, begin with
- [link:#manual/introduction/How-to-run-things-locally how to run things locally]
- first. Many common errors viewing 3D models can be avoided by hosting files
- correctly.
+ 如果你是第一次运行一个本地服务器，可以先阅读[link:#manual/introduction/How-to-run-things-locally how to run things locally]。
+ 通过正确地托管文件，可以避免很多查看3D模型时的常见错误。
</p>
- <h2>Recommended workflow</h2>
+ <h2>推荐的工作流程</h2>
<p>
- Where possible, we recommend using glTF (GL Transmission Format). Both
- <small>.GLB</small> and <small>.GLTF</small> versions of the format are
- well supported. Because glTF is focused on runtime asset delivery, it is
- compact to transmit and fast to load. Features include meshes, materials,
- textures, skins, skeletons, morph targets, animations, lights, and
- cameras.
+ 如果有可能的话，我们推荐使用glTF（GL传输格式）。<small>.GLB</small>和<small>.GLTF</small>是这种格式的这两种不同版本，
+ 都可以被很好地支持。由于glTF这种格式是专注于运行时的效果呈现的，所以它的传输效率是非常紧凑，而且加载速度很快。
+ 功能方面包含了网格、材质、纹理、皮肤、骨骼、变形目标、动画、灯光和摄像机。
</p>
<p>
- Public-domain glTF files are available on sites like
+ 公共领域的glTF文件可以在网上找到，例如
<a href="https://sketchfab.com/models?features=downloadable&sort_by=-likeCount&type=models" target="_blank" rel="noopener">
- Sketchfab</a>, or various tools include glTF export:
+ Sketchfab</a>，或者很多工具包含了glTF的导出功能：
</p>
<ul>
@@ -66,62 +58,50 @@ <h2>Recommended workflow</h2>
</ul>
<p>
- If your preferred tools do not support glTF, consider requesting glTF
- export from the authors, or posting on
- <a href="https://github.com/KhronosGroup/glTF/issues/1051" target="_blank" rel="noopener">the glTF roadmap thread</a>.
+ 倘若你所喜欢的工具不支持glTF格式，请考虑向该工具的作者请求glTF导出功能，
+ 或者在<a href="https://github.com/KhronosGroup/glTF/issues/1051" target="_blank" rel="noopener">the glTF roadmap thread</a>贴出你的想法。
+
</p>
<p>
- When glTF is not an option, popular formats such as FBX, OBJ, or COLLADA
- are also available and regularly maintained.
+ 当glTF不能被作为一个选项的时候，诸如FBX、OBJ或者COLLADA等等其它受欢迎的格式也是可以使用、并且是也定期维护的。
</p>
- <h2>Troubleshooting</h2>
+ <h2>故障排除</h2>
<p>
- You've spent hours modeling an artisanal masterpiece, you load it into
- the webpage, and — oh no! 😭 It's distorted, miscolored, or missing entirely.
- Start with these troubleshooting steps:
+ 你在花了几个小时亲手建了一个堪称杰作的模型，现在你把它给导入到网页中——
+ 哦，我的天呐~😭它导入以后完全失真了、材质贴图丢了、或者说整个模型完全丢失了！
+ 接下来我们来按照下面的步骤排除故障：
</p>
<ol>
<li>
- Check the JavaScript console for errors, and make sure you've used an
- <em>onError</em> callback when calling <em>.load()</em> to log the result.
+ 在Javascript的Console中查找错误，并确定当你调用<em>.load()</em>的时候，使用了<em>onError</em>回调函数来输出结果。
</li>
<li>
- View the model in another application. For glTF, drag-and-drop viewers
- are available for
- <a href="https://gltf-viewer.donmccurdy.com/" target="_blank" rel="noopener">three.js</a> and
- <a href="http://sandbox.babylonjs.com/" target="_blank" rel="noopener">babylon.js</a>. If the model
- appears correctly in one or more applications,
- <a href="https://github.com/mrdoob/three.js/issues/new" target="_blank" rel="noopener">file a bug against three.js</a>.
- If the model cannot be shown in any application, we strongly encourage
- filing a bug with the application used to create the model.
+ 在别的应用程序中查看3D模型。对于glTF格式的模型来说，可以直接在下面的应用程序中进行查看：
+ <a href="https://gltf-viewer.donmccurdy.com/" target="_blank" rel="noopener">three.js</a>和
+ <a href="http://sandbox.babylonjs.com/" target="_blank" rel="noopener">babylon.js</a>。
+ 如果该模型能够在一个或者更多应用程序里正确呈现，请<a href="https://github.com/mrdoob/three.js/issues/new" target="_blank" rel="noopener">点击这里向three.js提交Bug报告</a>。
+ 如果模型不能在任意一个应用程序里显示，我们强烈鼓励你向我们提交Bug报告，告知我们你的模型是使用哪一款应用程序创建的。
+
</li>
<li>
- Try scaling the model up or down by a factor of 1000. Many models are
- scaled differently, and large models may not appear if the camera is
- inside the model.
+ 尝试将模型放大或缩小原来的1000倍。许多模型的缩放比例各不相同，倘若摄像机位于相机内，则大型模型将可能不会显示。
</li>
<li>
- Look for failed texture requests in the network tab, like
- <em>C:\\Path\To\Model\texture.jpg</em>. Use paths relative to your
- model instead, such as <em>images/texture.jpg</em> — this may require
- editing the model file in a text editor.
+ 在网络面板中查找失败的纹理贴图请求，像<em>C:\\Path\To\Model\texture.jpg</em>。使用相对于你的模型的文件路径，例如
+ <em>images/texture.jpg</em>——这或许需要在文本编辑器中编辑模型文件。
</li>
</ol>
- <h2>Asking for help</h2>
+ <h2>请求帮助</h2>
<p>
- If you've gone through the troubleshooting process above and your model
- still isn't working, the right approach to asking for help will get you to
- a solution faster. Post a question on the
- <a href="https://discourse.threejs.org/" target="_blank" rel="noopener">three.js forum</a> and, whenever possible,
- include your model (or a simpler model with the same problem) in any formats
- you have available. Include enough information for someone else to reproduce
- the issue quickly — ideally, a live demo.
+ 倘若你已经尝试经历了以上故障排除的过程，但是你的模型仍然无法工作，寻求正确的方法来获得帮助将使您更快地获得解决方案。
+您可以将您的问题发布到<a href="https://discourse.threejs.org/" target="_blank" rel="noopener">three.js forum</a>，
+ 同时，尽可能将你的模型（或者一个简单的、具有相同问题的模型）可用的包含在你能够使用的任何格式中，为其他人提供足够的信息，以便快速重现这个问题——最好是一个能够现场演示的Demo。
</p>
</body> | false |
Other | mrdoob | three.js | 17c6b34ff3b713484166a5e96d79c984e151f3a6.json | translate this page completely | docs/manual/zh/introduction/Drawing-lines.html | @@ -11,11 +11,11 @@
<h1>[name]</h1>
<div>
<p>
- Let's say you want to draw a line or a circle, not a wireframe [page:Mesh].
- First we need to setup the [page:WebGLRenderer renderer], [page:Scene scene] and camera (see the Creating a scene page).
+ 假设你想画一个圆或者画一条线，而不是一个线框或者说[page:Mesh]（网格）。
+ 第一部我们要做的，是设置好[page:WebGLRenderer renderer]（渲染器）、[page:Scene scene]（场景）和[page:Camera camera]（相机）-（请阅读本手册第一章“Creating a scene”）。
</p>
- <p>Here is the code that we will use:</p>
+ <p>这是我们将要用到的代码：</p>
<code>
var renderer = new THREE.WebGLRenderer();
renderer.setSize( window.innerWidth, window.innerHeight );
@@ -27,15 +27,17 @@ <h1>[name]</h1>
var scene = new THREE.Scene();
</code>
- <p>Next thing we will do is define a material. For lines we have to use [page:LineBasicMaterial] or [page:LineDashedMaterial].</p>
+ <p>
+ 接下来我们要做的事情是定义一个材质。对于线条来说，我们能使用的材质只有[page:LineBasicMaterial] 或者 [page:LineDashedMaterial]。
+ </p>
<code>
//create a blue LineBasicMaterial
var material = new THREE.LineBasicMaterial( { color: 0x0000ff } );
</code>
<p>
- After material we will need a [page:Geometry] or [page:BufferGeometry] with some vertices
- (it's recommended to use a BufferGeometry as it's more performant, however for simplicity we'll use a Geometry here):
+ 定义好材质之后，我们需要一个带有一些顶点的[page:Geometry] 或者 [page:BufferGeometry]。
+ （推荐使用BufferGeometry，因为它在性能上表现得会更好一些；但在这里，为了简单起见，我们使用Geometry）：
</p>
<code>
@@ -45,20 +47,20 @@ <h1>[name]</h1>
geometry.vertices.push(new THREE.Vector3( 10, 0, 0) );
</code>
- <p>Note that lines are drawn between each consecutive pair of vertices, but not between the first and last (the line is not closed.)</p>
+ <p>注意，线是被画在每一对连续的顶点之间的，而不是在第一个顶点和最后一个定点之间绘制线条（线条并未闭合）。</p>
- <p>Now that we have points for two lines and a material, we can put them together to form a line.</p>
+ <p>既然我们已经有了能够画两条线的点和一个材质，我们现在就能够将他们组合在一起，形成一条线。</p>
<code>
var line = new THREE.Line( geometry, material );
</code>
- <p>All that's left is to add it to the scene and call [page:WebGLRenderer.render render].</p>
+ <p>剩下的就是把它添加到场景中并调用[page:WebGLRenderer.render render]（渲染）函数。</p>
<code>
scene.add( line );
renderer.render( scene, camera );
</code>
- <p>You should now be seeing an arrow pointing upwards, made from two blue lines.</p>
+ <p>你现在应当已经看到了一个由两条蓝线组成的、指向上的箭头。</p>
</div>
</body>
</html> | false |
Other | mrdoob | three.js | 4eb0932b8ff0e8591b1703fce2afeba2db90903c.json | change the position of some texe . | docs/manual/zh/introduction/How-to-run-things-locally.html | @@ -159,7 +159,6 @@ <h3>Chrome</h3>
<code>open /Applications/Google\ Chrome.app --args --allow-file-access-from-files</code>
</div>
-
<h3>Firefox</h3>
<div>
<ol>
@@ -179,7 +178,6 @@ <h3>Firefox</h3>
<p>
其它简单的替代方案你可以在Stack Overflow上找到：[link:http://stackoverflow.com/q/12905426/24874 click here]。
-
</p>
</div>
| false |
Other | mrdoob | three.js | 5fd04c7880d273e067d0df6e8b8494ec127bce05.json | translate this page completely | docs/manual/zh/introduction/How-to-run-things-locally.html | @@ -10,59 +10,56 @@
<body>
<h1>[name]</h1>
<p>
- If you use just procedural geometries and don't load any textures, webpages should work
- straight from the file system, just double-click on HTML file in a file manager and it
- should appear working in the browser (you'll see <em>file:///yourFile.html</em> in the address bar).
+ 倘若你只是使用程序中提供的几何体，且不载入任何纹理贴图，网页是可以从本地的文件系统中打开并且是能够直接运行的，只需在文件管理器中双击HTML文件，它将在浏览器中进行显示。
+ （你将在地址栏中看到类似这样的URL：<em>file:///yourFile.html</em>）
+
</p>
- <h2>Content loaded from external files</h2>
+ <h2>从外部文件载入的内容</h2>
<div>
<p>
- If you load models or textures from external files, due to browsers' [link:http://en.wikipedia.org/wiki/Same_origin_policy same origin policy]
- security restrictions, loading from a file system will fail with a security exception.
+ 倘若你是从外部文件里载入几何体或是纹理贴图，由于浏览器[link:http://en.wikipedia.org/wiki/Same_origin_policy same origin policy]（同源策略）的安全限制，从本地文件系统载入外部文件将会失败，同时抛出安全性异常。
</p>
- <p>There are two ways to solve this:</p>
+ <p>这里有两种方法来解决这个问题：</p>
<ol>
<li>
- Change security for local files in a browser. This allows you to access your page as: <code>file:///yourFile.html</code>
+ 在浏览器中改变本地文件的安全策略，这将使得你通过<code>file:///yourFile.html</code>来直接运行本地文件系统中的文件。
</li>
<li>
- Run files from a local web server. This allows you to access your page as: <code>http://localhost/yourFile.html</code>
+ 从本地的服务器运行文件，这可以让你通过<code>http://localhost/yourFile.html</code>来访问运行在本地服务器上的文件。
</li>
</ol>
<p>
- If you use option 1, be aware that you may open yourself to some vulnerabilities if using
- the same browser for a regular web surfing. You may want to create a separate browser
- profile / shortcut used just for local development to be safe. Let's go over each option in turn.
+ 倘若你选择第一种方法，请小心，倘若你使用同一个浏览器来进行日常网络冲浪，你将会遇到一些漏洞。
+ 你或许可以创建一个用于开发环境的独立的浏览器配置文件或者快捷方式，仅用于本地开发；将日常使用环境与开发环境分离，以保证日常使用环境的安全性。
+ 接下来我们来看一看除此之外的别的方法。
</p>
</div>
- <h2>Run a local server</h2>
+ <h2>运行一个本地的服务器</h2>
<div>
<p>
- Many programming languages have simple HTTP servers built in. They are not as full featured as
- production servers such as [link:https://www.apache.org/ Apache] or [link:https://nginx.org NGINX], however they should be sufficient for testing your
- three.js application.
+ 很多的编程语言都具有一个内置的建议HTTP服务器。它们的功能并不像能够被用于生产环境的服务器例如[link:https://www.apache.org/ Apache] 或者 [link:https://nginx.org NGINX]那样完善，
+ 但对于测试你的three.js应用程序来说，它们可以说是比较够用的。
</p>
<h3>Node.js server</h3>
<div>
- <p>Node.js has a simple HTTP server package. To install:</p>
+ <p>Node.js 具有一个简单的HTTP服务器包，如需安装，请执行：</p>
<code>npm install http-server -g</code>
- <p>To run (from your local directory):</p>
+ <p>若要从本地目录下运行，请执行：</p>
<code>http-server . -p 8000</code>
</div>
<h3>Python server</h3>
<div>
<p>
- If you have [link:http://python.org/ Python] installed, it should be enough to run this
- from a command line (from your working directory):
+ 如果你已经安装好了[link:http://python.org/ Python]，仅仅从命令行里便可以运行它（从工作目录）：
</p>
<code>
//Python 2.x
@@ -72,93 +69,93 @@ <h3>Python server</h3>
python -m http.server
</code>
- <p>This will serve files from the current directory at localhost under port 8000, i.e in the address bar type:</p>
+ <p>这将会在为当前目录在8000端口创建一个服务器，也就是说你可以在地址栏里输入这个地址来访问已经创建好的服务器：</p>
<code>http://localhost:8000/</code>
</div>
<h3>Ruby server</h3>
<div>
- <p>If you have Ruby installed, you can get the same result running this instead:</p>
+ <p>如果你已经安装好了Ruby，通过运行下列命也可以创建同样的服务器：</p>
<code>
ruby -r webrick -e "s = WEBrick::HTTPServer.new(:Port => 8000, :DocumentRoot => Dir.pwd); trap('INT') { s.shutdown }; s.start"
</code>
</div>
<h3>PHP server</h3>
<div>
- <p>PHP also has a built-in web server, starting with php 5.4.0:</p>
+ <p>PHP自5.4.0起，便内置了一个Web服务器：</p>
<code>php -S localhost:8000</code>
</div>
<h3>Lighttpd</h3>
<div>
<p>
+ Lighttpd是一个轻量级的通用Web服务器，在这里，我们将介绍如何在OS X上使用HomeBrew来安装它。
+ 不像我们在这里讨论的其他服务器，lighttpd是一个成熟的能够为生产环境而准备的服务器。
Lighttpd is a very lightweight general purpose webserver. We'll cover installing it on OSX with
HomeBrew here. Unlike the other servers discussed here, lighttpd is a full fledged production
ready server.
</p>
<ol>
<li>
- Install it via homebrew
+ 通过HomeBrew安装lighttpd
<code>brew install lighttpd</code>
</li>
<li>
- Create a configuration file called lighttpd.conf in the directory where you want to run
- your webserver. There is a sample [link:http://redmine.lighttpd.net/projects/lighttpd/wiki/TutorialConfiguration here].
+ 在你希望作为服务器来运行的目录里，创建一个名为lighttpd.conf的配置文件。
+ 这是一个配置文件的样本：[link:http://redmine.lighttpd.net/projects/lighttpd/wiki/TutorialConfiguration TutorialConfiguration]。
</li>
<li>
- In the conf file, change the server.document-root to the directory you want to serve files from.
+ 在配置文件里，将server.document-root更改为你将要创建的服务器中的文件所在的目录。
</li>
<li>
- Start it with
+ 使用这个命令来启动：
<code>lighttpd -f lighttpd.conf</code>
</li>
<li>
- Navigate to http://localhost:3000/ and it will serve static files from the directory you
- chose.
+ 使用浏览器打开http://localhost:3000/，然后服务器将可以从你选择的目录中向你提供静态文件。
</li>
</ol>
</div>
- <h2>Change local files security policy</h2>
+ <h2>更改本地文件的安全策略</h2>
<div>
<h3>Safari</h3>
<div>
<p>
- Enable the develop menu using the preferences panel, under Advanced -> "Show develop menu
- in menu bar".
+ 在“偏好”面板中启用开发菜单，位于“高级”->“在菜单栏中显示开发菜单”
</p>
<p>
- Then from the safari "Develop" menu, select "Disable local file restrictions", it is also
- worth noting safari has some odd behaviour with caches, so it is advisable to use the
- "Disable caches" option in the same menu; if you are editing & debugging using safari.
+ 之后从Safari中的“开发”菜单中，选择“停用本地文件限制”，同样需要注意的是，Safari对于缓存有一些奇怪的行为，
+ 因此建议，在同一菜单中打开“停用缓存”的选项；如果你正在编辑，请使用Safari进行调试。
</p>
</div>
<h3>Chrome</h3>
<div>
- <p>Close all running Chrome instances first. The important word here is 'all'.</p>
+ <p>请关闭Chrome浏览器正在运行的*所有*实例，注意这里非常重要的关键字是“*所有*”。</p>
<p>
- On Windows, you may check for Chrome instances using the Windows Task Manager.
- Alternatively, if you see a Chrome icon in the system tray, then you may open its context
- menu and click 'Exit'. This should close all Chrome instances.
+ 在Windows中，你可以在任务管理器中查看所有正在运行的Chorme浏览器的实例。
+ 此外，如果你在系统任务栏中看到了Chrome图标，请鼠标右键打开它的上下文菜单，点击关闭。这样就应当已经关闭所有正在运行的Chrome浏览器实例了。
+
</p>
- <p>Then start the Chrome executable with a command line flag:</p>
+ <p>
+ 然后使用命令行执行Chrome浏览器，并在命令行中添加允许访问本地文件的参数：</p>
<code>chrome --allow-file-access-from-files</code>
<p>
- On Windows, probably the easiest is probably to create a special shortcut icon which has
- added the flag given above (right-click on shortcut -> properties -> target).
+ 在Windows中，最简单的做法或许就是创建一个特别的快捷方式图标，快捷方式的目标指向上面的命令行
+ （右键点击快捷方式图标->属性->目标）。
</p>
- <p>On Mac OSX, you can do this with</p>
+ <p>在Mac OS X中，你可以用这种方法来添加允许访问本地文件的参数并运行Chrome：</p>
<code>open /Applications/Google\ Chrome.app --args --allow-file-access-from-files</code>
</div>
@@ -167,22 +164,22 @@ <h3>Firefox</h3>
<div>
<ol>
<li>
- In the address bar, type <code>about:config</code>
+ 在地址栏中，键入<code>about:config</code>
</li>
<li>
- Find the <code>security.fileuri.strict_origin_policy</code> parameter
+ 找到<code>security.fileuri.strict_origin_policy</code>参数
</li>
<li>
- Set it to <em>false</em>
+ 将其设置为<em>false</em>
</li>
</ol>
</div>
</div>
<p>
- Other simple alternatives are [link:http://stackoverflow.com/q/12905426/24874 discussed here]
- on Stack Overflow.
+ 其它简单的替代方案你可以在Stack Overflow上找到：[link:http://stackoverflow.com/q/12905426/24874 click here]。
+
</p>
</div>
| false |
Other | mrdoob | three.js | 9ca7264b3e9bda2d2e04533864bbd5cd6477433f.json | change the gamera and continue translation | docs/manual/zh/introduction/Browser-support.html | @@ -13,7 +13,7 @@ <h1>[name]</h1>
<h2>总览</h2>
<div>
<p>
- 在所有现代浏览器中，Three.js可以使用WebGL来渲染场景。对于较旧的浏览器，特别是Internet Explorer 10或者更低版本浏览器，你将需要回落到其它[link:https://github.com/mrdoob/three.js/tree/master/examples/js/renderers renderers]（CSS2DRenderer、CSS3DRenderer、SVGRenderer、CanvasRenderer）。此外，你或许不得不包含一些polyfill，特别是当你使用[link:https://github.com/mrdoob/three.js/tree/master/examples /examples]目录中的文件时。
+ 在所有现代浏览器中，Three.js可以使用WebGL来渲染场景。对于较旧的浏览器，特别是Internet Explorer 10或者更低版本浏览器，你将需要回落到其它[link:https://github.com/mrdoob/three.js/tree/master/examples/js/renderers renderers]（CSS2DRenderer、CSS3DRenderer、SVGRenderer、CanvasRenderer）。此外，你或许不得不包含一些额外的“填充物”来解决兼容性问题，特别是当你使用[link:https://github.com/mrdoob/three.js/tree/master/examples /examples]目录中的文件时。
</p>
<p>
注意：如果你并不需要支持较旧的浏览器，那就不推荐使用其他渲染器来进行渲染，因为与WebGLRenderer相比，其它渲染器渲染较慢，并且不支持WebGL的诸多特性。
@@ -23,7 +23,7 @@ <h2>总览</h2>
<h2>支持WebGL的渲染器</h2>
<div>
<p>
- Google Chrome 9+、Firefox 4+、Opera 15+、Safari 5.1+、Internet Explorer 11 和 Microsoft Edge. 你可以点击[link:https://caniuse.com/#feat=webgl Can I use WebGL]来查阅各个浏览器对WebGL的支持性。
+ Google Chrome 9+、Firefox 4+、Opera 15+、Safari 5.1+、Internet Explorer 11 和 Microsoft Edge。你可以点击[link:https://caniuse.com/#feat=webgl Can I use WebGL]来查阅各个浏览器对WebGL的支持性。
</p>
</div>
@@ -32,7 +32,7 @@ <h2>
</h2>
<div>
<p>
- 这里是一些在Three.js中使用到的特性，其中的一部分需要额外的填充。
+ 这里是一些在Three.js中使用到的特性，其中的一部分需要额外的“填充物”来解决兼容性问题。
</p>
<table>
<thead>
@@ -92,16 +92,16 @@ <h2>
</table>
</div>
- <h2>Polyfills</h2>
+ <h2>关于用于解决兼容性问题的“填充物”</h2>
<div>
- <p>Just import polyfills based on your requirements. Taking IE9 as an example, you need to polyfill at least these features:</p>
+ <p>根据你的需求，引入相关的“填充物”即可。以IE9为例，你至少需要来使用“填充物”完成以下的功能。</p>
<ul>
<li>Typed Arrays</li>
<li>Blob</li>
</ul>
</div>
- <h3>Suggested polyfills</h3>
+ <h3>建议的“填充物”</h3>
<div>
<ul>
<li> | false |
Other | mrdoob | three.js | bdcef27ff473d043c4aebb43cc9c219cbe4eb7ef.json | translate this file | docs/manual/zh/introduction/Creating-a-scene.html | @@ -10,12 +10,12 @@
<body>
<h1>[name]</h1><br />
- <p>The goal of this section is to give a brief introduction to three.js. We will start by setting up a scene, with a spinning cube. A working example is provided at the bottom of the page in case you get stuck and need help.</p>
+ <p>这一部分的目标是对three.js来做一个简要的介绍。我们将建立一个包含有旋转立方体的场景来开始这一部分。为了防止你遇到麻烦时需要帮助，一个已经完成的例子在可以在页面下方找到。</p>
<h2>开始之前</h2>
-
- <p>Before you can use three.js, you need somewhere to display it. Save the following HTML to a file on your computer, along with a copy of [link:https://threejs.org/build/three.js three.js] in the js/ directory, and open it in your browser.</p>
-
+ <p>
+ 在你开始使用three.js之前，你需要一个地方来显示它；将下列HTML代码保存为你电脑上的一个HTML页面，同时将[link:https://threejs.org/build/three.js three.js]复制到js/目录下，然后在你的浏览器中打开这个页面。
+ </p>
<code>
<!DOCTYPE html>
<html>
@@ -36,11 +36,11 @@ <h2>开始之前</h2>
</html>
</code>
- <p>That's all. All the code below goes into the empty <script> tag.</p>
+ <p>好了，接下来的所有代码将会写入到空的<script>标签中。</p>
- <h2>Creating the scene</h2>
+ <h2>创建一个场景</h2>
- <p>To actually be able to display anything with three.js, we need three things: scene, camera and renderer, so that we can render the scene with camera.</p>
+ <p>为了真正能够让你的场景借助three.js来进行显示，我们需要以下几个对象：场景、相机和渲染器，这样我们就能透过摄像机渲染出场景。</p>
<code>
var scene = new THREE.Scene();
@@ -51,19 +51,19 @@ <h2>Creating the scene</h2>
document.body.appendChild( renderer.domElement );
</code>
- <p>Let's take a moment to explain what's going on here. We have now set up the scene, our camera and the renderer.</p>
+ <p>在这儿我们花一点点时间来解释一下这儿发生了什么。我们现在建立了场景、相机和渲染器。</p>
- <p>There are a few different cameras in three.js. For now, let's use a <strong>PerspectiveCamera</strong>.</p>
+ <p>three.js里有几种不同的相机，在这里，我们使用的是<strong>PerspectiveCamera</strong>（透视摄像机）。</p>
- <p>The first attribute is the <strong>field of view</strong>. FOV is the extent of the scene that is seen on the display at any given moment. The value is in degrees.</p>
+ <p>第一个属性是<strong>视场角（FOV）</strong>。视场角就是无论在什么时候，你所能在显示器上看到的场景的范围，它的值是一个角度。</p>
- <p>The second one is the <strong>aspect ratio</strong>. You almost always want to use the width of the element divided by the height, or you'll get the same result as when you play old movies on a widescreen TV - the image looks squished.</p>
+ <p>第二个值是<strong>长宽比（aspect ratio）</strong>。 也就是你用一个物体的宽除以它的高的比值。比如说，当你在一个宽屏电视上播放老电影时，可以看到图像仿佛是被压扁的。</p>
- <p>The next two attributes are the <strong>near</strong> and <strong>far</strong> clipping plane. What that means, is that objects further away from the camera than the value of <strong>far</strong> or closer than <strong>near</strong> won't be rendered. You don't have to worry about this now, but you may want to use other values in your apps to get better performance.</p>
+ <p>接下来的两个值是<strong>远剪切面</strong>和<strong>近剪切面</strong>。 也就是说当物体所在的位置比摄像机的<strong>远剪切面</strong>远或者所在位置比<strong>近剪切面</strong>近的时候，该物体超出的部分将不会被渲染到场景中。现在你或许并不用担心这个值的影响，但未来为了获得更好的渲染性能，你将可以在你的应用程序里去设置它。</p>
- <p>Next up is the renderer. This is where the magic happens. In addition to the WebGLRenderer we use here, three.js comes with a few others, often used as fallbacks for users with older browsers or for those who don't have WebGL support for some reason.</p>
+ <p>接下来是渲染器。这里是施展魔法的地方。除了我们在这里用到的WebGLRenderer渲染器之外，Three.js同时提供了其他几种渲染器，当用户所使用的浏览器过于老旧，或者由于其他原因不支持WebGL时，可以使用这几种渲染器进行降级。</p>
- <p>In addition to creating the renderer instance, we also need to set the size at which we want it to render our app. It's a good idea to use the width and height of the area we want to fill with our app - in this case, the width and height of the browser window. For performance intensive apps, you can also give <strong>setSize</strong> smaller values, like <strong>window.innerWidth/2</strong> and <strong>window.innerHeight/2</strong>, which will make the app render at half size.</p>
+ <p>除了创建一个渲染器的实例之外，我们还需要在我们的应用程序里设置一个渲染器的大小尺寸。比如说，我们可以使用所需要的这个渲染区域的宽高，来将渲染器渲染出的场景，使其填充满我们的应用程序。因此，我们可以将渲染器宽高设置为浏览器窗口宽高。 对于性能比较敏感的应用程序来说，你可以给<strong>setSize</strong>传入一个较小的值，例如<strong>window.innerWidth/2</strong>和<strong>window.innerHeight/2</strong>，这将使得app在渲染时以一半的长宽尺寸渲染场景。</p>
<p>If you wish to keep the size of your app but render it at a lower resolution, you can do so by calling <strong>setSize</strong> with false as <strong>updateStyle</strong> (the third argument). For example, <strong>setSize(window.innerWidth/2, window.innerHeight/2, false)</strong> will render your app at half resolution, given that your <canvas> has 100% width and height.</p>
| false |
Other | mrdoob | three.js | 7cbf6e9c69c6be83c2c46f8bc192456691bc6023.json | correct previous change. | examples/webgl_materials_texture3d_volume1.html | @@ -203,7 +203,7 @@
container.appendChild( renderer.domElement );
controls = new THREE.OrthographicTrackballControls( camera, renderer.domElement );
- controls.target = new THREE.Vector3(64, 64, 128);
+ controls.target.set( 64, 64, 128 );
controls.rotateSpeed = 5.0;
controls.zoomSpeed = 5;
controls.panSpeed = 2; | false |
Other | mrdoob | three.js | 1a1772c0e8e2b3ca6bd4f98f4e20fc5adc347d00.json | Fix wrong place of isQuaternion property | src/math/Quaternion.js | @@ -19,8 +19,6 @@ function Quaternion( x, y, z, w ) {
Object.assign( Quaternion, {
- isQuaternion: true,
-
slerp: function ( qa, qb, qm, t ) {
return qm.copy( qa ).slerp( qb, t );
@@ -165,6 +163,8 @@ Object.defineProperties( Quaternion.prototype, {
Object.assign( Quaternion.prototype, {
+ isQuaternion: true,
+
set: function ( x, y, z, w ) {
this._x = x; | false |
Other | mrdoob | three.js | 710a530680d744f8282d42253d8ac9e7cab1bcb7.json | Add a comment | examples/js/animation/MMDAnimationHelper.js | @@ -946,6 +946,7 @@ THREE.MMDAnimationHelper = ( function () {
if ( this.currentTime < this.delayTime ) return false;
+ // 'duration' can be bigger than 'audioDuration + delayTime' because of sync configuration
if ( ( this.currentTime - this.delayTime ) > this.audioDuration ) return false;
this.audio.startTime = this.currentTime - this.delayTime; | false |
Other | mrdoob | three.js | 835453ca323ac2f0775eb990e6cb426ed5ad737b.json | Add support for horizontal panning | examples/js/controls/OrbitControls.js | @@ -59,6 +59,7 @@ THREE.OrbitControls = function ( object, domElement ) {
// Set to false to disable panning
this.enablePan = true;
+ this.panningMode = THREE.ScreenSpacePanning; // alternate THREE.HorizontalPanning
this.keyPanSpeed = 7.0; // pixels moved per arrow key push
// Set to true to automatically rotate around the target
@@ -316,7 +317,21 @@ THREE.OrbitControls = function ( object, domElement ) {
return function panUp( distance, objectMatrix ) {
- v.setFromMatrixColumn( objectMatrix, 1 ); // get Y column of objectMatrix
+ switch ( scope.panningMode ) {
+
+ case THREE.ScreenSpacePanning:
+
+ v.setFromMatrixColumn( objectMatrix, 1 );
+ break;
+
+ case THREE.HorizontalPanning:
+
+ v.setFromMatrixColumn( objectMatrix, 0 );
+ v.crossVectors( scope.object.up, v );
+ break;
+
+ }
+
v.multiplyScalar( distance );
panOffset.add( v );
@@ -1041,3 +1056,6 @@ Object.defineProperties( THREE.OrbitControls.prototype, {
}
} );
+
+THREE.ScreenSpacePanning = 0;
+THREE.HorizontalPanning = 1; | false |
Other | mrdoob | three.js | d41afdc45af4853eceaeb6ccb7a3cfd561e475bf.json | catch undefined fileName | examples/js/loaders/FBXLoader.js | @@ -328,19 +328,19 @@
var fileName;
+ var currentPath = loader.path;
+
var children = connections.get( textureNode.id ).children;
if ( children !== undefined && children.length > 0 && images[ children[ 0 ].ID ] !== undefined ) {
fileName = images[ children[ 0 ].ID ];
- }
-
- var currentPath = loader.path;
+ if ( fileName.indexOf( 'blob:' ) === 0 || fileName.indexOf( 'data:' ) === 0 ) {
- if ( fileName.indexOf( 'blob:' ) === 0 || fileName.indexOf( 'data:' ) === 0 ) {
+ loader.setPath( undefined );
- loader.setPath( undefined );
+ }
}
| false |
Other | mrdoob | three.js | bd2de3eab6562cc945e8696071874d9f283dac0c.json | Add null-checking for gl.VERSION | src/renderers/webgl/WebGLState.js | @@ -342,8 +342,9 @@ function WebGLState( gl, extensions, utils ) {
var maxTextures = gl.getParameter( gl.MAX_COMBINED_TEXTURE_IMAGE_UNITS );
- var version = parseFloat( /^WebGL\ ([0-9])/.exec( gl.getParameter( gl.VERSION ) )[ 1 ] );
- var lineWidthAvailable = parseFloat( version ) >= 1.0;
+ var version = /^WebGL\ ([0-9])/.exec( gl.getParameter( gl.VERSION ) );
+ version = version ? parseFloat( version[ 1 ] ) : 1.0;
+ var lineWidthAvailable = version >= 1.0;
var currentTextureSlot = null;
var currentBoundTextures = {}; | false |
Other | mrdoob | three.js | dfdf633dfd643515fa4e299ef75dafe498be6efd.json | Upgrade dev dependencies | package-lock.json | @@ -49,20 +49,20 @@
"dev": true
},
"ajv": {
- "version": "5.5.2",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
- "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+ "version": "6.5.5",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.5.tgz",
+ "integrity": "sha512-7q7gtRQDJSyuEHjuVgHoUa2VuemFiCMrfQc9Tc08XTAc4Zj/5U1buQJ0HU6i7fKjXU09SVgSmxa4sLvuvS8Iyg==",
"dev": true,
"requires": {
- "co": "^4.6.0",
- "fast-deep-equal": "^1.0.0",
+ "fast-deep-equal": "^2.0.1",
"fast-json-stable-stringify": "^2.0.0",
- "json-schema-traverse": "^0.3.0"
+ "json-schema-traverse": "^0.4.1",
+ "uri-js": "^4.2.2"
}
},
"ansi-escapes": {
"version": "3.1.0",
- "resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
+ "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz",
"integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==",
"dev": true
},
@@ -109,7 +109,7 @@
"arr-flatten": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
- "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+ "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=",
"dev": true
},
"arr-union": {
@@ -145,12 +145,6 @@
"integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
"dev": true
},
- "arrify": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
- "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
- "dev": true
- },
"asn1": {
"version": "0.2.4",
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
@@ -211,7 +205,7 @@
"base": {
"version": "0.11.2",
"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
- "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+ "integrity": "sha1-e95c7RRbbVUakNuH+DxVi060io8=",
"dev": true,
"requires": {
"cache-base": "^1.0.1",
@@ -335,7 +329,7 @@
"cache-base": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
- "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+ "integrity": "sha1-Cn9GQWgxyLZi7jb+TnxZ129marI=",
"dev": true,
"requires": {
"collection-visit": "^1.0.0",
@@ -440,7 +434,7 @@
"class-utils": {
"version": "0.3.6",
"resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
- "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+ "integrity": "sha1-+TNprouafOAv1B+q0MqDAzGQxGM=",
"dev": true,
"requires": {
"arr-union": "^3.1.0",
@@ -547,12 +541,6 @@
}
}
},
- "co": {
- "version": "4.6.0",
- "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
- "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
- "dev": true
- },
"code-point-at": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
@@ -637,7 +625,7 @@
},
"readable-stream": {
"version": "2.3.6",
- "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
"dev": true,
"requires": {
@@ -770,7 +758,7 @@
"define-property": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
- "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+ "integrity": "sha1-1Flono1lS6d+AqgX+HENcCyxbp0=",
"dev": true,
"requires": {
"is-descriptor": "^1.0.2",
@@ -809,26 +797,17 @@
}
},
"del": {
- "version": "2.2.2",
- "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz",
- "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=",
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
+ "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
"dev": true,
"requires": {
- "globby": "^5.0.0",
+ "globby": "^6.1.0",
"is-path-cwd": "^1.0.0",
"is-path-in-cwd": "^1.0.0",
- "object-assign": "^4.0.1",
- "pify": "^2.0.0",
- "pinkie-promise": "^2.0.0",
+ "p-map": "^1.1.1",
+ "pify": "^3.0.0",
"rimraf": "^2.2.8"
- },
- "dependencies": {
- "pify": {
- "version": "2.3.0",
- "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
- "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
- "dev": true
- }
}
},
"delayed-stream": {
@@ -918,41 +897,47 @@
}
},
"electron": {
- "version": "2.0.13",
- "resolved": "https://registry.npmjs.org/electron/-/electron-2.0.13.tgz",
- "integrity": "sha512-8ouYaLsp0F4sPI7QKgJkkJhrwj1JPSnBwbz6HHA9l6u7WofEt94lV+gHw71KJrDl7UaIkFwlSjyhIjG8lIZqxw==",
+ "version": "3.0.8",
+ "resolved": "https://registry.npmjs.org/electron/-/electron-3.0.8.tgz",
+ "integrity": "sha512-UVj+K59lYU/vH/7TxrmDidPssFwGQZ6Ljuupugdr9h6ipMuhwgk3WRO+OlJ2TsyhKhJ6tp3AcJunuN4mprblhQ==",
"dev": true,
"requires": {
"@types/node": "^8.0.24",
- "electron-download": "^3.0.1",
+ "electron-download": "^4.1.0",
"extract-zip": "^1.0.3"
}
},
"electron-download": {
- "version": "3.3.0",
- "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-3.3.0.tgz",
- "integrity": "sha1-LP1U1pZsAZxNSa1l++Zcyc3vaMg=",
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/electron-download/-/electron-download-4.1.1.tgz",
+ "integrity": "sha512-FjEWG9Jb/ppK/2zToP+U5dds114fM1ZOJqMAR4aXXL5CvyPE9fiqBK/9YcwC9poIFQTEJk/EM/zyRwziziRZrg==",
"dev": true,
"requires": {
- "debug": "^2.2.0",
- "fs-extra": "^0.30.0",
- "home-path": "^1.0.1",
+ "debug": "^3.0.0",
+ "env-paths": "^1.0.0",
+ "fs-extra": "^4.0.1",
"minimist": "^1.2.0",
- "nugget": "^2.0.0",
- "path-exists": "^2.1.0",
- "rc": "^1.1.2",
- "semver": "^5.3.0",
- "sumchecker": "^1.2.0"
+ "nugget": "^2.0.1",
+ "path-exists": "^3.0.0",
+ "rc": "^1.2.1",
+ "semver": "^5.4.1",
+ "sumchecker": "^2.0.2"
},
"dependencies": {
- "path-exists": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
- "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+ "debug": {
+ "version": "3.2.6",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
"dev": true,
"requires": {
- "pinkie-promise": "^2.0.0"
+ "ms": "^2.1.1"
}
+ },
+ "ms": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+ "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+ "dev": true
}
}
},
@@ -972,9 +957,15 @@
"dev": true
},
"entities": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz",
- "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=",
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
+ "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
+ "dev": true
+ },
+ "env-paths": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-1.0.0.tgz",
+ "integrity": "sha1-QWgTO0K7BcOKNbGuQ5fIKYqzaeA=",
"dev": true
},
"error-ex": {
@@ -986,22 +977,16 @@
"is-arrayish": "^0.2.1"
}
},
- "es6-promise": {
- "version": "4.2.5",
- "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.5.tgz",
- "integrity": "sha512-n6wvpdE43VFtJq+lUDYDBFUwV8TZbuGXLV4D6wKafg13ldznKsyEvatubnmUe31zcvelSzOHF+XbaT+Bl9ObDg==",
- "dev": true
- },
"escape-string-regexp": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
"integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
"dev": true
},
"eslint": {
- "version": "5.8.0",
- "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.8.0.tgz",
- "integrity": "sha512-Zok6Bru3y2JprqTNm14mgQ15YQu/SMDkWdnmHfFg770DIUlmMFd/gqqzCHekxzjHZJxXv3tmTpH0C1icaYJsRQ==",
+ "version": "5.9.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.9.0.tgz",
+ "integrity": "sha512-g4KWpPdqN0nth+goDNICNXGfJF7nNnepthp46CAlJoJtC5K/cLu3NgCM3AHu1CkJ5Hzt9V0Y0PBAO6Ay/gGb+w==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.0.0",
@@ -1044,18 +1029,6 @@
"text-table": "^0.2.0"
},
"dependencies": {
- "ajv": {
- "version": "6.5.5",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.5.tgz",
- "integrity": "sha512-7q7gtRQDJSyuEHjuVgHoUa2VuemFiCMrfQc9Tc08XTAc4Zj/5U1buQJ0HU6i7fKjXU09SVgSmxa4sLvuvS8Iyg==",
- "dev": true,
- "requires": {
- "fast-deep-equal": "^2.0.1",
- "fast-json-stable-stringify": "^2.0.0",
- "json-schema-traverse": "^0.4.1",
- "uri-js": "^4.2.2"
- }
- },
"cross-spawn": {
"version": "6.0.5",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
@@ -1078,18 +1051,6 @@
"ms": "^2.1.1"
}
},
- "fast-deep-equal": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
- "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
- "dev": true
- },
- "json-schema-traverse": {
- "version": "0.4.1",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
- "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
- "dev": true
- },
"ms": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
@@ -1105,12 +1066,12 @@
"dev": true
},
"eslint-plugin-html": {
- "version": "4.0.6",
- "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-4.0.6.tgz",
- "integrity": "sha512-nj6A9oK+7BKnMm0E7dMRH3r75BfpkXtcVIb3pFC4AcDdBTNyg2NGxHXyFNT1emW4VsR7P2SZvRXXQtUR+kY08w==",
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-5.0.0.tgz",
+ "integrity": "sha512-f7p/7YQdgQUFVAX3nB4dnMQbrDeTalcA01PDhuvTLk0ZadCwM4Pb+639SRuqEf1zMkIxckLY+ckCr0hVP5zl6A==",
"dev": true,
"requires": {
- "htmlparser2": "^3.8.2"
+ "htmlparser2": "^3.10.0"
}
},
"eslint-scope": {
@@ -1278,7 +1239,7 @@
"is-extendable": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
- "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+ "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
"dev": true,
"requires": {
"is-plain-object": "^2.0.4"
@@ -1381,9 +1342,9 @@
"dev": true
},
"fast-deep-equal": {
- "version": "1.1.0",
- "resolved": "http://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
- "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+ "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
"dev": true
},
"fast-json-stable-stringify": {
@@ -1480,13 +1441,13 @@
}
},
"flat-cache": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.0.tgz",
- "integrity": "sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=",
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.2.tgz",
+ "integrity": "sha512-KByBY8c98sLUAGpnmjEdWTrtrLZRtZdwds+kAL/ciFXTCb7AZgqKsAnVnYFQj1hxepwO8JKN/8AsRWwLq+RK0A==",
"dev": true,
"requires": {
"circular-json": "^0.3.1",
- "del": "^2.0.2",
+ "del": "^3.0.0",
"graceful-fs": "^4.1.2",
"write": "^0.2.1"
}
@@ -1544,16 +1505,14 @@
}
},
"fs-extra": {
- "version": "0.30.0",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.30.0.tgz",
- "integrity": "sha1-8jP/zAjU2n1DLapEl3aYnbHfk/A=",
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
+ "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
"dev": true,
"requires": {
"graceful-fs": "^4.1.2",
- "jsonfile": "^2.1.0",
- "klaw": "^1.0.0",
- "path-is-absolute": "^1.0.0",
- "rimraf": "^2.2.8"
+ "jsonfile": "^4.0.0",
+ "universalify": "^0.1.0"
}
},
"fs.realpath": {
@@ -1640,19 +1599,18 @@
}
},
"globals": {
- "version": "11.8.0",
- "resolved": "https://registry.npmjs.org/globals/-/globals-11.8.0.tgz",
- "integrity": "sha512-io6LkyPVuzCHBSQV9fmOwxZkUk6nIaGmxheLDgmuFv89j0fm2aqDbIXKAGfzCMHqz3HLF2Zf8WSG6VqMh2qFmA==",
+ "version": "11.9.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-11.9.0.tgz",
+ "integrity": "sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg==",
"dev": true
},
"globby": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz",
- "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=",
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+ "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
"dev": true,
"requires": {
"array-union": "^1.0.1",
- "arrify": "^1.0.0",
"glob": "^7.0.3",
"object-assign": "^4.0.1",
"pify": "^2.0.0",
@@ -1661,21 +1619,23 @@
"dependencies": {
"pify": {
"version": "2.3.0",
- "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
"dev": true
}
}
},
"google-closure-compiler": {
- "version": "20180805.0.0",
- "resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20180805.0.0.tgz",
- "integrity": "sha512-MV9JTTQDO0tYOAaJmqd3MMIjCLxHkhZcj7hN6gUJdjQV7wYmH2wqwj56teIK22o9pSJvhKg89F/WCguaAZhSUA==",
+ "version": "20181028.0.1",
+ "resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20181028.0.1.tgz",
+ "integrity": "sha512-Gj+hNFJzxpNbnkZWRe+Gag2IeUfYSfl93qZ5TkRzXZAFznRhL1JpA/0v6nckly8QQDsEjVNMQOloOgfQP6Itkg==",
"dev": true,
"requires": {
"chalk": "^1.0.0",
- "google-closure-compiler-linux": "^20180805.0.0",
- "google-closure-compiler-osx": "^20180805.0.0",
+ "google-closure-compiler-java": "^20181028.0.0",
+ "google-closure-compiler-js": "^20181028.0.0",
+ "google-closure-compiler-linux": "^20181028.0.1",
+ "google-closure-compiler-osx": "^20181028.0.1",
"minimist": "^1.2.0",
"vinyl": "^2.0.1",
"vinyl-sourcemaps-apply": "^0.2.0"
@@ -1723,17 +1683,29 @@
}
}
},
+ "google-closure-compiler-java": {
+ "version": "20181028.0.0",
+ "resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20181028.0.0.tgz",
+ "integrity": "sha512-msRSt+BqBsFQlE3kwbQN+RDlW8bzbFrA+YWxXAN7jalm1RAYyFdU7KH30nYSmwmuKgYQYsBTnc7PFwdZNk003Q==",
+ "dev": true
+ },
+ "google-closure-compiler-js": {
+ "version": "20181028.0.0",
+ "resolved": "https://registry.npmjs.org/google-closure-compiler-js/-/google-closure-compiler-js-20181028.0.0.tgz",
+ "integrity": "sha512-yTF8uBR8TMf5SW76+1LU1ywvgeVyeNCQ+Jj3KJfMiIShoYhxPtVfLn99nx9r3uwIVNNyMxdQVc9zUFD2DEkTaA==",
+ "dev": true
+ },
"google-closure-compiler-linux": {
- "version": "20180805.0.0",
- "resolved": "https://registry.npmjs.org/google-closure-compiler-linux/-/google-closure-compiler-linux-20180805.0.0.tgz",
- "integrity": "sha512-Y53/dehGj5/HoAEnxoYFWLpLf8gHq8QaQSOw8ulnh6VkpHPdcAuhRqIVLcLeJ9rVW3xteOMQ2WFyRfFMayVZcA==",
+ "version": "20181028.0.1",
+ "resolved": "https://registry.npmjs.org/google-closure-compiler-linux/-/google-closure-compiler-linux-20181028.0.1.tgz",
+ "integrity": "sha512-yMfqIBkc9mg9D8wWTBJ/It+IY2NIMmwZDThYK6bfkcq3ZpeJI3GBfb3cA8GxOrHQgtopKysDwQQRrMq9UNscqw==",
"dev": true,
"optional": true
},
"google-closure-compiler-osx": {
- "version": "20180805.0.0",
- "resolved": "https://registry.npmjs.org/google-closure-compiler-osx/-/google-closure-compiler-osx-20180805.0.0.tgz",
- "integrity": "sha512-Zt558FPdkpcZulaT4uH7qNiO5wy3DT2Eaq+JPb4LjuS3KQSo8GSWx9caYWGZ1OdKULTv+v/flkHMtoHu5XP2bw==",
+ "version": "20181028.0.1",
+ "resolved": "https://registry.npmjs.org/google-closure-compiler-osx/-/google-closure-compiler-osx-20181028.0.1.tgz",
+ "integrity": "sha512-A3g1Ri5dNU1P6dGtY88/3xIAkMt5cQpIG4YqAwwBMTbG5fG7jRfExTetLaUsAaJwQQXG3TYWUELV3kSAMr/bAg==",
"dev": true,
"optional": true
},
@@ -1750,12 +1722,12 @@
"dev": true
},
"har-validator": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.0.tgz",
- "integrity": "sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==",
+ "version": "5.1.3",
+ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+ "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
"dev": true,
"requires": {
- "ajv": "^5.3.0",
+ "ajv": "^6.5.5",
"har-schema": "^2.0.0"
}
},
@@ -1820,12 +1792,6 @@
"integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
"dev": true
},
- "home-path": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/home-path/-/home-path-1.0.6.tgz",
- "integrity": "sha512-wo+yjrdAtoXt43Vy92a+0IPCYViiyLAHyp0QVS4xL/tfvVz5sXIW1ubLZk3nhVkD92fQpUMKX+fzMjr5F489vw==",
- "dev": true
- },
"homedir-polyfill": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz",
@@ -1842,38 +1808,28 @@
"dev": true
},
"htmlparser2": {
- "version": "3.9.2",
- "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz",
- "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=",
+ "version": "3.10.0",
+ "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.0.tgz",
+ "integrity": "sha512-J1nEUGv+MkXS0weHNWVKJJ+UrLfePxRWpN3C9bEi9fLxL2+ggW94DQvgYVXsaT30PGwYRIZKNZXuyMhp3Di4bQ==",
"dev": true,
"requires": {
"domelementtype": "^1.3.0",
"domhandler": "^2.3.0",
"domutils": "^1.5.1",
"entities": "^1.1.1",
"inherits": "^2.0.1",
- "readable-stream": "^2.0.2"
+ "readable-stream": "^3.0.6"
},
"dependencies": {
- "isarray": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
- "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
- "dev": true
- },
"readable-stream": {
- "version": "2.3.6",
- "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
- "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+ "version": "3.0.6",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.0.6.tgz",
+ "integrity": "sha512-9E1oLoOWfhSXHGv6QlwXJim7uNzd9EVlWK+21tCU9Ju/kR0/p2AZYPz4qSchgO8PlLIH4FpZYfzwS+rEksZjIg==",
"dev": true,
"requires": {
- "core-util-is": "~1.0.0",
- "inherits": "~2.0.3",
- "isarray": "~1.0.0",
- "process-nextick-args": "~2.0.0",
- "safe-buffer": "~5.1.1",
- "string_decoder": "~1.1.1",
- "util-deprecate": "~1.0.1"
+ "inherits": "^2.0.3",
+ "string_decoder": "^1.1.1",
+ "util-deprecate": "^1.0.1"
}
},
"string_decoder": {
@@ -2167,7 +2123,7 @@
"is-plain-object": {
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
- "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+ "integrity": "sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc=",
"dev": true,
"requires": {
"isobject": "^3.0.1"
@@ -2274,9 +2230,9 @@
"dev": true
},
"json-schema-traverse": {
- "version": "0.3.1",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
- "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
"dev": true
},
"json-stable-stringify-without-jsonify": {
@@ -2292,9 +2248,9 @@
"dev": true
},
"jsonfile": {
- "version": "2.4.0",
- "resolved": "http://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
- "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+ "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
"dev": true,
"requires": {
"graceful-fs": "^4.1.6"
@@ -2318,15 +2274,6 @@
"integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
"dev": true
},
- "klaw": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
- "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
- "dev": true,
- "requires": {
- "graceful-fs": "^4.1.9"
- }
- },
"lcid": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
@@ -2445,7 +2392,7 @@
"matcher-collection": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/matcher-collection/-/matcher-collection-1.0.5.tgz",
- "integrity": "sha512-nUCmzKipcJEwYsBVAFh5P+d7JBuhJaW1xs85Hara9xuMLqtCVUrW6DSC0JVIkluxEH2W45nPBM/wjHtBXa/tYA==",
+ "integrity": "sha1-LuCVQ4Nyy4iE8FgjQTjAXGROwzk=",
"dev": true,
"requires": {
"minimatch": "^3.0.2"
@@ -2558,7 +2505,7 @@
"mixin-deep": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz",
- "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==",
+ "integrity": "sha1-pJ5yaNzhoNlpjkUybFYm3zVD0P4=",
"dev": true,
"requires": {
"for-in": "^1.0.2",
@@ -2568,7 +2515,7 @@
"is-extendable": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
- "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+ "integrity": "sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ=",
"dev": true,
"requires": {
"is-plain-object": "^2.0.4"
@@ -2835,7 +2782,7 @@
},
"os-tmpdir": {
"version": "1.0.2",
- "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+ "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
"integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
"dev": true
},
@@ -2863,6 +2810,12 @@
"p-limit": "^2.0.0"
}
},
+ "p-map": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
+ "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
+ "dev": true
+ },
"p-try": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
@@ -2899,7 +2852,7 @@
},
"path-is-absolute": {
"version": "1.0.1",
- "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+ "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
"dev": true
},
@@ -2934,7 +2887,7 @@
"dependencies": {
"pify": {
"version": "2.3.0",
- "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
"integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
"dev": true
}
@@ -3173,7 +3126,7 @@
"regex-not": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
- "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+ "integrity": "sha1-H07OJ+ALC2XgJHpoEOaoXYOldSw=",
"dev": true,
"requires": {
"extend-shallow": "^3.0.2",
@@ -3261,7 +3214,7 @@
},
"require-uncached": {
"version": "1.0.3",
- "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
+ "resolved": "http://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz",
"integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=",
"dev": true,
"requires": {
@@ -3319,7 +3272,7 @@
"ret": {
"version": "0.1.15",
"resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
- "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+ "integrity": "sha1-uKSCXVvbH8P29Twrwz+BOIaBx7w=",
"dev": true
},
"rimraf": {
@@ -3332,9 +3285,9 @@
}
},
"rollup": {
- "version": "0.65.2",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.65.2.tgz",
- "integrity": "sha512-BbXOrpxVbx0MpElI6vVLR2B6vnWHvYU/QAMw3GcEXvs601bvgrozuaW30cnvt43B96a6DeoYA0i9T5THanN+Rw==",
+ "version": "0.67.1",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.67.1.tgz",
+ "integrity": "sha512-BfwL9pw5VyxrAWx/G1tP8epgG+NH4KcR78aoWacV7+dFp1Mj6ynH8QTIC/lDQ3KlwzDakqZmJQ4LQ7TmLg+pBA==",
"dev": true,
"requires": {
"@types/estree": "0.0.39",
@@ -3457,7 +3410,7 @@
"set-value": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
- "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+ "integrity": "sha1-ca5KiPD+77v1LR6mBPP7MV67YnQ=",
"dev": true,
"requires": {
"extend-shallow": "^2.0.1",
@@ -3535,7 +3488,7 @@
},
"strip-ansi": {
"version": "3.0.1",
- "resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"requires": {
@@ -3556,7 +3509,7 @@
"snapdragon": {
"version": "0.8.2",
"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
- "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+ "integrity": "sha1-ZJIufFZbDhQgS6GqfWlkJ40lGC0=",
"dev": true,
"requires": {
"base": "^0.11.1",
@@ -3592,7 +3545,7 @@
"snapdragon-node": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
- "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+ "integrity": "sha1-bBdfhv8UvbByRWPo88GwIaKGhTs=",
"dev": true,
"requires": {
"define-property": "^1.0.0",
@@ -3643,7 +3596,7 @@
"snapdragon-util": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
- "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+ "integrity": "sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI=",
"dev": true,
"requires": {
"kind-of": "^3.2.0"
@@ -3732,7 +3685,7 @@
"split-string": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
- "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+ "integrity": "sha1-fLCd2jqGWFcFxks5pkZgOGguj+I=",
"dev": true,
"requires": {
"extend-shallow": "^3.0.0"
@@ -3838,13 +3791,12 @@
"dev": true
},
"sumchecker": {
- "version": "1.3.1",
- "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-1.3.1.tgz",
- "integrity": "sha1-ebs7RFbdBPGOvbwNcDodHa7FEF0=",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-2.0.2.tgz",
+ "integrity": "sha1-D0LBDl0F2l1C7qPlbDOZo31sWz4=",
"dev": true,
"requires": {
- "debug": "^2.2.0",
- "es6-promise": "^4.0.5"
+ "debug": "^2.2.0"
}
},
"supports-color": {
@@ -3874,32 +3826,6 @@
"lodash": "^4.17.10",
"slice-ansi": "1.0.0",
"string-width": "^2.1.1"
- },
- "dependencies": {
- "ajv": {
- "version": "6.5.5",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.5.tgz",
- "integrity": "sha512-7q7gtRQDJSyuEHjuVgHoUa2VuemFiCMrfQc9Tc08XTAc4Zj/5U1buQJ0HU6i7fKjXU09SVgSmxa4sLvuvS8Iyg==",
- "dev": true,
- "requires": {
- "fast-deep-equal": "^2.0.1",
- "fast-json-stable-stringify": "^2.0.0",
- "json-schema-traverse": "^0.4.1",
- "uri-js": "^4.2.2"
- }
- },
- "fast-deep-equal": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
- "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
- "dev": true
- },
- "json-schema-traverse": {
- "version": "0.4.1",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
- "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
- "dev": true
- }
}
},
"text-table": {
@@ -3922,7 +3848,7 @@
},
"through2": {
"version": "0.2.3",
- "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
+ "resolved": "http://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
"integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
"dev": true,
"requires": {
@@ -3968,7 +3894,7 @@
"to-regex": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
- "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+ "integrity": "sha1-E8/dmzNlUvMLUfM6iuG0Knp1mc4=",
"dev": true,
"requires": {
"define-property": "^2.0.2",
@@ -4097,6 +4023,12 @@
}
}
},
+ "universalify": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
+ "dev": true
+ },
"unset-value": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", | true |
Other | mrdoob | three.js | dfdf633dfd643515fa4e299ef75dafe498be6efd.json | Upgrade dev dependencies | package.json | @@ -31,7 +31,7 @@
"scripts": {
"build": "rollup -c",
"build-test": "rollup -c test/rollup.unit.config.js",
- "build-closure": "rollup -c && java -jar node_modules/google-closure-compiler/compiler.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 node_modules/google-closure-compiler-java/compiler.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": "concurrently --names \"ROLLUP,HTTP\" -c \"bgBlue.bold,bgGreen.bold\" \"rollup -c -w -m inline\" \"http-server -c-1 -p 8080\"",
"dev-test": "concurrently --names \"ROLLUP,ROLLUPTEST,HTTP\" -c \"bgBlue.bold,bgRed.bold,bgGreen.bold\" \"rollup -c -w -m inline\" \"rollup -c test/rollup.unit.config.js -w -m inline\" \"http-server -p 8080\"",
"start": "npm run dev",
@@ -54,14 +54,14 @@
"homepage": "https://threejs.org/",
"devDependencies": {
"concurrently": "^4.0.1",
- "electron": "^2.0.13",
- "eslint": "^5.8.0",
+ "electron": "^3.0.8",
+ "eslint": "^5.9.0",
"eslint-config-mdcs": "^4.2.3",
- "eslint-plugin-html": "^4.0.6",
- "google-closure-compiler": "20180805.0.0",
+ "eslint-plugin-html": "^5.0.0",
+ "google-closure-compiler": "20181028.0.1",
"http-server": "^0.11.1",
"qunit": "^2.8.0",
- "rollup": "^0.65.2"
+ "rollup": "^0.67.1"
},
"jspm": {
"files": [ | true |
Other | mrdoob | three.js | 26978c4e198ae481fcab3c3b3a1cecc93988715b.json | compute the necessary inverse and reuse it | examples/js/controls/DragControls.js | @@ -20,6 +20,8 @@ THREE.DragControls = function ( _objects, _camera, _domElement ) {
var _offset = new THREE.Vector3();
var _intersection = new THREE.Vector3();
var _worldPosition = new THREE.Vector3();
+ var _inverseMatrix = new THREE.Matrix4();
+
var _selected = null, _hovered = null;
//
@@ -71,7 +73,7 @@ THREE.DragControls = function ( _objects, _camera, _domElement ) {
if ( _raycaster.ray.intersectPlane( _plane, _intersection ) ) {
- _selected.position.copy( _selected.parent.worldToLocal( _intersection.sub( _offset ) ) );
+ _selected.position.copy( _intersection.sub( _offset ).applyMatrix4( _inverseMatrix ) );
}
@@ -129,6 +131,7 @@ THREE.DragControls = function ( _objects, _camera, _domElement ) {
if ( _raycaster.ray.intersectPlane( _plane, _intersection ) ) {
+ _inverseMatrix.getInverse( _selected.parent.matrixWorld );
_offset.copy( _intersection ).sub( _worldPosition.setFromMatrixPosition( _selected.matrixWorld ) );
}
@@ -174,7 +177,7 @@ THREE.DragControls = function ( _objects, _camera, _domElement ) {
if ( _raycaster.ray.intersectPlane( _plane, _intersection ) ) {
- _selected.position.copy( _selected.parent.worldToLocal( _intersection.sub( _offset ) ) );
+ _selected.position.copy( _intersection.sub( _offset ).applyMatrix4( _inverseMatrix ) );
}
@@ -208,6 +211,7 @@ THREE.DragControls = function ( _objects, _camera, _domElement ) {
if ( _raycaster.ray.intersectPlane( _plane, _intersection ) ) {
+ _inverseMatrix.getInverse( _selected.parent.matrixWorld );
_offset.copy( _intersection ).sub( _worldPosition.setFromMatrixPosition( _selected.matrixWorld ) );
} | false |
Other | mrdoob | three.js | 779784c74c7423e79e4e339d98af42cc3715a746.json | Adjust logic as suggested by WestLangley. | src/geometries/ExtrudeGeometry.js | @@ -392,13 +392,8 @@ function ExtrudeBufferGeometry( shapes, options ) {
t = b / bevelSegments;
z = bevelThickness * Math.cos( t * Math.PI / 2 );
- bs = Math.abs( bevelSize ) * Math.sin( t * Math.PI / 2 );
-
- if ( bevelSize < 0 ) {
-
- bs += bevelSize;
-
- }
+ var s = Math.sin( t * Math.PI / 2 );
+ bs = ( bevelSize > 0 ) ? bevelSize * s : bevelSize * ( 1 - s );
// contract shape
@@ -429,7 +424,10 @@ function ExtrudeBufferGeometry( shapes, options ) {
}
- bs = ( bevelSize < 0 ? 0 : bevelSize );
+ // Special case of
+ // bs = ( bevelSize > 0 ) ? bevelSize * s : bevelSize * ( 1 - s );
+ // with s = 1
+ bs = ( bevelSize > 0 ? bevelSize : 0 );
// Back facing vertices
@@ -496,13 +494,8 @@ function ExtrudeBufferGeometry( shapes, options ) {
t = b / bevelSegments;
z = bevelThickness * Math.cos( t * Math.PI / 2 );
- bs = Math.abs( bevelSize ) * Math.sin( t * Math.PI / 2 );
-
- if ( bevelSize < 0 ) {
-
- bs += bevelSize;
-
- }
+ var s = Math.sin( t * Math.PI / 2 );
+ bs = ( bevelSize > 0 ) ? bevelSize * s : bevelSize * ( 1 - s );
// contract shape
| false |
Other | mrdoob | three.js | 08174e30235eb3b0e96166a5573418debec98c32.json | Remove local variable bevelSubtract. | src/geometries/ExtrudeGeometry.js | @@ -110,14 +110,6 @@ function ExtrudeBufferGeometry( shapes, options ) {
var bevelThickness = options.bevelThickness !== undefined ? options.bevelThickness : 6;
var bevelSize = options.bevelSize !== undefined ? options.bevelSize : bevelThickness - 2;
var bevelSegments = options.bevelSegments !== undefined ? options.bevelSegments : 3;
- var bevelSubtract = false;
-
- if ( bevelSize < 0 ) {
-
- bevelSize = - bevelSize;
- bevelSubtract = true;
-
- }
var extrudePath = options.extrudePath;
@@ -400,11 +392,11 @@ function ExtrudeBufferGeometry( shapes, options ) {
t = b / bevelSegments;
z = bevelThickness * Math.cos( t * Math.PI / 2 );
- bs = bevelSize * Math.sin( t * Math.PI / 2 );
+ bs = Math.abs( bevelSize ) * Math.sin( t * Math.PI / 2 );
- if ( bevelSubtract ) {
+ if ( bevelSize < 0 ) {
- bs -= bevelSize;
+ bs += bevelSize;
}
@@ -437,7 +429,7 @@ function ExtrudeBufferGeometry( shapes, options ) {
}
- bs = ( bevelSubtract ? 0 : bevelSize );
+ bs = ( bevelSize < 0 ? 0 : - bevelSize );
// Back facing vertices
@@ -504,11 +496,11 @@ function ExtrudeBufferGeometry( shapes, options ) {
t = b / bevelSegments;
z = bevelThickness * Math.cos( t * Math.PI / 2 );
- bs = bevelSize * Math.sin( t * Math.PI / 2 );
+ bs = Math.abs( bevelSize ) * Math.sin( t * Math.PI / 2 );
- if ( bevelSubtract ) {
+ if ( bevelSize < 0 ) {
- bs -= bevelSize;
+ bs += bevelSize;
}
| false |
Other | mrdoob | three.js | 356453504da0890af808f79092af5b2d63424395.json | Fix jpeg check in TextureLoader | src/loaders/TextureLoader.js | @@ -31,7 +31,7 @@ Object.assign( TextureLoader.prototype, {
texture.image = image;
// JPEGs can't have an alpha channel, so memory can be saved by storing them as RGB.
- var isJPEG = url.search( /\.jpe?g$/i ) > 0 || url.search( /^data\:image\/jpeg/ ) === 0;
+ var isJPEG = url.search( /\.jpe?g($|\?)/i ) > 0 || url.search( /^data\:image\/jpeg/ ) === 0;
texture.format = isJPEG ? RGBFormat : RGBAFormat;
texture.needsUpdate = true; | false |
Other | mrdoob | three.js | 44d9c06f305d8f85ce7851c14b7473a015f5ff60.json | fix more eslint requirements | src/loaders/ObjectLoader.js | @@ -471,7 +471,7 @@ Object.assign( ObjectLoader.prototype, {
var array = [];
for ( var j = 0; j < data.materials.length; j ++ ) {
- if (cache[ data.materials[ j ].uuid ]) {
+ if ( cache[ data.materials[ j ].uuid ] ) {
array.push( cache[ data.materials[ j ].uuid ] );
| false |
Other | mrdoob | three.js | 6f47a254cd586ca65a6b4b05659f57f5a618ac32.json | fix eslint requirements | src/loaders/ObjectLoader.js | @@ -470,12 +470,17 @@ Object.assign( ObjectLoader.prototype, {
// Deprecated
var array = [];
for ( var j = 0; j < data.materials.length; j ++ ) {
- if (cache[data.materials[ j ].uuid]) {
- array.push( cache[data.materials[ j ].uuid] );
+
+ if (cache[ data.materials[ j ].uuid ]) {
+
+ array.push( cache[ data.materials[ j ].uuid ] );
+
} else {
+
var mat = loader.parse( data.materials[ j ] );
cache[ data.materials[ j ].uuid ] = mat;
array.push( mat );
+
}
} | false |
Other | mrdoob | three.js | f35784d8b7e647f7b11ca745f87c0187d39c98dc.json | Improve error handling for LoadingManager | examples/js/loaders/GLTFLoader.js | @@ -58,8 +58,8 @@ THREE.GLTFLoader = ( function () {
}
- scope.manager.itemEnd( url );
scope.manager.itemError( url );
+ scope.manager.itemEnd( url );
};
| true |
Other | mrdoob | three.js | f35784d8b7e647f7b11ca745f87c0187d39c98dc.json | Improve error handling for LoadingManager | src/loaders/FileLoader.js | @@ -141,8 +141,8 @@ Object.assign( FileLoader.prototype, {
if ( onError ) onError( error );
- scope.manager.itemEnd( url );
scope.manager.itemError( url );
+ scope.manager.itemEnd( url );
}, 0 );
@@ -201,8 +201,8 @@ Object.assign( FileLoader.prototype, {
}
- scope.manager.itemEnd( url );
scope.manager.itemError( url );
+ scope.manager.itemEnd( url );
}
@@ -234,8 +234,8 @@ Object.assign( FileLoader.prototype, {
}
- scope.manager.itemEnd( url );
scope.manager.itemError( url );
+ scope.manager.itemEnd( url );
}, false );
@@ -252,8 +252,8 @@ Object.assign( FileLoader.prototype, {
}
- scope.manager.itemEnd( url );
scope.manager.itemError( url );
+ scope.manager.itemEnd( url );
}, false );
| true |
Other | mrdoob | three.js | f35784d8b7e647f7b11ca745f87c0187d39c98dc.json | Improve error handling for LoadingManager | src/loaders/ImageBitmapLoader.js | @@ -85,8 +85,8 @@ ImageBitmapLoader.prototype = {
if ( onError ) onError( e );
- scope.manager.itemEnd( url );
scope.manager.itemError( url );
+ scope.manager.itemEnd( url );
} );
| true |
Other | mrdoob | three.js | f35784d8b7e647f7b11ca745f87c0187d39c98dc.json | Improve error handling for LoadingManager | src/loaders/ImageLoader.js | @@ -66,8 +66,8 @@ Object.assign( ImageLoader.prototype, {
if ( onError ) onError( event );
- scope.manager.itemEnd( url );
scope.manager.itemError( url );
+ scope.manager.itemEnd( url );
}
| true |
Other | mrdoob | three.js | f35784d8b7e647f7b11ca745f87c0187d39c98dc.json | Improve error handling for LoadingManager | src/loaders/ObjectLoader.js | @@ -527,8 +527,8 @@ Object.assign( ObjectLoader.prototype, {
}, undefined, function () {
- scope.manager.itemEnd( url );
scope.manager.itemError( url );
+ scope.manager.itemEnd( url );
} );
| true |
Other | mrdoob | three.js | b4416217c4b33e8e557f321aa79a769e117deb2a.json | Delete some old line in list.js. | docs/list.js | @@ -385,7 +385,6 @@ var list = {
"Plugins": {
"LookupTable": "examples/Lut",
- "SpriteCanvasMaterial": "examples/SpriteCanvasMaterial"
},
"QuickHull": {
@@ -397,7 +396,7 @@ var list = {
},
"Renderers": {
- "CSS2DRenderer": "examples/renderers/CSS2DRenderer",
+ "CSS2DRenderer": "examples/renderers/CSS2DRenderer",
"CSS3DRenderer": "examples/renderers/CSS3DRenderer",
"SVGRenderer": "examples/renderers/SVGRenderer"
@@ -811,7 +810,6 @@ var list = {
"插件": {
"LookupTable": "examples/Lut",
- "SpriteCanvasMaterial": "examples/SpriteCanvasMaterial"
},
"QuickHull": {
@@ -823,7 +821,7 @@ var list = {
},
"渲染器": {
- "CSS2DRenderer": "examples/renderers/CSS2DRenderer",
+ "CSS2DRenderer": "examples/renderers/CSS2DRenderer",
"CSS3DRenderer": "examples/renderers/CSS3DRenderer",
"SVGRenderer": "examples/renderers/SVGRenderer"
| false |
Other | mrdoob | three.js | f972e7e4a8d69d6e9e02b8081d64cef3976953f1.json | Translate the How-to-use-WebGL2.html into zh. | docs/manual/zh/introduction/How-to-use-WebGL2.html | @@ -10,28 +10,27 @@
</head>
<body>
- <h1>[name]</h1>
+ <h1>如何使用WebGL 2（[name]）</h1>
<br />
<p>
- Starting with three.js R95, the engine supports rendering with a WebGL 2 context. By default three.js always uses a
- WebGL 1 context when creating an instance of *WebGLRenderer*. If you want use a WebGL 2 context, please have a look
- at the following workflow.
+ 从R95版本起，three.js便开始支持使用WebGL 2环境来进行渲染。默认情况下，当创建一个*WebGLRenderer*实例时，
+ three.js总是使用WebGL 1环境。如果你希望来使用WebGL 2环境，请参阅以下的工作流程。
</p>
- <h2>Workflow</h2>
+ <h2>工作流程</h2>
<p>
- Since WebGL 2 is not supported by all devices that support WebGL 1, it's important to check the respective availability.
- To do so, please include [link:https://github.com/mrdoob/three.js/blob/master/examples/js/WebGL.js WebGL.js] into your project.
+ 由于WebGL 2并不被所有支持WebGL 1的设备所支持，因此检查各种设备上WebGL 2的可用性是非常重要的。
+ 要对其可用性进行检查，请将[link:https://github.com/mrdoob/three.js/blob/master/examples/js/WebGL.js WebGL.js]包含到你的项目中。
</p>
<code>
<script src="/path/to/WebGL.js"></script>
</code>
<p>
- Next, use a code similar to the following in order to perform the availability check.
+ 接下来，使用和下列代码相似的代码来进行可用性检查。
</p>
<code>
@@ -44,9 +43,8 @@ <h2>Workflow</h2>
</code>
<p>
- Now it's time to create the renderer by applying the HTML5 canvas element and the respective WebGL 2 context
- to the constructor of *WebGLRenderer*. As a result, three.js will internally use the given context for rendering and
- automatically convert the built-in material's shader code to GLSL ES 3.00.
+ 现在，你就可以将由*WebGLRenderer*所构造的renderer，应用到HTML5 Canvas元素和对应的WebGL 2绘图环境上了。
+ 最终，three.js将在内部使用所给定的绘图环境来渲染，并自动将内置的材质的着色器代码转化为GLSL ES 3.00。
</p>
<code>
@@ -56,8 +54,8 @@ <h2>Workflow</h2>
</code>
<p>
- Sometimes it is necessary to write custom shader code. Use the following code template as a basis for your own
- implementation. First, the GLSL ES 3.00 code.
+ 有时候，写一些自定义着色器也是非常必要的。请使用下列的代码模板作为你自己来进行实现的基础。
+ 首先是GLSL ES 3.00代码。
</p>
<code>
@@ -85,7 +83,7 @@ <h2>Workflow</h2>
</script>
</code>
<p>
- Second, the corresponding material creation in JavaScript.
+ 然后是使用JavaScript来创建的对应的材质。
</p>
<code>
var material = new THREE.ShaderMaterial( {
@@ -94,20 +92,20 @@ <h2>Workflow</h2>
} );
</code>
- <h2>Next Steps</h2>
+ <h2>接下来</h2>
<p>
- Have a look at one of the official examples in order to see WebGL 2 features in action.<br /><br />
+ 请参阅官方示例，来看一看WebGL 2各种特性的运行。<br /><br />
[example:webgl2_materials_texture3d WebGL2 / materials / texture3d]<br />
[example:webgl2_materials_texture3d_volume WebGL2 / materials / texture3d / volume]<br />
</p>
- <h2>Supported features</h2>
+ <h2>支持的特性</h2>
<p>
- Right now, the engine does only support a subset of all existing WebGL 2 features. The following list provides an
- overview about what's already available in the latest version of three.js.
+ 当前，three.js引擎仅支持所有现有的WebGL 2特性的一个子集。
+ 下列列表展现了在最新版本three.js中，已可用的特性的概览。
<ul>
<li>3D Textures</li>
</ul> | false |
Other | mrdoob | three.js | e1cd7374b0ef70bd930eb36cec115a4ba310de58.json | Update Texture docs. | docs/api/en/textures/Texture.html | @@ -250,7 +250,7 @@ <h3>[method:null dispose]()</h3>
Call [page:EventDispatcher EventDispatcher].dispatchEvent with a 'dispose' event type.
</p>
- <h3>[method:null transformUv]( [param:Vector2 uv] )</h3>
+ <h3>[method:Vector2 transformUv]( [param:Vector2 uv] )</h3>
<p>
Transform the uv based on the value of this texture's [page:Texture.offset .offset], [page:Texture.repeat .repeat],
[page:Texture.wrapS .wrapS], [page:Texture.wrapT .wrapT] and [page:Texture.flipY .flipY] properties. | false |
Other | mrdoob | three.js | 1e7530bb71b5f1e5f1cd21aa9ae442d4a06ddc3a.json | Load all assets before adding object to scene | examples/webgl_loader_obj.html | @@ -44,6 +44,7 @@
var windowHalfX = window.innerWidth / 2;
var windowHalfY = window.innerHeight / 2;
+ var object;
init();
animate();
@@ -68,45 +69,62 @@
camera.add( pointLight );
scene.add( camera );
- // texture
+ // manager
+
+ var loadModel = function () {
+
+ object.traverse( function ( child ) {
+
+ if ( child instanceof THREE.Mesh ) {
+
+ child.material.map = texture;
+
+ }
+
+ } );
+
+ object.position.y = - 95;
+ scene.add( object );
+
+ console.log( `added object to scene` );
+
+ };
+
+ var manager = new THREE.LoadingManager( loadModel );
- var manager = new THREE.LoadingManager();
manager.onProgress = function ( item, loaded, total ) {
console.log( item, loaded, total );
};
+ // texture
+
var textureLoader = new THREE.TextureLoader( manager );
+
var texture = textureLoader.load( 'textures/UV_Grid_Sm.jpg' );
// model
var onProgress = function ( xhr ) {
+
if ( xhr.lengthComputable ) {
+
var percentComplete = xhr.loaded / xhr.total * 100;
- console.log( Math.round(percentComplete, 2) + '% downloaded' );
+ console.log( 'model ' + Math.round( percentComplete, 2 ) + '% downloaded' );
+
}
+
};
var onError = function ( xhr ) {
};
var loader = new THREE.OBJLoader( manager );
- loader.load( 'models/obj/male02/male02.obj', function ( object ) {
-
- object.traverse( function ( child ) {
- if ( child instanceof THREE.Mesh ) {
-
- child.material.map = texture;
-
- }
+ loader.load( 'models/obj/male02/male02.obj', function ( obj ) {
- } );
-
- object.position.y = - 95;
- scene.add( object );
+ object = obj;
}, onProgress, onError );
| false |
Other | mrdoob | three.js | 1060268ab4aa160caeff81587ec0e703c50ddf67.json | Remove dependency on packing shader chunk | examples/js/shaders/BokehShader2.js | @@ -65,7 +65,6 @@ THREE.BokehShader = {
fragmentShader: [
"#include <common>",
- "#include <packing>",
"varying vec2 vUv;",
| true |
Other | mrdoob | three.js | 1060268ab4aa160caeff81587ec0e703c50ddf67.json | Remove dependency on packing shader chunk | examples/webgl_postprocessing_procedural.html | @@ -40,8 +40,7 @@
}
</script>
<script id="noiseRandom1D-frag" type="x-shader/x-fragment">
- #include <common>
- #include <packing>
+ #include <common>
varying vec2 vUv;
@@ -52,7 +51,6 @@
</script>
<script id="noiseRandom2D-frag" type="x-shader/x-fragment">
#include <common>
- #include <packing>
varying vec2 vUv;
@@ -64,7 +62,6 @@
</script>
<script id="noiseRandom3D-frag" type="x-shader/x-fragment">
#include <common>
- #include <packing>
varying vec2 vUv;
| true |
Other | mrdoob | three.js | 1060268ab4aa160caeff81587ec0e703c50ddf67.json | Remove dependency on packing shader chunk | src/renderers/shaders/ShaderLib/points_frag.glsl | @@ -2,7 +2,6 @@ uniform vec3 diffuse;
uniform float opacity;
#include <common>
-#include <packing>
#include <color_pars_fragment>
#include <map_particle_pars_fragment>
#include <fog_pars_fragment> | true |
Other | mrdoob | three.js | 1060268ab4aa160caeff81587ec0e703c50ddf67.json | Remove dependency on packing shader chunk | src/renderers/shaders/ShaderLib/sprite_frag.glsl | @@ -2,7 +2,6 @@ uniform vec3 diffuse;
uniform float opacity;
#include <common>
-#include <packing>
#include <uv_pars_fragment>
#include <map_pars_fragment>
#include <fog_pars_fragment> | true |
Other | mrdoob | three.js | 77de73cac8dcd14812f2bb90bfc48fa17ae3c189.json | Add tonemapping and encoding support | src/renderers/shaders/ShaderLib/sprite_frag.glsl | @@ -11,10 +11,11 @@ uniform float opacity;
void main() {
+ #include <clipping_planes_fragment>
+
vec3 outgoingLight = vec3( 0.0 );
vec4 diffuseColor = vec4( diffuse, opacity );
- #include <clipping_planes_fragment>
#include <logdepthbuf_fragment>
#include <map_fragment>
#include <alphatest_fragment>
@@ -23,6 +24,8 @@ void main() {
gl_FragColor = vec4( outgoingLight, diffuseColor.a );
+ #include <tonemapping_fragment>
+ #include <encodings_fragment>
#include <fog_fragment>
} | false |
Other | mrdoob | three.js | 5c7f0349989de9cdae092dc38cc31bc5b33b3714.json | fix mip levels | examples/js/nodes/bsdfs/RoughnessToBlinnExponentNode.js | @@ -27,10 +27,11 @@ RoughnessToBlinnExponentNode.Nodes = (function() {
// float envMapWidth = pow( 2.0, maxMIPLevelScalar );
// float desiredMIPLevel = log2( envMapWidth * sqrt( 3.0 ) ) - 0.5 * log2( pow2( blinnShininessExponent ) + 1.0 );
- " float desiredMIPLevel = maxMIPLevelScalar - 0.79248 - 0.5 * log2( pow2( blinnShininessExponent ) + 1.0 );",
+ " float desiredMIPLevel = maxMIPLevelScalar + 0.79248 - 0.5 * log2( pow2( blinnShininessExponent ) + 1.0 );",
// clamp to allowable LOD ranges.
" return clamp( desiredMIPLevel, 0.0, maxMIPLevelScalar );",
+
"}"
].join( "\n" ) );
| true |
Other | mrdoob | three.js | 5c7f0349989de9cdae092dc38cc31bc5b33b3714.json | fix mip levels | examples/js/nodes/utils/MaxMIPLevelNode.js | @@ -28,7 +28,7 @@ Object.defineProperties( MaxMIPLevelNode.prototype, {
var image = this.texture.value.image ? this.texture.value.image[0] : undefined;
- this.maxMIPLevel = image !== undefined ? ( Math.log( Math.max( image.width, image.height ) ) + 1 ) * Math.LOG2E : 0;
+ this.maxMIPLevel = image !== undefined ? Math.log( Math.max( image.width, image.height ) ) * Math.LOG2E : 0;
}
| true |
Other | mrdoob | three.js | ecf087a8ca65c9d91ab019a7233e4280d19aae92.json | Remove unnecessary debug line | examples/js/loaders/SVGLoader.js | @@ -771,8 +771,6 @@ THREE.SVGLoader.prototype = {
var scaleY = getTransformScaleY( currentTransform );
var subpath = new THREE.Path();
-
- console.warn( "AMEM: " + scaleX + ", " + scaleY );
if ( Math.abs( scaleX - scaleY ) > 0.00000001 ) {
| false |
Other | mrdoob | three.js | 848a6e201db1621e2ee0f3118a52a3264273cd8b.json | Optimize trig functions | examples/js/loaders/SVGLoader.js | @@ -1101,10 +1101,13 @@ THREE.SVGLoader.prototype = {
var rotation = createIdTransform();
- rotation[ 0 ] = Math.cos( angle );
- rotation[ 1 ] = Math.sin( angle );
- rotation[ 2 ] = -Math.sin( angle );
- rotation[ 3 ] = Math.cos( angle );
+ var c = Math.cos( angle );
+ var s = Math.sin( angle );
+
+ rotation[ 0 ] = c;
+ rotation[ 1 ] = s;
+ rotation[ 2 ] = - s;
+ rotation[ 3 ] = c;
return rotation;
| false |
Other | mrdoob | three.js | dbb81cd0b6cf2a03a25de04a9bc4004352b41704.json | fix node examples | examples/js/nodes/THREE.Nodes.js | @@ -92,7 +92,7 @@ import {
StandardNode,
MeshStandardNode,
- // utils
+ // materials
NodeMaterial,
SpriteNodeMaterial,
@@ -200,4 +200,4 @@ THREE.NodeMaterial = NodeMaterial;
THREE.SpriteNodeMaterial = SpriteNodeMaterial;
THREE.PhongNodeMaterial = PhongNodeMaterial;
THREE.StandardNodeMaterial = StandardNodeMaterial;
-THREE.MeshStandardNodeMaterial = MeshStandardNodeMaterial;
\ No newline at end of file
+THREE.MeshStandardNodeMaterial = MeshStandardNodeMaterial; | true |
Other | mrdoob | three.js | dbb81cd0b6cf2a03a25de04a9bc4004352b41704.json | fix node examples | examples/js/nodes/accessors/ColorsNode.js | @@ -21,7 +21,7 @@ ColorsNode.prototype.constructor = ColorsNode;
ColorsNode.prototype.generate = function ( builder, output ) {
- builder.material.requires.color[ this.index ] = true;
+ builder.requires.color[ this.index ] = true;
var result = builder.isShader( 'vertex' ) ? vertexDict[ this.index ] : fragmentDict[ this.index ];
| true |
Other | mrdoob | three.js | dbb81cd0b6cf2a03a25de04a9bc4004352b41704.json | fix node examples | examples/js/nodes/materials/NodeMaterial.js | @@ -3,11 +3,6 @@
*/
import { NodeBuilder } from '../core/NodeBuilder.js';
-import { NodeUniform } from '../core/NodeUniform.js';
-import { NodeLib } from '../core/NodeLib.js';
-import { FunctionNode } from '../core/FunctionNode.js';
-import { ConstNode } from '../core/ConstNode.js';
-import { StructNode } from '../core/StructNode.js';
import { ColorNode } from '../inputs/ColorNode.js';
import { PositionNode } from '../accessors/PositionNode.js';
import { RawNode } from './nodes/RawNode.js'; | true |
Other | mrdoob | three.js | dbb81cd0b6cf2a03a25de04a9bc4004352b41704.json | fix node examples | examples/js/nodes/materials/nodes/SpriteNode.js | @@ -20,23 +20,22 @@ SpriteNode.prototype.nodeType = "Sprite";
SpriteNode.prototype.build = function ( builder ) {
- var material = builder.material;
var output, code;
- material.define( 'SPRITE' );
+ builder.define( 'SPRITE' );
- material.requires.lights = false;
- material.requires.transparent = this.alpha != undefined;
+ builder.requires.lights = false;
+ builder.requires.transparent = this.alpha != undefined;
if ( builder.isShader( 'vertex' ) ) {
var transform = this.transform ? this.transform.parseAndBuildCode( builder, 'v3', { cache: 'transform' } ) : undefined;
- material.mergeUniform( THREE.UniformsUtils.merge( [
+ builder.mergeUniform( THREE.UniformsUtils.merge( [
THREE.UniformsLib[ "fog" ]
] ) );
- material.addVertexPars( [
+ builder.addParsCode( [
"#include <fog_pars_vertex>"
].join( "\n" ) );
@@ -105,13 +104,14 @@ SpriteNode.prototype.build = function ( builder ) {
} else {
- material.addFragmentPars( [
+ builder.addParsCode( [
"#include <fog_pars_fragment>",
].join( "\n" ) );
// parse all nodes to reuse generate codes
this.color.parse( builder, { slot: 'color' } );
+
if ( this.alpha ) this.alpha.parse( builder );
// build code | true |
Other | mrdoob | three.js | dbb81cd0b6cf2a03a25de04a9bc4004352b41704.json | fix node examples | examples/js/nodes/materials/nodes/StandardNode.js | @@ -43,7 +43,7 @@ StandardNode.prototype.build = function ( builder ) {
] ) );
- builder.addVertexParsCode( [
+ builder.addParsCode( [
"varying vec3 vViewPosition;",
"#ifndef FLAT_SHADED",
@@ -170,9 +170,9 @@ StandardNode.prototype.build = function ( builder ) {
var clearCoatEnv = useClearCoat && environment ? this.environment.buildCode( builder, 'c', { cache: 'clearCoat', context: contextEnvironment, slot: 'environment' } ) : undefined;
- builder.requires.transparent = alpha != undefined;
+ builder.requires.transparent = alpha !== undefined;
- builder.addFragmentParsCode( [
+ builder.addParsCode( [
"varying vec3 vViewPosition;",
| true |
Other | mrdoob | three.js | dbb81cd0b6cf2a03a25de04a9bc4004352b41704.json | fix node examples | examples/js/nodes/postprocessing/NodePass.js | @@ -2,6 +2,7 @@
* @author sunag / http://www.sunag.com.br/
*/
+import { NodeUtils } from '../core/NodeUtils.js';
import { NodeMaterial } from '../materials/NodeMaterial.js';
import { RawNode } from '../materials/nodes/RawNode.js';
import { ScreenNode } from '../inputs/ScreenNode.js';
@@ -29,7 +30,7 @@ function NodePass() {
NodePass.prototype = Object.create( THREE.ShaderPass.prototype );
NodePass.prototype.constructor = NodePass;
-NodeMaterial.addShortcuts( NodePass.prototype, 'fragment', [ 'value' ] );
+NodeUtils.addShortcuts( NodePass.prototype, 'fragment', [ 'value' ] );
NodePass.prototype.render = function () {
| true |
Other | mrdoob | three.js | dbb81cd0b6cf2a03a25de04a9bc4004352b41704.json | fix node examples | examples/webgl_loader_nodes.html | @@ -40,75 +40,10 @@
<script src="js/controls/OrbitControls.js"></script>
<script src="js/libs/dat.gui.min.js"></script>
- <!-- NodeLibrary -->
- <script src="js/nodes/GLNode.js"></script>
- <script src="js/nodes/RawNode.js"></script>
- <script src="js/nodes/TempNode.js"></script>
- <script src="js/nodes/InputNode.js"></script>
- <script src="js/nodes/ConstNode.js"></script>
- <script src="js/nodes/VarNode.js"></script>
- <script src="js/nodes/FunctionNode.js"></script>
- <script src="js/nodes/FunctionCallNode.js"></script>
- <script src="js/nodes/AttributeNode.js"></script>
- <script src="js/nodes/NodeUniform.js"></script>
- <script src="js/nodes/NodeBuilder.js"></script>
- <script src="js/nodes/NodeLib.js"></script>
- <script src="js/nodes/NodeFrame.js"></script>
- <script src="js/nodes/NodeMaterial.js"></script>
-
- <!-- Accessors -->
- <script src="js/nodes/accessors/PositionNode.js"></script>
- <script src="js/nodes/accessors/NormalNode.js"></script>
- <script src="js/nodes/accessors/UVNode.js"></script>
- <script src="js/nodes/accessors/ScreenUVNode.js"></script>
- <script src="js/nodes/accessors/ColorsNode.js"></script>
- <script src="js/nodes/accessors/CameraNode.js"></script>
- <script src="js/nodes/accessors/ReflectNode.js"></script>
- <script src="js/nodes/accessors/LightNode.js"></script>
-
- <!-- Inputs -->
- <script src="js/nodes/inputs/IntNode.js"></script>
- <script src="js/nodes/inputs/FloatNode.js"></script>
- <script src="js/nodes/inputs/ColorNode.js"></script>
- <script src="js/nodes/inputs/Vector2Node.js"></script>
- <script src="js/nodes/inputs/Vector3Node.js"></script>
- <script src="js/nodes/inputs/Vector4Node.js"></script>
- <script src="js/nodes/inputs/TextureNode.js"></script>
- <script src="js/nodes/inputs/Matrix4Node.js"></script>
- <script src="js/nodes/inputs/CubeTextureNode.js"></script>
-
- <!-- Math -->
- <script src="js/nodes/math/Math1Node.js"></script>
- <script src="js/nodes/math/Math2Node.js"></script>
- <script src="js/nodes/math/Math3Node.js"></script>
- <script src="js/nodes/math/OperatorNode.js"></script>
-
- <!-- Utils -->
- <script src="js/nodes/utils/SwitchNode.js"></script>
- <script src="js/nodes/utils/JoinNode.js"></script>
- <script src="js/nodes/utils/TimerNode.js"></script>
- <script src="js/nodes/utils/RoughnessToBlinnExponentNode.js"></script>
- <script src="js/nodes/utils/VelocityNode.js"></script>
- <script src="js/nodes/utils/LuminanceNode.js"></script>
- <script src="js/nodes/utils/ColorAdjustmentNode.js"></script>
- <script src="js/nodes/utils/NoiseNode.js"></script>
- <script src="js/nodes/utils/ResolutionNode.js"></script>
- <script src="js/nodes/utils/BumpNode.js"></script>
- <script src="js/nodes/utils/BlurNode.js"></script>
- <script src="js/nodes/utils/UVTransformNode.js"></script>
-
- <!-- Phong Material -->
- <script src="js/nodes/materials/PhongNode.js"></script>
- <script src="js/nodes/materials/PhongNodeMaterial.js"></script>
-
- <!-- Standard Material -->
- <script src="js/nodes/materials/StandardNode.js"></script>
- <script src="js/nodes/materials/StandardNodeMaterial.js"></script>
-
- <!-- NodeMaterial Loader -->
- <script src="js/loaders/NodeMaterialLoader.js"></script>
-
- <script>
+ <script type="module">
+
+ import './js/nodes/THREE.Nodes.js';
+ import './js/loaders/NodeMaterialLoader.js';
var container = document.getElementById( 'container' );
| true |
Other | mrdoob | three.js | dbb81cd0b6cf2a03a25de04a9bc4004352b41704.json | fix node examples | examples/webgl_materials_nodes.html | @@ -43,7 +43,8 @@
<script type="module">
import './js/nodes/THREE.Nodes.js';
-
+ import './js/loaders/NodeMaterialLoader.js';
+
var container = document.getElementById( 'container' );
var renderer, scene, camera, clock = new THREE.Clock(), fov = 50; | true |
Other | mrdoob | three.js | dbb81cd0b6cf2a03a25de04a9bc4004352b41704.json | fix node examples | examples/webgl_mirror_nodes.html | @@ -40,68 +40,10 @@
<script src="js/objects/ReflectorRTT.js"></script>
<script src="js/controls/OrbitControls.js"></script>
- <!-- NodeLibrary -->
- <script src="js/nodes/GLNode.js"></script>
- <script src="js/nodes/RawNode.js"></script>
- <script src="js/nodes/TempNode.js"></script>
- <script src="js/nodes/InputNode.js"></script>
- <script src="js/nodes/ConstNode.js"></script>
- <script src="js/nodes/FunctionNode.js"></script>
- <script src="js/nodes/FunctionCallNode.js"></script>
- <script src="js/nodes/NodeUniform.js"></script>
- <script src="js/nodes/NodeBuilder.js"></script>
- <script src="js/nodes/NodeLib.js"></script>
- <script src="js/nodes/NodeFrame.js"></script>
- <script src="js/nodes/NodeMaterial.js"></script>
-
- <!-- Accessors -->
- <script src="js/nodes/accessors/PositionNode.js"></script>
- <script src="js/nodes/accessors/NormalNode.js"></script>
- <script src="js/nodes/accessors/UVNode.js"></script>
- <script src="js/nodes/accessors/ScreenUVNode.js"></script>
- <script src="js/nodes/accessors/ColorsNode.js"></script>
- <script src="js/nodes/accessors/CameraNode.js"></script>
- <script src="js/nodes/accessors/ReflectNode.js"></script>
- <script src="js/nodes/accessors/LightNode.js"></script>
-
- <!-- Inputs -->
- <script src="js/nodes/inputs/IntNode.js"></script>
- <script src="js/nodes/inputs/FloatNode.js"></script>
- <script src="js/nodes/inputs/ColorNode.js"></script>
- <script src="js/nodes/inputs/Vector2Node.js"></script>
- <script src="js/nodes/inputs/Vector3Node.js"></script>
- <script src="js/nodes/inputs/Vector4Node.js"></script>
- <script src="js/nodes/inputs/TextureNode.js"></script>
- <script src="js/nodes/inputs/CubeTextureNode.js"></script>
- <script src="js/nodes/inputs/Matrix4Node.js"></script>
- <script src="js/nodes/inputs/ReflectorNode.js"></script>
-
- <!-- Math -->
- <script src="js/nodes/math/Math1Node.js"></script>
- <script src="js/nodes/math/Math2Node.js"></script>
- <script src="js/nodes/math/Math3Node.js"></script>
- <script src="js/nodes/math/OperatorNode.js"></script>
-
- <!-- Utils -->
- <script src="js/nodes/utils/SwitchNode.js"></script>
- <script src="js/nodes/utils/JoinNode.js"></script>
- <script src="js/nodes/utils/TimerNode.js"></script>
- <script src="js/nodes/utils/RoughnessToBlinnExponentNode.js"></script>
- <script src="js/nodes/utils/VelocityNode.js"></script>
- <script src="js/nodes/utils/LuminanceNode.js"></script>
- <script src="js/nodes/utils/ColorAdjustmentNode.js"></script>
- <script src="js/nodes/utils/NoiseNode.js"></script>
- <script src="js/nodes/utils/ResolutionNode.js"></script>
- <script src="js/nodes/utils/BlurNode.js"></script>
-
- <!-- Phong Material -->
- <script src="js/nodes/materials/PhongNode.js"></script>
- <script src="js/nodes/materials/PhongNodeMaterial.js"></script>
-
- <!-- NodeMaterial Loader -->
- <script src="js/loaders/NodeMaterialLoader.js"></script>
-
- <script>
+ <script type="module">
+
+ import './js/nodes/THREE.Nodes.js';
+ import './js/loaders/NodeMaterialLoader.js';
// scene size
var WIDTH = window.innerWidth;
@@ -168,8 +110,8 @@
var mirror = new THREE.ReflectorNode( groundMirror );
- var normal = new THREE.TextureNode( decalNormal );
- var normalXY = new THREE.SwitchNode( normal, 'xy' );
+ var normalMap = new THREE.TextureNode( decalNormal );
+ var normalXY = new THREE.SwitchNode( normalMap, 'xy' );
var normalXYFlip = new THREE.Math1Node(
normalXY,
THREE.Math1Node.INVERT
@@ -209,7 +151,7 @@
groundMirrorMaterial = new THREE.PhongNodeMaterial();
groundMirrorMaterial.environment = blurMirror; // or add "mirror" variable to disable blur
groundMirrorMaterial.environmentAlpha = mask;
- groundMirrorMaterial.normal = normal;
+ groundMirrorMaterial.normal = new THREE.NormalMapNode( normalMap );
//groundMirrorMaterial.normalScale = new THREE.FloatNode( 1 );
// test serialization | true |
Other | mrdoob | three.js | dbb81cd0b6cf2a03a25de04a9bc4004352b41704.json | fix node examples | examples/webgl_postprocessing_nodes.html | @@ -41,57 +41,11 @@
<script src="js/postprocessing/MaskPass.js"></script>
<script src="js/postprocessing/ShaderPass.js"></script>
- <!-- NodeLibrary -->
- <script src="js/nodes/GLNode.js"></script>
- <script src="js/nodes/RawNode.js"></script>
- <script src="js/nodes/TempNode.js"></script>
- <script src="js/nodes/InputNode.js"></script>
- <script src="js/nodes/ConstNode.js"></script>
- <script src="js/nodes/FunctionNode.js"></script>
- <script src="js/nodes/FunctionCallNode.js"></script>
- <script src="js/nodes/NodeUniform.js"></script>
- <script src="js/nodes/NodeBuilder.js"></script>
- <script src="js/nodes/NodeLib.js"></script>
- <script src="js/nodes/NodeFrame.js"></script>
- <script src="js/nodes/NodeMaterial.js"></script>
-
- <!-- Accessors -->
- <script src="js/nodes/accessors/PositionNode.js"></script>
- <script src="js/nodes/accessors/NormalNode.js"></script>
- <script src="js/nodes/accessors/UVNode.js"></script>
- <script src="js/nodes/accessors/ColorsNode.js"></script>
-
- <!-- Inputs -->
- <script src="js/nodes/inputs/IntNode.js"></script>
- <script src="js/nodes/inputs/FloatNode.js"></script>
- <script src="js/nodes/inputs/ColorNode.js"></script>
- <script src="js/nodes/inputs/Vector2Node.js"></script>
- <script src="js/nodes/inputs/Vector3Node.js"></script>
- <script src="js/nodes/inputs/Vector4Node.js"></script>
- <script src="js/nodes/inputs/TextureNode.js"></script>
- <script src="js/nodes/inputs/CubeTextureNode.js"></script>
- <script src="js/nodes/inputs/ScreenNode.js"></script>
-
- <!-- Math -->
- <script src="js/nodes/math/Math1Node.js"></script>
- <script src="js/nodes/math/Math2Node.js"></script>
- <script src="js/nodes/math/Math3Node.js"></script>
- <script src="js/nodes/math/OperatorNode.js"></script>
-
- <!-- Utils -->
- <script src="js/nodes/utils/SwitchNode.js"></script>
- <script src="js/nodes/utils/JoinNode.js"></script>
- <script src="js/nodes/utils/TimerNode.js"></script>
- <script src="js/nodes/utils/ColorAdjustmentNode.js"></script>
- <script src="js/nodes/utils/BlurNode.js"></script>
-
- <!-- Post-Processing -->
- <script src="js/nodes/postprocessing/NodePass.js"></script>
-
- <!-- NodeMaterial Loader -->
- <script src="js/loaders/NodeMaterialLoader.js"></script>
-
- <script>
+ <script type="module">
+
+ import './js/nodes/THREE.Nodes.js';
+ import { NodePass } from './js/nodes/postprocessing/NodePass.js';
+ import './js/loaders/NodeMaterialLoader.js';
var camera, scene, renderer, composer;
var object, light, nodepass;
@@ -333,12 +287,12 @@
var sat = new THREE.FloatNode( 0 );
var satrgb = new THREE.FunctionNode( [
- "vec3 satrgb(vec3 rgb, float adjustment) {",
- //" const vec3 W = vec3(0.2125, 0.7154, 0.0721);", // LUMA
- " vec3 intensity = vec3(dot(rgb, LUMA));",
- " return mix(intensity, rgb, adjustment);",
+ "vec3 satrgb( vec3 rgb, float adjustment ) {",
+ // include luminance function from LuminanceNode
+ " vec3 intensity = vec3( luminance( rgb ) );",
+ " return mix( intensity, rgb, adjustment );",
"}"
- ].join( "\n" ) );
+ ].join( "\n" ), [ THREE.LuminanceNode.Nodes.luminance ] );
var saturation = new THREE.FunctionCallNode( satrgb );
saturation.inputs.rgb = screen;
@@ -561,7 +515,7 @@
composer = new THREE.EffectComposer( renderer );
composer.addPass( new THREE.RenderPass( scene, camera ) );
- nodepass = new THREE.NodePass();
+ nodepass = new NodePass();
nodepass.renderToScreen = true;
composer.addPass( nodepass ); | true |
Other | mrdoob | three.js | dbb81cd0b6cf2a03a25de04a9bc4004352b41704.json | fix node examples | examples/webgl_sprites_nodes.html | @@ -39,71 +39,10 @@
<script src="js/controls/OrbitControls.js"></script>
<script src="js/libs/dat.gui.min.js"></script>
- <!-- NodeLibrary -->
- <script src="js/nodes/GLNode.js"></script>
- <script src="js/nodes/RawNode.js"></script>
- <script src="js/nodes/TempNode.js"></script>
- <script src="js/nodes/InputNode.js"></script>
- <script src="js/nodes/ConstNode.js"></script>
- <script src="js/nodes/VarNode.js"></script>
- <script src="js/nodes/FunctionNode.js"></script>
- <script src="js/nodes/FunctionCallNode.js"></script>
- <script src="js/nodes/AttributeNode.js"></script>
- <script src="js/nodes/NodeUniform.js"></script>
- <script src="js/nodes/NodeBuilder.js"></script>
- <script src="js/nodes/NodeLib.js"></script>
- <script src="js/nodes/NodeFrame.js"></script>
- <script src="js/nodes/NodeMaterial.js"></script>
-
- <!-- Accessors -->
- <script src="js/nodes/accessors/PositionNode.js"></script>
- <script src="js/nodes/accessors/NormalNode.js"></script>
- <script src="js/nodes/accessors/UVNode.js"></script>
- <script src="js/nodes/accessors/ScreenUVNode.js"></script>
- <script src="js/nodes/accessors/ColorsNode.js"></script>
- <script src="js/nodes/accessors/CameraNode.js"></script>
- <script src="js/nodes/accessors/ReflectNode.js"></script>
- <script src="js/nodes/accessors/LightNode.js"></script>
-
- <!-- Inputs -->
- <script src="js/nodes/inputs/IntNode.js"></script>
- <script src="js/nodes/inputs/FloatNode.js"></script>
- <script src="js/nodes/inputs/ColorNode.js"></script>
- <script src="js/nodes/inputs/Vector2Node.js"></script>
- <script src="js/nodes/inputs/Vector3Node.js"></script>
- <script src="js/nodes/inputs/Vector4Node.js"></script>
- <script src="js/nodes/inputs/TextureNode.js"></script>
- <script src="js/nodes/inputs/Matrix4Node.js"></script>
- <script src="js/nodes/inputs/CubeTextureNode.js"></script>
-
- <!-- Math -->
- <script src="js/nodes/math/Math1Node.js"></script>
- <script src="js/nodes/math/Math2Node.js"></script>
- <script src="js/nodes/math/Math3Node.js"></script>
- <script src="js/nodes/math/OperatorNode.js"></script>
-
- <!-- Utils -->
- <script src="js/nodes/utils/SwitchNode.js"></script>
- <script src="js/nodes/utils/JoinNode.js"></script>
- <script src="js/nodes/utils/TimerNode.js"></script>
- <script src="js/nodes/utils/RoughnessToBlinnExponentNode.js"></script>
- <script src="js/nodes/utils/VelocityNode.js"></script>
- <script src="js/nodes/utils/LuminanceNode.js"></script>
- <script src="js/nodes/utils/ColorAdjustmentNode.js"></script>
- <script src="js/nodes/utils/NoiseNode.js"></script>
- <script src="js/nodes/utils/ResolutionNode.js"></script>
- <script src="js/nodes/utils/BumpNode.js"></script>
- <script src="js/nodes/utils/BlurNode.js"></script>
- <script src="js/nodes/utils/UVTransformNode.js"></script>
-
- <!-- Sprite Material -->
- <script src="js/nodes/materials/SpriteNode.js"></script>
- <script src="js/nodes/materials/SpriteNodeMaterial.js"></script>
-
- <!-- NodeMaterial Loader -->
- <script src="js/loaders/NodeMaterialLoader.js"></script>
-
- <script>
+ <script type="module">
+
+ import './js/nodes/THREE.Nodes.js';
+ import './js/loaders/NodeMaterialLoader.js';
var container = document.getElementById( 'container' );
@@ -248,9 +187,9 @@
// Test serialization
//
- spriteToJSON( sprite1 );
- spriteToJSON( sprite2 );
- spriteToJSON( sprite3 );
+ //spriteToJSON( sprite1 );
+ //spriteToJSON( sprite2 );
+ //spriteToJSON( sprite3 );
//
// Events | true |
Other | mrdoob | three.js | 4ebbdc8f64fc7f2e9f8bd2c928136ce9b0f63e94.json | Fix linter errors | examples/css2d_label.html | @@ -46,8 +46,8 @@
<script>
- var camera, scene, scene2, renderer, labelRenderer;
- var controls;
+ var camera, scene, renderer, labelRenderer;
+
var clock = new THREE.Clock();
var textureLoader = new THREE.TextureLoader();
@@ -64,12 +64,10 @@
camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 1, 1000 );
camera.position.set( 10, 5, 20 );
- controls = new THREE.OrbitControls( camera );
+ var controls = new THREE.OrbitControls( camera );
scene = new THREE.Scene();
- scene2 = new THREE.Scene();
-
var dirLight = new THREE.DirectionalLight( 0xffffff );
dirLight.position.set( 0, 0, 1 );
scene.add( dirLight ); | true |
Other | mrdoob | three.js | 4ebbdc8f64fc7f2e9f8bd2c928136ce9b0f63e94.json | Fix linter errors | examples/css3d_molecules.html | @@ -180,11 +180,11 @@
function generateButtonCallback( url ) {
- return function ( event ) {
+ return function () {
loadMolecule( url );
- }
+ };
}
@@ -196,7 +196,7 @@
button.innerHTML = m;
menu.appendChild( button );
- var url = "models/molecules/" + MOLECULES[ m ];
+ var url = "models/molecules/" + MOLECULES[ m ];
button.addEventListener( 'click', generateButtonCallback( url ), false );
@@ -206,9 +206,21 @@
var b_b = document.getElementById( "b_b" );
var b_ab = document.getElementById( "b_ab" );
- b_a.addEventListener( 'click', function() { visualizationType = 0; showAtoms() } );
- b_b.addEventListener( 'click', function() { visualizationType = 1; showBonds() } );
- b_ab.addEventListener( 'click', function() { visualizationType = 2; showAtomsBonds() } );
+ b_a.addEventListener( 'click', function () {
+
+ visualizationType = 0; showAtoms();
+
+ } );
+ b_b.addEventListener( 'click', function () {
+
+ visualizationType = 1; showBonds();
+
+ } );
+ b_ab.addEventListener( 'click', function () {
+
+ visualizationType = 2; showAtomsBonds();
+
+ } );
}
@@ -458,7 +470,7 @@
joint.updateMatrix();
var object = new THREE.CSS3DObject( bond );
- object.rotation.y = Math.PI/2;
+ object.rotation.y = Math.PI / 2;
object.matrixAutoUpdate = false;
object.updateMatrix(); | true |
Other | mrdoob | three.js | 4ebbdc8f64fc7f2e9f8bd2c928136ce9b0f63e94.json | Fix linter errors | examples/css3d_orthographic.html | @@ -42,8 +42,6 @@
var scene2, renderer2;
- var controls;
-
init();
animate();
@@ -55,7 +53,7 @@
camera.position.set( - 200, 200, 200 );
- controls = new THREE.OrbitControls( camera );
+ var controls = new THREE.OrbitControls( camera );
scene = new THREE.Scene();
scene.background = new THREE.Color( 0xf0f0f0 ); | true |
Other | mrdoob | three.js | 4ebbdc8f64fc7f2e9f8bd2c928136ce9b0f63e94.json | Fix linter errors | examples/css3d_panorama.html | @@ -38,7 +38,6 @@
<script>
var camera, scene, renderer;
- var geometry, material, mesh;
var target = new THREE.Vector3();
var lon = 90, lat = 0;
@@ -58,32 +57,32 @@
var sides = [
{
url: 'textures/cube/Bridge2/posx.jpg',
- position: [ -512, 0, 0 ],
+ position: [ - 512, 0, 0 ],
rotation: [ 0, Math.PI / 2, 0 ]
},
{
url: 'textures/cube/Bridge2/negx.jpg',
position: [ 512, 0, 0 ],
- rotation: [ 0, -Math.PI / 2, 0 ]
+ rotation: [ 0, - Math.PI / 2, 0 ]
},
{
url: 'textures/cube/Bridge2/posy.jpg',
- position: [ 0, 512, 0 ],
+ position: [ 0, 512, 0 ],
rotation: [ Math.PI / 2, 0, Math.PI ]
},
{
url: 'textures/cube/Bridge2/negy.jpg',
- position: [ 0, -512, 0 ],
+ position: [ 0, - 512, 0 ],
rotation: [ - Math.PI / 2, 0, Math.PI ]
},
{
url: 'textures/cube/Bridge2/posz.jpg',
- position: [ 0, 0, 512 ],
+ position: [ 0, 0, 512 ],
rotation: [ 0, Math.PI, 0 ]
},
{
url: 'textures/cube/Bridge2/negz.jpg',
- position: [ 0, 0, -512 ],
+ position: [ 0, 0, - 512 ],
rotation: [ 0, 0, 0 ]
}
];
@@ -147,7 +146,7 @@
}
- function onDocumentMouseUp( event ) {
+ function onDocumentMouseUp() {
document.removeEventListener( 'mousemove', onDocumentMouseMove );
document.removeEventListener( 'mouseup', onDocumentMouseUp );
@@ -193,7 +192,7 @@
requestAnimationFrame( animate );
- lon += 0.1;
+ lon += 0.1;
lat = Math.max( - 85, Math.min( 85, lat ) );
phi = THREE.Math.degToRad( 90 - lat );
theta = THREE.Math.degToRad( lon ); | true |
Other | mrdoob | three.js | 4ebbdc8f64fc7f2e9f8bd2c928136ce9b0f63e94.json | Fix linter errors | examples/css3d_panorama_deviceorientation.html | @@ -40,7 +40,6 @@
var camera, scene, renderer;
var controls;
- var geometry, material, mesh;
init();
animate();
@@ -56,32 +55,32 @@
var sides = [
{
url: 'textures/cube/Bridge2/posx.jpg',
- position: [ -512, 0, 0 ],
+ position: [ - 512, 0, 0 ],
rotation: [ 0, Math.PI / 2, 0 ]
},
{
url: 'textures/cube/Bridge2/negx.jpg',
position: [ 512, 0, 0 ],
- rotation: [ 0, -Math.PI / 2, 0 ]
+ rotation: [ 0, - Math.PI / 2, 0 ]
},
{
url: 'textures/cube/Bridge2/posy.jpg',
- position: [ 0, 512, 0 ],
+ position: [ 0, 512, 0 ],
rotation: [ Math.PI / 2, 0, Math.PI ]
},
{
url: 'textures/cube/Bridge2/negy.jpg',
- position: [ 0, -512, 0 ],
+ position: [ 0, - 512, 0 ],
rotation: [ - Math.PI / 2, 0, Math.PI ]
},
{
url: 'textures/cube/Bridge2/posz.jpg',
- position: [ 0, 0, 512 ],
+ position: [ 0, 0, 512 ],
rotation: [ 0, Math.PI, 0 ]
},
{
url: 'textures/cube/Bridge2/negz.jpg',
- position: [ 0, 0, -512 ],
+ position: [ 0, 0, - 512 ],
rotation: [ 0, 0, 0 ]
}
]; | true |
Other | mrdoob | three.js | 4ebbdc8f64fc7f2e9f8bd2c928136ce9b0f63e94.json | Fix linter errors | examples/css3d_periodictable.html | @@ -262,7 +262,7 @@
var number = document.createElement( 'div' );
number.className = 'number';
- number.textContent = (i/5) + 1;
+ number.textContent = ( i / 5 ) + 1;
element.appendChild( number );
var symbol = document.createElement( 'div' );
@@ -299,7 +299,7 @@
for ( var i = 0, l = objects.length; i < l; i ++ ) {
- var phi = Math.acos( -1 + ( 2 * i ) / l );
+ var phi = Math.acos( - 1 + ( 2 * i ) / l );
var theta = Math.sqrt( l * Math.PI ) * phi;
var object = new THREE.Object3D();
@@ -366,28 +366,28 @@
controls.addEventListener( 'change', render );
var button = document.getElementById( 'table' );
- button.addEventListener( 'click', function ( event ) {
+ button.addEventListener( 'click', function () {
transform( targets.table, 2000 );
}, false );
var button = document.getElementById( 'sphere' );
- button.addEventListener( 'click', function ( event ) {
+ button.addEventListener( 'click', function () {
transform( targets.sphere, 2000 );
}, false );
var button = document.getElementById( 'helix' );
- button.addEventListener( 'click', function ( event ) {
+ button.addEventListener( 'click', function () {
transform( targets.helix, 2000 );
}, false );
var button = document.getElementById( 'grid' );
- button.addEventListener( 'click', function ( event ) {
+ button.addEventListener( 'click', function () {
transform( targets.grid, 2000 );
| true |
Other | mrdoob | three.js | 4ebbdc8f64fc7f2e9f8bd2c928136ce9b0f63e94.json | Fix linter errors | examples/css3d_sprites.html | @@ -64,7 +64,7 @@
scene = new THREE.Scene();
var image = document.createElement( 'img' );
- image.addEventListener( 'load', function ( event ) {
+ image.addEventListener( 'load', function () {
for ( var i = 0; i < particlesTotal; i ++ ) {
@@ -135,7 +135,7 @@
for ( var i = 0; i < particlesTotal; i ++ ) {
- var phi = Math.acos( -1 + ( 2 * i ) / particlesTotal );
+ var phi = Math.acos( - 1 + ( 2 * i ) / particlesTotal );
var theta = Math.sqrt( particlesTotal * Math.PI ) * phi;
positions.push( | true |
Other | mrdoob | three.js | 4ebbdc8f64fc7f2e9f8bd2c928136ce9b0f63e94.json | Fix linter errors | examples/css3d_youtube.html | @@ -11,7 +11,6 @@
}
#blocker {
position: absolute;
- /* background-color: rgba(255, 0, 0, 0.5); */
top: 0px;
left: 0px;
width: 100%;
@@ -87,8 +86,16 @@
var blocker = document.getElementById( 'blocker' );
blocker.style.display = 'none';
- document.addEventListener( 'mousedown', function () { blocker.style.display = ''; } );
- document.addEventListener( 'mouseup', function () { blocker.style.display = 'none'; } );
+ document.addEventListener( 'mousedown', function () {
+
+ blocker.style.display = '';
+
+ } );
+ document.addEventListener( 'mouseup', function () {
+
+ blocker.style.display = 'none';
+
+ } );
}
| true |
Other | mrdoob | three.js | 4ebbdc8f64fc7f2e9f8bd2c928136ce9b0f63e94.json | Fix linter errors | examples/raytracing_sandbox.html | @@ -25,7 +25,7 @@
var container, info;
- var camera, controls, scene, renderer;
+ var camera, scene, renderer;
var group;
init();
@@ -266,7 +266,7 @@
container.appendChild( renderer.domElement );
- window.addEventListener( 'resize', function( e ) {
+ window.addEventListener( 'resize', function () {
renderer.setSize( innerWidth, innerHeight );
@@ -283,25 +283,12 @@
}
- info.innerHTML = '<a href="http://threejs.org" target="_blank" rel="noopener">three.js<a/> - raytracing renderer (using ' + WORKERS + ' <button onclick="updateWorkers(-1)">-</button><button onclick="updateWorkers(1)">+</button> web workers)' +
+ info.innerHTML = '<a href="http://threejs.org" target="_blank" rel="noopener">three.js<a/> - raytracing renderer (using ' + WORKERS + ' <button onclick="updateWorkers(-1)">-</button><button onclick="updateWorkers(1)">+</button> web workers)' +
'<br/><button onclick="rearrange()">Rearrange</button><button onclick="render()">Render</button>';
}
- function rearrange() {
-
- group.children.forEach( function( o ) {
-
- o.position.y += ( Math.random() - 0.5 ) * 100;
- o.position.x += ( Math.random() - 0.5 ) * 400;
- o.position.z += ( Math.random() - 0.5 ) * 400;
-
- } );
-
- }
-
-
function render() {
renderer.render( scene, camera ); | true |
Other | mrdoob | three.js | 4ebbdc8f64fc7f2e9f8bd2c928136ce9b0f63e94.json | Fix linter errors | examples/software_lines_splines.html | @@ -56,10 +56,10 @@
var mouseX = 0, mouseY = 0,
- windowHalfX = window.innerWidth / 2,
- windowHalfY = window.innerHeight / 2,
+ windowHalfX = window.innerWidth / 2,
+ windowHalfY = window.innerHeight / 2,
- camera, scene, renderer, material, stats;
+ camera, scene, renderer, material, stats;
init();
animate();
@@ -82,10 +82,10 @@
container.appendChild( renderer.domElement );
var geometry = new THREE.Geometry(),
- geometry2 = new THREE.Geometry(),
- geometry3 = new THREE.Geometry(),
- points = hilbert3D( new THREE.Vector3(), 200.0, 1, 0, 1, 2, 3, 4, 5, 6, 7 ),
- colors = [], colors2 = [], colors3 = [];
+ geometry2 = new THREE.Geometry(),
+ geometry3 = new THREE.Geometry(),
+ points = hilbert3D( new THREE.Vector3(), 200.0, 1, 0, 1, 2, 3, 4, 5, 6, 7 ),
+ colors = [], colors2 = [], colors3 = [];
var subdivisions = 6;
@@ -119,17 +119,17 @@
material = new THREE.LineBasicMaterial( { color: 0xffffff, opacity: 1, linewidth: 3, vertexColors: THREE.VertexColors } );
var line, p, scale = 0.3, d = 225;
- var parameters = [
- [ material, scale*1.5, [-d,0,0], geometry ],
- [ material, scale*1.5, [0,0,0], geometry2 ],
- [ material, scale*1.5, [d,0,0], geometry3 ]
+ var parameters = [
+ [ material, scale * 1.5, [ - d, 0, 0 ], geometry ],
+ [ material, scale * 1.5, [ 0, 0, 0 ], geometry2 ],
+ [ material, scale * 1.5, [ d, 0, 0 ], geometry3 ]
];
for ( i = 0; i < parameters.length; ++ i ) {
p = parameters[ i ];
- line = new THREE.Line( p[ 3 ], p[ 0 ] );
- line.scale.x = line.scale.y = line.scale.z = p[ 1 ];
+ line = new THREE.Line( p[ 3 ], p[ 0 ] );
+ line.scale.x = line.scale.y = line.scale.z = p[ 1 ];
line.position.x = p[ 2 ][ 0 ];
line.position.y = p[ 2 ][ 1 ];
line.position.z = p[ 2 ][ 2 ];
@@ -163,6 +163,7 @@
mouseX = event.clientX - windowHalfX;
mouseY = event.clientY - windowHalfY;
+
}
function onDocumentTouchStart( event ) {
@@ -173,7 +174,9 @@
mouseX = event.touches[ 0 ].pageX - windowHalfX;
mouseY = event.touches[ 0 ].pageY - windowHalfY;
+
}
+
}
function onDocumentTouchMove( event ) {
@@ -184,6 +187,7 @@
mouseX = event.touches[ 0 ].pageX - windowHalfX;
mouseY = event.touches[ 0 ].pageY - windowHalfY;
+
}
}
@@ -210,7 +214,7 @@
if ( object instanceof THREE.Line ) {
- object.rotation.y = time * ( i % 2 ? 1 : -1 );
+ object.rotation.y = time * ( i % 2 ? 1 : - 1 );
}
| true |
Other | mrdoob | three.js | 4ebbdc8f64fc7f2e9f8bd2c928136ce9b0f63e94.json | Fix linter errors | examples/software_sandbox.html | @@ -83,25 +83,25 @@
var loader = new THREE.TextureLoader();
var map = loader.load( 'textures/brick_diffuse.jpg' );
texCube = new THREE.Mesh( geometry, new THREE.MeshLambertMaterial( { map: map, overdraw: 0.5 } ) );
- texCube.position.set( -300, 0, 0 );
+ texCube.position.set( - 300, 0, 0 );
scene.add( texCube );
// Sprite
var sprite = new THREE.Sprite( new THREE.SpriteMaterial( { color: 0xff0040 } ) );
sprite.scale.set( 100, 100, 1 );
- sprite.position.set( -100, 200, 0 );
+ sprite.position.set( - 100, 200, 0 );
scene.add( sprite );
// Sprite with texture
var texLoader = new THREE.TextureLoader();
map = texLoader.load( 'textures/sprite1.png' );
- var texSprite = new THREE.Sprite( new THREE.SpriteMaterial( { map: map,transparent: true } ) );
+ var texSprite = new THREE.Sprite( new THREE.SpriteMaterial( { map: map, transparent: true } ) );
texSprite.scale.set( 100, 100, 1 );
texSprite.position.set( 100, 200, 0 );
scene.add( texSprite );
// Line
- var points = hilbert3D( new THREE.Vector3( 0,0,0 ), 200.0, 1, 0, 1, 2, 3, 4, 5, 6, 7 );
+ var points = hilbert3D( new THREE.Vector3( 0, 0, 0 ), 200.0, 1, 0, 1, 2, 3, 4, 5, 6, 7 );
var spline = new THREE.CatmullRomCurve3( points );
var n_sub = 6, colors = [];
@@ -121,7 +121,7 @@
var material = new THREE.LineBasicMaterial( { opacity: 1, linewidth: 3, vertexColors: THREE.VertexColors } );
var line = new THREE.Line( lineGeometry, material );
line.scale.set( 0.5, 0.5, 0.5 );
- line.position.set( 0, -200, 0);
+ line.position.set( 0, - 200, 0 );
scene.add( line );
renderer = new THREE.SoftwareRenderer(); | true |
Other | mrdoob | three.js | 4ebbdc8f64fc7f2e9f8bd2c928136ce9b0f63e94.json | Fix linter errors | examples/svg_sandbox.html | @@ -40,7 +40,7 @@
// QRCODE
var loader = new THREE.JSONLoader();
- loader.load( 'models/json/QRCode.json', function ( geometry) {
+ loader.load( 'models/json/QRCode.json', function ( geometry ) {
mesh = new THREE.Mesh( geometry, new THREE.MeshLambertMaterial( { /*emissive: 0xff0000,*/ vertexColors: THREE.FaceColors } ) );
mesh.scale.x = mesh.scale.y = mesh.scale.z = 2;
@@ -70,14 +70,14 @@
// PLANE
mesh = new THREE.Mesh( new THREE.PlaneBufferGeometry( 100, 100 ), new THREE.MeshBasicMaterial( { color: Math.random() * 0xffffff, side: THREE.DoubleSide } ) );
- mesh.position.y = -500;
+ mesh.position.y = - 500;
mesh.scale.x = mesh.scale.y = mesh.scale.z = 2;
scene.add( mesh );
// CYLINDER
mesh = new THREE.Mesh( new THREE.CylinderBufferGeometry( 20, 100, 200, 10 ), new THREE.MeshBasicMaterial( { color: Math.random() * 0xffffff } ) );
- mesh.position.x = -500;
+ mesh.position.x = - 500;
mesh.rotation.x = - Math.PI / 2;
mesh.scale.x = mesh.scale.y = mesh.scale.z = 2;
scene.add( mesh ); | true |
Other | mrdoob | three.js | 4ebbdc8f64fc7f2e9f8bd2c928136ce9b0f63e94.json | Fix linter errors | examples/webaudio_orientation.html | @@ -135,8 +135,8 @@
light.position.set( 0, 200, 100 );
light.castShadow = true;
light.shadow.camera.top = 180;
- light.shadow.camera.bottom = -100;
- light.shadow.camera.left = -120;
+ light.shadow.camera.bottom = - 100;
+ light.shadow.camera.left = - 120;
light.shadow.camera.right = 120;
scene.add( light );
@@ -167,13 +167,13 @@
//
var gltfLoader = new THREE.GLTFLoader();
- gltfLoader.load( 'models/gltf/BoomBox/glTF-Binary/BoomBox.glb', function( gltf ) {
+ gltfLoader.load( 'models/gltf/BoomBox/glTF-Binary/BoomBox.glb', function ( gltf ) {
- var boomBox = gltf.scene;
+ var boomBox = gltf.scene;
boomBox.position.set( 0, 0.2, 0 );
boomBox.scale.set( 20, 20, 20 );
- boomBox.traverse( function( object ) {
+ boomBox.traverse( function ( object ) {
if ( object.isMesh ) {
@@ -225,7 +225,7 @@
}
- function onWindowResize( event ) {
+ function onWindowResize() {
camera.aspect = window.innerWidth / window.innerHeight;
camera.updateProjectionMatrix(); | true |
Other | mrdoob | three.js | 4ebbdc8f64fc7f2e9f8bd2c928136ce9b0f63e94.json | Fix linter errors | examples/webaudio_sandbox.html | @@ -94,8 +94,7 @@
}
- var camera, controls, scene, renderer;
- var light, pointLight;
+ var camera, controls, scene, renderer, light;
var material1, material2, material3;
@@ -135,15 +134,17 @@
var audioLoader = new THREE.AudioLoader();
var mesh1 = new THREE.Mesh( sphere, material1 );
- mesh1.position.set( -250, 30, 0 );
+ mesh1.position.set( - 250, 30, 0 );
scene.add( mesh1 );
var sound1 = new THREE.PositionalAudio( listener );
- audioLoader.load( 'sounds/358232_j_s_song.ogg', function( buffer ) {
+ audioLoader.load( 'sounds/358232_j_s_song.ogg', function ( buffer ) {
+
sound1.setBuffer( buffer );
sound1.setRefDistance( 20 );
sound1.play();
- });
+
+ } );
mesh1.add( sound1 );
//
@@ -153,17 +154,19 @@
scene.add( mesh2 );
var sound2 = new THREE.PositionalAudio( listener );
- audioLoader.load( 'sounds/376737_Skullbeatz___Bad_Cat_Maste.ogg', function( buffer ) {
+ audioLoader.load( 'sounds/376737_Skullbeatz___Bad_Cat_Maste.ogg', function ( buffer ) {
+
sound2.setBuffer( buffer );
sound2.setRefDistance( 20 );
sound2.play();
- });
+
+ } );
mesh2.add( sound2 );
//
var mesh3 = new THREE.Mesh( sphere, material3 );
- mesh3.position.set( 0, 30, -250 );
+ mesh3.position.set( 0, 30, - 250 );
scene.add( mesh3 );
var sound3 = new THREE.PositionalAudio( listener );
@@ -185,12 +188,14 @@
// global ambient audio
var sound4 = new THREE.Audio( listener );
- audioLoader.load( 'sounds/Project_Utopia.ogg', function( buffer ) {
+ audioLoader.load( 'sounds/Project_Utopia.ogg', function ( buffer ) {
+
sound4.setBuffer( buffer );
- sound4.setLoop(true);
- sound4.setVolume(0.5);
+ sound4.setLoop( true );
+ sound4.setVolume( 0.5 );
sound4.play();
- });
+
+ } );
// ground
@@ -200,17 +205,17 @@
//
- var SoundControls = function() {
+ var SoundControls = function () {
this.master = listener.getMasterVolume();
- this.firstSphere = sound1.getVolume();
- this.secondSphere = sound2.getVolume();
+ this.firstSphere = sound1.getVolume();
+ this.secondSphere = sound2.getVolume();
this.thirdSphere = sound3.getVolume();
- this.Ambient = sound4.getVolume();
+ this.Ambient = sound4.getVolume();
};
- var GeneratorControls = function() {
+ var GeneratorControls = function () {
this.frequency = oscillator.frequency.value;
this.wavetype = oscillator.type; | true |
Other | mrdoob | three.js | 4ebbdc8f64fc7f2e9f8bd2c928136ce9b0f63e94.json | Fix linter errors | examples/webaudio_timing.html | @@ -93,7 +93,7 @@
}
- var scene, camera, renderer, audio;
+ var scene, camera, renderer;
var objects = [];
@@ -211,7 +211,7 @@
}
- function onWindowResize( event ) {
+ function onWindowResize() {
camera.aspect = window.innerWidth / window.innerHeight;
camera.updateProjectionMatrix(); | true |
Other | mrdoob | three.js | 4ebbdc8f64fc7f2e9f8bd2c928136ce9b0f63e94.json | Fix linter errors | examples/webgl2_materials_texture3d.html | @@ -119,33 +119,33 @@
.setResponseType( 'arraybuffer' )
.load( 'textures/3d/head256x256x109.zip', function ( data ) {
- var zip = new JSZip( data );
- var array = zip.files[ 'head256x256x109' ].asUint8Array();
+ var zip = new JSZip( data );
+ var array = zip.files[ 'head256x256x109' ].asUint8Array();
- var texture = new THREE.DataTexture3D( array, 256, 256, 109 );
+ var texture = new THREE.DataTexture3D( array, 256, 256, 109 );
- texture.format = THREE.RedFormat;
- texture.type = THREE.UnsignedByteType;
+ texture.format = THREE.RedFormat;
+ texture.type = THREE.UnsignedByteType;
- texture.needsUpdate = true;
+ texture.needsUpdate = true;
- var material = new THREE.ShaderMaterial( {
- uniforms: {
- diffuse: { value: texture },
- depth: { value: 0 },
- size: { value: new THREE.Vector2( planeWidth, planeHeight ) }
- },
- vertexShader: document.getElementById( 'vs' ).textContent.trim(),
- fragmentShader: document.getElementById( 'fs' ).textContent.trim()
- } );
+ var material = new THREE.ShaderMaterial( {
+ uniforms: {
+ diffuse: { value: texture },
+ depth: { value: 0 },
+ size: { value: new THREE.Vector2( planeWidth, planeHeight ) }
+ },
+ vertexShader: document.getElementById( 'vs' ).textContent.trim(),
+ fragmentShader: document.getElementById( 'fs' ).textContent.trim()
+ } );
- var geometry = new THREE.PlaneBufferGeometry( planeWidth, planeHeight );
+ var geometry = new THREE.PlaneBufferGeometry( planeWidth, planeHeight );
- mesh = new THREE.Mesh( geometry, material );
+ mesh = new THREE.Mesh( geometry, material );
- scene.add( mesh );
+ scene.add( mesh );
- } );
+ } );
// var controls = new THREE.OrbitControls( camera );
@@ -188,7 +188,7 @@
if ( value > 1.0 || value < 0.0 ) {
if ( value > 1.0 ) value = 2.0 - value;
- if ( value < 0.0 ) vlaue = - value;
+ if ( value < 0.0 ) value = - value;
depthStep = - depthStep;
| true |
Other | mrdoob | three.js | 4ebbdc8f64fc7f2e9f8bd2c928136ce9b0f63e94.json | Fix linter errors | examples/webgl2_materials_texture3d_volume.html | @@ -151,9 +151,9 @@
uniforms.u_cmdata.value = cmtextures[ volconfig.colormap ];
material = new THREE.ShaderMaterial( {
- uniforms : uniforms,
- vertexShader : shader.vertexShader,
- fragmentShader : shader.fragmentShader,
+ uniforms: uniforms,
+ vertexShader: shader.vertexShader,
+ fragmentShader: shader.fragmentShader,
side: THREE.BackSide // The volume shader uses the backface as its "reference point"
} );
| true |
Other | mrdoob | three.js | 4ebbdc8f64fc7f2e9f8bd2c928136ce9b0f63e94.json | Fix linter errors | examples/webgl2_sandbox.html | @@ -117,7 +117,7 @@
}
- function onDocumentMouseMove(event) {
+ function onDocumentMouseMove( event ) {
mouseX = ( event.clientX - windowHalfX ) * 10;
mouseY = ( event.clientY - windowHalfY ) * 10; | true |
Other | mrdoob | three.js | 4ebbdc8f64fc7f2e9f8bd2c928136ce9b0f63e94.json | Fix linter errors | examples/webgldeferred_animation.html | @@ -109,15 +109,15 @@
var loader = new THREE.JSONLoader();
- loader.load( "models/skinned/knight.js", function( geometry, materials ) {
+ loader.load( "models/skinned/knight.js", function ( geometry, materials ) {
var material = materials[ 0 ];
material.emissive.set( 0x101010 );
material.skinning = true;
material.morphTargets = true;
var mesh = new THREE.SkinnedMesh( geometry, material );
- mesh.position.y = -30;
+ mesh.position.y = - 30;
mesh.scale.multiplyScalar( 5 );
mixer = new THREE.AnimationMixer( mesh );
@@ -162,7 +162,7 @@
}
var directionalLight = new THREE.DirectionalLight( 0x101010 );
- directionalLight.position.set( -1, 1, 1 ).normalize();
+ directionalLight.position.set( - 1, 1, 1 ).normalize();
scene.add( directionalLight );
var spotLight = new THREE.SpotLight( 0x404040 );
@@ -183,31 +183,31 @@
// top
var mesh = new THREE.Mesh( geometry, material );
- mesh.rotation.x = Math.PI/2;
+ mesh.rotation.x = Math.PI / 2;
mesh.position.y = size / 2;
room.add( mesh );
// bottom
mesh = new THREE.Mesh( geometry, material );
- mesh.rotation.x = -Math.PI/2;
- mesh.position.y = -size / 2;
+ mesh.rotation.x = - Math.PI / 2;
+ mesh.position.y = - size / 2;
room.add( mesh );
// left
mesh = new THREE.Mesh( geometry, material );
- mesh.position.x = -size / 2;
- mesh.rotation.y = Math.PI/2;
+ mesh.position.x = - size / 2;
+ mesh.rotation.y = Math.PI / 2;
room.add( mesh );
// right
mesh = new THREE.Mesh( geometry, material );
mesh.position.x = size / 2;
- mesh.rotation.y = -Math.PI/2;
+ mesh.rotation.y = - Math.PI / 2;
room.add( mesh );
// back
mesh = new THREE.Mesh( geometry, material );
- mesh.position.z = -size / 2;
+ mesh.position.z = - size / 2;
room.add( mesh );
// front, to check if transparency works
@@ -220,7 +220,7 @@
// back2, to check if transparency works
mesh = new THREE.Mesh( geometry, transparentMaterial );
- mesh.position.z = -size / 4;
+ mesh.position.z = - size / 4;
mesh.scale.multiplyScalar( 0.75 );
mesh.visible = false;
transparentObjects.push( mesh );
@@ -247,9 +247,9 @@
'light pre-pass': 1,
'forward': 2
- } ).onChange( function() {
+ } ).onChange( function () {
- switch( parseInt( api.mode ) ) {
+ switch ( parseInt( api.mode ) ) {
case 0:
renderer.forwardRendering = false;
@@ -293,7 +293,7 @@
}
- function onWindowResize( event ) {
+ function onWindowResize() {
WIDTH = window.innerWidth;
HEIGHT = window.innerHeight; | true |
Other | mrdoob | three.js | e79b63e9db28426b9ebadb7342cd22034ace06ee.json | fix linter errors in canvas examples | examples/canvas_camera_orthographic.html | @@ -112,9 +112,9 @@
var aspect = window.innerWidth / window.innerHeight;
- camera.left = - frustumSize * aspect / 2;
- camera.right = frustumSize * aspect / 2;
- camera.top = frustumSize / 2;
+ camera.left = - frustumSize * aspect / 2;
+ camera.right = frustumSize * aspect / 2;
+ camera.top = frustumSize / 2;
camera.bottom = - frustumSize / 2;
camera.updateProjectionMatrix(); | true |
Other | mrdoob | three.js | e79b63e9db28426b9ebadb7342cd22034ace06ee.json | fix linter errors in canvas examples | examples/canvas_geometry_birds.html | @@ -43,15 +43,15 @@
THREE.Geometry.call( this );
- v( 5, 0, 0 );
- v( - 5, - 2, 1 );
- v( - 5, 0, 0 );
+ v( 5, 0, 0 );
+ v( - 5, - 2, 1 );
+ v( - 5, 0, 0 );
v( - 5, - 2, - 1 );
- v( 0, 2, - 6 );
- v( 0, 2, 6 );
- v( 2, 0, 0 );
- v( - 3, 0, 0 );
+ v( 0, 2, - 6 );
+ v( 0, 2, 6 );
+ v( 2, 0, 0 );
+ v( - 3, 0, 0 );
f3( 0, 2, 1 );
@@ -72,7 +72,7 @@
}
- }
+ };
Bird.prototype = Object.create( THREE.Geometry.prototype );
Bird.prototype.constructor = Bird;
@@ -82,8 +82,8 @@
var Boid = function () {
var vector = new THREE.Vector3(),
- _acceleration, _width = 500, _height = 500, _depth = 200, _goal, _neighborhoodRadius = 100,
- _maxSpeed = 4, _maxSteerForce = 0.1, _avoidWalls = false;
+ _acceleration, _width = 500, _height = 500, _depth = 200, _goal, _neighborhoodRadius = 100,
+ _maxSpeed = 4, _maxSteerForce = 0.1, _avoidWalls = false;
this.position = new THREE.Vector3();
this.velocity = new THREE.Vector3();
@@ -193,12 +193,12 @@
this.checkBounds = function () {
- if ( this.position.x > _width ) this.position.x = - _width;
- if ( this.position.x < - _width ) this.position.x = _width;
- if ( this.position.y > _height ) this.position.y = - _height;
- if ( this.position.y < - _height ) this.position.y = _height;
- if ( this.position.z > _depth ) this.position.z = - _depth;
- if ( this.position.z < - _depth ) this.position.z = _depth;
+ if ( this.position.x > _width ) this.position.x = - _width;
+ if ( this.position.x < - _width ) this.position.x = _width;
+ if ( this.position.y > _height ) this.position.y = - _height;
+ if ( this.position.y < - _height ) this.position.y = _height;
+ if ( this.position.z > _depth ) this.position.z = - _depth;
+ if ( this.position.z < - _depth ) this.position.z = _depth;
};
@@ -250,7 +250,7 @@
var count = 0;
var velSum = new THREE.Vector3();
- for ( var i = 0, il = boids.length; i < il; i++ ) {
+ for ( var i = 0, il = boids.length; i < il; i ++ ) {
if ( Math.random() > 0.6 ) continue;
@@ -260,7 +260,7 @@
if ( distance > 0 && distance <= _neighborhoodRadius ) {
velSum.add( boid.velocity );
- count++;
+ count ++;
}
@@ -300,7 +300,7 @@
if ( distance > 0 && distance <= _neighborhoodRadius ) {
posSum.add( boid.position );
- count++;
+ count ++;
}
@@ -353,15 +353,14 @@
};
- }
+ };
var SCREEN_WIDTH = window.innerWidth,
- SCREEN_HEIGHT = window.innerHeight,
- SCREEN_WIDTH_HALF = SCREEN_WIDTH / 2,
- SCREEN_HEIGHT_HALF = SCREEN_HEIGHT / 2;
+ SCREEN_HEIGHT = window.innerHeight,
+ SCREEN_WIDTH_HALF = SCREEN_WIDTH / 2,
+ SCREEN_HEIGHT_HALF = SCREEN_HEIGHT / 2;
- var camera, scene, renderer,
- birds, bird;
+ var camera, scene, renderer, birds, bird;
var boid, boids;
@@ -393,7 +392,7 @@
boid.setAvoidWalls( true );
boid.setWorldSize( 500, 500, 400 );
- bird = birds[ i ] = new THREE.Mesh( new Bird(), new THREE.MeshBasicMaterial( { color:Math.random() * 0xffffff, side: THREE.DoubleSide } ) );
+ bird = birds[ i ] = new THREE.Mesh( new Bird(), new THREE.MeshBasicMaterial( { color: Math.random() * 0xffffff, side: THREE.DoubleSide } ) );
bird.phase = Math.floor( Math.random() * 62.83 );
scene.add( bird );
@@ -408,7 +407,7 @@
document.body.appendChild( renderer.domElement );
stats = new Stats();
- document.getElementById( 'container' ).appendChild(stats.dom);
+ document.getElementById( 'container' ).appendChild( stats.dom );
//
@@ -429,7 +428,7 @@
var vector = new THREE.Vector3( event.clientX - SCREEN_WIDTH_HALF, - event.clientY + SCREEN_HEIGHT_HALF, 0 );
- for ( var i = 0, il = boids.length; i < il; i++ ) {
+ for ( var i = 0, il = boids.length; i < il; i ++ ) {
boid = boids[ i ];
@@ -455,7 +454,7 @@
function render() {
- for ( var i = 0, il = birds.length; i < il; i++ ) {
+ for ( var i = 0, il = birds.length; i < il; i ++ ) {
boid = boids[ i ];
boid.run( boids );
@@ -469,7 +468,7 @@
bird.rotation.y = Math.atan2( - boid.velocity.z, boid.velocity.x );
bird.rotation.z = Math.asin( boid.velocity.y / boid.velocity.length() );
- bird.phase = ( bird.phase + ( Math.max( 0, bird.rotation.z ) + 0.1 ) ) % 62.83;
+ bird.phase = ( bird.phase + ( Math.max( 0, bird.rotation.z ) + 0.1 ) ) % 62.83;
bird.geometry.vertices[ 5 ].y = bird.geometry.vertices[ 4 ].y = Math.sin( bird.phase ) * 5;
} | true |
Other | mrdoob | three.js | e79b63e9db28426b9ebadb7342cd22034ace06ee.json | fix linter errors in canvas examples | examples/canvas_geometry_cube.html | @@ -37,7 +37,6 @@
var mouseXOnMouseDown = 0;
var windowHalfX = window.innerWidth / 2;
- var windowHalfY = window.innerHeight / 2;
init();
animate();
@@ -112,7 +111,6 @@
function onWindowResize() {
windowHalfX = window.innerWidth / 2;
- windowHalfY = window.innerHeight / 2;
camera.aspect = window.innerWidth / window.innerHeight;
camera.updateProjectionMatrix();
@@ -144,15 +142,15 @@
}
- function onDocumentMouseUp( event ) {
+ function onDocumentMouseUp() {
document.removeEventListener( 'mousemove', onDocumentMouseMove, false );
document.removeEventListener( 'mouseup', onDocumentMouseUp, false );
document.removeEventListener( 'mouseout', onDocumentMouseOut, false );
}
- function onDocumentMouseOut( event ) {
+ function onDocumentMouseOut() {
document.removeEventListener( 'mousemove', onDocumentMouseMove, false );
document.removeEventListener( 'mouseup', onDocumentMouseUp, false ); | true |
Other | mrdoob | three.js | e79b63e9db28426b9ebadb7342cd22034ace06ee.json | fix linter errors in canvas examples | examples/canvas_geometry_hierarchy.html | @@ -27,9 +27,7 @@
var container, stats;
- var camera, scene, renderer;
-
- var geometry, group;
+ var camera, scene, renderer, group;
var mouseX = 0, mouseY = 0;
@@ -99,7 +97,7 @@
}
- function onDocumentMouseMove(event) {
+ function onDocumentMouseMove( event ) {
mouseX = ( event.clientX - windowHalfX ) * 10;
mouseY = ( event.clientY - windowHalfY ) * 10; | true |
Other | mrdoob | three.js | e79b63e9db28426b9ebadb7342cd22034ace06ee.json | fix linter errors in canvas examples | examples/canvas_geometry_nurbs.html | @@ -49,7 +49,6 @@
var mouseXOnMouseDown = 0;
var windowHalfX = window.innerWidth / 2;
- var windowHalfY = window.innerHeight / 2;
init();
animate();
@@ -149,7 +148,6 @@
function onWindowResize() {
windowHalfX = window.innerWidth / 2;
- windowHalfY = window.innerHeight / 2;
camera.aspect = window.innerWidth / window.innerHeight;
camera.updateProjectionMatrix();
@@ -181,15 +179,15 @@
}
- function onDocumentMouseUp( event ) {
+ function onDocumentMouseUp() {
document.removeEventListener( 'mousemove', onDocumentMouseMove, false );
document.removeEventListener( 'mouseup', onDocumentMouseUp, false );
document.removeEventListener( 'mouseout', onDocumentMouseOut, false );
}
- function onDocumentMouseOut( event ) {
+ function onDocumentMouseOut() {
document.removeEventListener( 'mousemove', onDocumentMouseMove, false );
document.removeEventListener( 'mouseup', onDocumentMouseUp, false ); | true |
Other | mrdoob | three.js | e79b63e9db28426b9ebadb7342cd22034ace06ee.json | fix linter errors in canvas examples | examples/canvas_geometry_panorama.html | @@ -42,14 +42,11 @@
var camera, scene, renderer;
var texture_placeholder,
- isUserInteracting = false,
- onMouseDownMouseX = 0, onMouseDownMouseY = 0,
- onPointerDownPointerX = 0, onPointerDownPointerY = 0,
- onPointerDownLon = 0, onPointerDownLat = 0,
- lon = 90, onMouseDownLon = 0,
- lat = 0, onMouseDownLat = 0,
- phi = 0, theta = 0,
- target = new THREE.Vector3();
+ isUserInteracting = false,
+ onPointerDownPointerX = 0, onPointerDownPointerY = 0,
+ onPointerDownLon = 0, onPointerDownLat = 0,
+ lon = 90, lat = 0, phi = 0, theta = 0,
+ target = new THREE.Vector3();
init();
animate();
@@ -79,7 +76,7 @@
loadTexture( 'textures/cube/skybox/py.jpg' ), // top
loadTexture( 'textures/cube/skybox/ny.jpg' ), // bottom
loadTexture( 'textures/cube/skybox/pz.jpg' ), // back
- loadTexture( 'textures/cube/skybox/nz.jpg' ) // front
+ loadTexture( 'textures/cube/skybox/nz.jpg' ) // front
];
@@ -160,7 +157,7 @@
}
- function onDocumentMouseUp( event ) {
+ function onDocumentMouseUp() {
isUserInteracting = false;
@@ -199,8 +196,8 @@
event.preventDefault();
- lon = ( onPointerDownPointerX - event.touches[0].pageX ) * 0.1 + onPointerDownLon;
- lat = ( event.touches[0].pageY - onPointerDownPointerY ) * 0.1 + onPointerDownLat;
+ lon = ( onPointerDownPointerX - event.touches[ 0 ].pageX ) * 0.1 + onPointerDownLon;
+ lat = ( event.touches[ 0 ].pageY - onPointerDownPointerY ) * 0.1 + onPointerDownLat;
}
| true |
Other | mrdoob | three.js | e79b63e9db28426b9ebadb7342cd22034ace06ee.json | fix linter errors in canvas examples | examples/canvas_geometry_panorama_fisheye.html | @@ -42,14 +42,11 @@
var camera, scene, renderer;
var texture_placeholder,
- isUserInteracting = false,
- onMouseDownMouseX = 0, onMouseDownMouseY = 0,
- onPointerDownPointerX = 0, onPointerDownPointerY = 0,
- onPointerDownLon = 0, onPointerDownLat = 0,
- lon = 90, onMouseDownLon = 0,
- lat = 0, onMouseDownLat = 0,
- phi = 0, theta = 0,
- target = new THREE.Vector3();
+ isUserInteracting = false,
+ onPointerDownPointerX = 0, onPointerDownPointerY = 0,
+ onPointerDownLon = 0, onPointerDownLat = 0,
+ lon = 90, lat = 0, phi = 0, theta = 0,
+ target = new THREE.Vector3();
init();
animate();
@@ -168,9 +165,10 @@
lat = ( event.clientY - onPointerDownPointerY ) * 0.1 + onPointerDownLat;
}
+
}
- function onDocumentMouseUp( event ) {
+ function onDocumentMouseUp() {
isUserInteracting = false;
@@ -208,8 +206,8 @@
event.preventDefault();
- lon = ( onPointerDownPointerX - event.touches[0].pageX ) * 0.1 + onPointerDownLon;
- lat = ( event.touches[0].pageY - onPointerDownPointerY ) * 0.1 + onPointerDownLat;
+ lon = ( onPointerDownPointerX - event.touches[ 0 ].pageX ) * 0.1 + onPointerDownLon;
+ lat = ( event.touches[ 0 ].pageY - onPointerDownPointerY ) * 0.1 + onPointerDownLat;
}
| true |
Other | mrdoob | three.js | e79b63e9db28426b9ebadb7342cd22034ace06ee.json | fix linter errors in canvas examples | examples/canvas_geometry_shapes.html | @@ -36,9 +36,7 @@
var container, stats;
- var camera, scene, renderer;
-
- var group, text, plane;
+ var camera, scene, renderer, group;
var targetRotation = 0;
var targetRotationOnMouseDown = 0;
@@ -47,7 +45,6 @@
var mouseXOnMouseDown = 0;
var windowHalfX = window.innerWidth / 2;
- var windowHalfY = window.innerHeight / 2;
init();
animate();
@@ -100,39 +97,39 @@
var californiaPts = [];
- californiaPts.push( new THREE.Vector2 ( 610, 320 ) );
- californiaPts.push( new THREE.Vector2 ( 450, 300 ) );
- californiaPts.push( new THREE.Vector2 ( 392, 392 ) );
- californiaPts.push( new THREE.Vector2 ( 266, 438 ) );
- californiaPts.push( new THREE.Vector2 ( 190, 570 ) );
- californiaPts.push( new THREE.Vector2 ( 190, 600 ) );
- californiaPts.push( new THREE.Vector2 ( 160, 620 ) );
- californiaPts.push( new THREE.Vector2 ( 160, 650 ) );
- californiaPts.push( new THREE.Vector2 ( 180, 640 ) );
- californiaPts.push( new THREE.Vector2 ( 165, 680 ) );
- californiaPts.push( new THREE.Vector2 ( 150, 670 ) );
- californiaPts.push( new THREE.Vector2 ( 90, 737 ) );
- californiaPts.push( new THREE.Vector2 ( 80, 795 ) );
- californiaPts.push( new THREE.Vector2 ( 50, 835 ) );
- californiaPts.push( new THREE.Vector2 ( 64, 870 ) );
- californiaPts.push( new THREE.Vector2 ( 60, 945 ) );
- californiaPts.push( new THREE.Vector2 ( 300, 945 ) );
- californiaPts.push( new THREE.Vector2 ( 300, 743 ) );
- californiaPts.push( new THREE.Vector2 ( 600, 473 ) );
- californiaPts.push( new THREE.Vector2 ( 626, 425 ) );
- californiaPts.push( new THREE.Vector2 ( 600, 370 ) );
- californiaPts.push( new THREE.Vector2 ( 610, 320 ) );
+ californiaPts.push( new THREE.Vector2( 610, 320 ) );
+ californiaPts.push( new THREE.Vector2( 450, 300 ) );
+ californiaPts.push( new THREE.Vector2( 392, 392 ) );
+ californiaPts.push( new THREE.Vector2( 266, 438 ) );
+ californiaPts.push( new THREE.Vector2( 190, 570 ) );
+ californiaPts.push( new THREE.Vector2( 190, 600 ) );
+ californiaPts.push( new THREE.Vector2( 160, 620 ) );
+ californiaPts.push( new THREE.Vector2( 160, 650 ) );
+ californiaPts.push( new THREE.Vector2( 180, 640 ) );
+ californiaPts.push( new THREE.Vector2( 165, 680 ) );
+ californiaPts.push( new THREE.Vector2( 150, 670 ) );
+ californiaPts.push( new THREE.Vector2( 90, 737 ) );
+ californiaPts.push( new THREE.Vector2( 80, 795 ) );
+ californiaPts.push( new THREE.Vector2( 50, 835 ) );
+ californiaPts.push( new THREE.Vector2( 64, 870 ) );
+ californiaPts.push( new THREE.Vector2( 60, 945 ) );
+ californiaPts.push( new THREE.Vector2( 300, 945 ) );
+ californiaPts.push( new THREE.Vector2( 300, 743 ) );
+ californiaPts.push( new THREE.Vector2( 600, 473 ) );
+ californiaPts.push( new THREE.Vector2( 626, 425 ) );
+ californiaPts.push( new THREE.Vector2( 600, 370 ) );
+ californiaPts.push( new THREE.Vector2( 610, 320 ) );
var californiaShape = new THREE.Shape( californiaPts );
// Triangle
var triangleShape = new THREE.Shape();
- triangleShape.moveTo( 80, 20 );
- triangleShape.lineTo( 40, 80 );
+ triangleShape.moveTo( 80, 20 );
+ triangleShape.lineTo( 40, 80 );
triangleShape.lineTo( 120, 80 );
- triangleShape.lineTo( 80, 20 ); // close path
+ triangleShape.lineTo( 80, 20 ); // close path
// Heart
@@ -143,7 +140,7 @@
heartShape.moveTo( x + 25, y + 25 );
heartShape.bezierCurveTo( x + 25, y + 25, x + 20, y, x, y );
- heartShape.bezierCurveTo( x - 30, y, x - 30, y + 35,x - 30,y + 35 );
+ heartShape.bezierCurveTo( x - 30, y, x - 30, y + 35, x - 30, y + 35 );
heartShape.bezierCurveTo( x - 30, y + 55, x - 10, y + 77, x + 25, y + 95 );
heartShape.bezierCurveTo( x + 60, y + 77, x + 80, y + 55, x + 80, y + 35 );
heartShape.bezierCurveTo( x + 80, y + 35, x + 80, y, x + 50, y );
@@ -155,7 +152,7 @@
var sqLength = 80;
var squareShape = new THREE.Shape();
- squareShape.moveTo( 0,0 );
+ squareShape.moveTo( 0, 0 );
squareShape.lineTo( 0, sqLength );
squareShape.lineTo( sqLength, sqLength );
squareShape.lineTo( sqLength, 0 );
@@ -167,7 +164,7 @@
var rectLength = 120, rectWidth = 40;
var rectShape = new THREE.Shape();
- rectShape.moveTo( 0,0 );
+ rectShape.moveTo( 0, 0 );
rectShape.lineTo( 0, rectWidth );
rectShape.lineTo( rectLength, rectWidth );
rectShape.lineTo( rectLength, 0 );
@@ -178,12 +175,12 @@
var roundedRectShape = new THREE.Shape();
- ( function roundedRect( ctx, x, y, width, height, radius ){
+ ( function roundedRect( ctx, x, y, width, height, radius ) {
ctx.moveTo( x, y + radius );
ctx.lineTo( x, y + height - radius );
ctx.quadraticCurveTo( x, y + height, x + radius, y + height );
- ctx.lineTo( x + width - radius, y + height) ;
+ ctx.lineTo( x + width - radius, y + height );
ctx.quadraticCurveTo( x + width, y + height, x + width, y + height - radius );
ctx.lineTo( x + width, y + radius );
ctx.quadraticCurveTo( x + width, y, x + width - radius, y );
@@ -199,9 +196,9 @@
var circleShape = new THREE.Shape();
circleShape.moveTo( 0, circleRadius );
circleShape.quadraticCurveTo( circleRadius, circleRadius, circleRadius, 0 );
- circleShape.quadraticCurveTo( circleRadius, -circleRadius, 0, -circleRadius );
- circleShape.quadraticCurveTo( -circleRadius, -circleRadius, -circleRadius, 0 );
- circleShape.quadraticCurveTo( -circleRadius, circleRadius, 0, circleRadius );
+ circleShape.quadraticCurveTo( circleRadius, - circleRadius, 0, - circleRadius );
+ circleShape.quadraticCurveTo( - circleRadius, - circleRadius, - circleRadius, 0 );
+ circleShape.quadraticCurveTo( - circleRadius, circleRadius, 0, circleRadius );
// Fish
@@ -210,42 +207,42 @@
var fishShape = new THREE.Shape();
- fishShape.moveTo(x,y);
- fishShape.quadraticCurveTo(x + 50, y - 80, x + 90, y - 10);
- fishShape.quadraticCurveTo(x + 100, y - 10, x + 115, y - 40);
- fishShape.quadraticCurveTo(x + 115, y, x + 115, y + 40);
- fishShape.quadraticCurveTo(x + 100, y + 10, x + 90, y + 10);
- fishShape.quadraticCurveTo(x + 50, y + 80, x, y);
+ fishShape.moveTo( x, y );
+ fishShape.quadraticCurveTo( x + 50, y - 80, x + 90, y - 10 );
+ fishShape.quadraticCurveTo( x + 100, y - 10, x + 115, y - 40 );
+ fishShape.quadraticCurveTo( x + 115, y, x + 115, y + 40 );
+ fishShape.quadraticCurveTo( x + 100, y + 10, x + 90, y + 10 );
+ fishShape.quadraticCurveTo( x + 50, y + 80, x, y );
// Arc circle
var arcShape = new THREE.Shape();
arcShape.moveTo( 50, 10 );
- arcShape.absarc( 10, 10, 40, 0, Math.PI*2, false );
+ arcShape.absarc( 10, 10, 40, 0, Math.PI * 2, false );
var holePath = new THREE.Path();
holePath.moveTo( 20, 10 );
- holePath.absarc( 10, 10, 10, 0, Math.PI*2, true );
+ holePath.absarc( 10, 10, 10, 0, Math.PI * 2, true );
arcShape.holes.push( holePath );
// Smiley
var smileyShape = new THREE.Shape();
smileyShape.moveTo( 80, 40 );
- smileyShape.absarc( 40, 40, 40, 0, Math.PI*2, false );
+ smileyShape.absarc( 40, 40, 40, 0, Math.PI * 2, false );
var smileyEye1Path = new THREE.Path();
smileyEye1Path.moveTo( 35, 20 );
// smileyEye1Path.absarc( 25, 20, 10, 0, Math.PI*2, true );
- smileyEye1Path.absellipse( 25, 20, 10, 10, 0, Math.PI*2, true );
+ smileyEye1Path.absellipse( 25, 20, 10, 10, 0, Math.PI * 2, true );
smileyShape.holes.push( smileyEye1Path );
var smileyEye2Path = new THREE.Path();
smileyEye2Path.moveTo( 65, 20 );
- smileyEye2Path.absarc( 55, 20, 10, 0, Math.PI*2, true );
+ smileyEye2Path.absarc( 55, 20, 10, 0, Math.PI * 2, true );
smileyShape.holes.push( smileyEye2Path );
var smileyMouthPath = new THREE.Path();
@@ -268,28 +265,28 @@
// Spline shape + path extrusion
var splinepts = [];
- splinepts.push( new THREE.Vector2 ( 350, 100 ) );
- splinepts.push( new THREE.Vector2 ( 400, 450 ) );
- splinepts.push( new THREE.Vector2 ( -140, 350 ) );
- splinepts.push( new THREE.Vector2 ( 0, 0 ) );
+ splinepts.push( new THREE.Vector2( 350, 100 ) );
+ splinepts.push( new THREE.Vector2( 400, 450 ) );
+ splinepts.push( new THREE.Vector2( - 140, 350 ) );
+ splinepts.push( new THREE.Vector2( 0, 0 ) );
- var splineShape = new THREE.Shape( );
+ var splineShape = new THREE.Shape( );
splineShape.moveTo( 0, 0 );
splineShape.splineThru( splinepts );
// addShape( shape, color, x, y, z, rx, ry,rz, s );
- addShape( californiaShape, 0xffaa00, -300, -100, 0, 0, 0, 0, 0.25 );
- addShape( triangleShape, 0xffee00, -180, 0, 0, 0, 0, 0, 1 );
- addShape( roundedRectShape, 0x005500, -150, 150, 0, 0, 0, 0, 1 );
+ addShape( californiaShape, 0xffaa00, - 300, - 100, 0, 0, 0, 0, 0.25 );
+ addShape( triangleShape, 0xffee00, - 180, 0, 0, 0, 0, 0, 1 );
+ addShape( roundedRectShape, 0x005500, - 150, 150, 0, 0, 0, 0, 1 );
addShape( squareShape, 0x0055ff, 150, 100, 0, 0, 0, 0, 1 );
addShape( heartShape, 0xff1100, 60, 100, 0, 0, 0, Math.PI, 1 );
addShape( circleShape, 0x00ff11, 120, 250, 0, 0, 0, 0, 1 );
- addShape( fishShape, 0x222222, -60, 200, 0, 0, 0, 0, 1 );
- addShape( smileyShape, 0xee00ff, -200, 250, 0, 0, 0, Math.PI, 1 );
+ addShape( fishShape, 0x222222, - 60, 200, 0, 0, 0, 0, 1 );
+ addShape( smileyShape, 0xee00ff, - 200, 250, 0, 0, 0, Math.PI, 1 );
addShape( arcShape, 0xbb4422, 150, 0, 0, 0, 0, 0, 1 );
- addShape( splineShape, 0x888888, -50, -100, 0, 0, 0, 0, 0.2 );
+ addShape( splineShape, 0x888888, - 50, - 100, 0, 0, 0, 0, 0.2 );
//
@@ -315,7 +312,6 @@
function onWindowResize() {
windowHalfX = window.innerWidth / 2;
- windowHalfY = window.innerHeight / 2;
camera.aspect = window.innerWidth / window.innerHeight;
camera.updateProjectionMatrix();
@@ -347,15 +343,15 @@
}
- function onDocumentMouseUp( event ) {
+ function onDocumentMouseUp() {
document.removeEventListener( 'mousemove', onDocumentMouseMove, false );
document.removeEventListener( 'mouseup', onDocumentMouseUp, false );
document.removeEventListener( 'mouseout', onDocumentMouseOut, false );
}
- function onDocumentMouseOut( event ) {
+ function onDocumentMouseOut() {
document.removeEventListener( 'mousemove', onDocumentMouseMove, false );
document.removeEventListener( 'mouseup', onDocumentMouseUp, false ); | true |
Other | mrdoob | three.js | e79b63e9db28426b9ebadb7342cd22034ace06ee.json | fix linter errors in canvas examples | examples/canvas_geometry_text.html | @@ -39,7 +39,6 @@
var mouseXOnMouseDown = 0;
var windowHalfX = window.innerWidth / 2;
- var windowHalfY = window.innerHeight / 2;
var loader = new THREE.FontLoader();
loader.load( 'fonts/helvetiker_regular.typeface.json', function ( font ) {
@@ -87,11 +86,11 @@
height: 20,
curveSegments: 2
- });
+ } );
geometry.computeBoundingBox();
- var centerOffset = -0.5 * ( geometry.boundingBox.max.x - geometry.boundingBox.min.x );
+ var centerOffset = - 0.5 * ( geometry.boundingBox.max.x - geometry.boundingBox.min.x );
var materials = [
new THREE.MeshBasicMaterial( { color: Math.random() * 0xffffff, overdraw: 0.5 } ),
@@ -133,7 +132,6 @@
function onWindowResize() {
windowHalfX = window.innerWidth / 2;
- windowHalfY = window.innerHeight / 2;
camera.aspect = window.innerWidth / window.innerHeight;
camera.updateProjectionMatrix();
@@ -165,15 +163,15 @@
}
- function onDocumentMouseUp( event ) {
+ function onDocumentMouseUp() {
document.removeEventListener( 'mousemove', onDocumentMouseMove, false );
document.removeEventListener( 'mouseup', onDocumentMouseUp, false );
document.removeEventListener( 'mouseout', onDocumentMouseOut, false );
}
- function onDocumentMouseOut( event ) {
+ function onDocumentMouseOut() {
document.removeEventListener( 'mousemove', onDocumentMouseMove, false );
document.removeEventListener( 'mouseup', onDocumentMouseUp, false ); | true |
Other | mrdoob | three.js | e79b63e9db28426b9ebadb7342cd22034ace06ee.json | fix linter errors in canvas examples | examples/canvas_interactive_cubes.html | @@ -127,8 +127,8 @@
event.preventDefault();
- event.clientX = event.touches[0].clientX;
- event.clientY = event.touches[0].clientY;
+ event.clientX = event.touches[ 0 ].clientX;
+ event.clientY = event.touches[ 0 ].clientY;
onDocumentMouseDown( event );
}
@@ -163,6 +163,7 @@
}
*/
+
}
// | true |
Other | mrdoob | three.js | e79b63e9db28426b9ebadb7342cd22034ace06ee.json | fix linter errors in canvas examples | examples/canvas_interactive_cubes_tween.html | @@ -27,7 +27,7 @@
var container, stats;
var camera, scene, renderer;
-
+
var raycaster;
var mouse;
@@ -71,16 +71,16 @@
scene.add( object );
}
-
+
//
-
+
raycaster = new THREE.Raycaster();
mouse = new THREE.Vector2();
renderer = new THREE.CanvasRenderer();
renderer.setPixelRatio( window.devicePixelRatio );
renderer.setSize( window.innerWidth, window.innerHeight );
- container.appendChild(renderer.domElement);
+ container.appendChild( renderer.domElement );
stats = new Stats();
container.appendChild( stats.dom );
@@ -102,16 +102,16 @@
renderer.setSize( window.innerWidth, window.innerHeight );
}
-
+
function onDocumentTouchStart( event ) {
-
+
event.preventDefault();
-
- event.clientX = event.touches[0].clientX;
- event.clientY = event.touches[0].clientY;
+
+ event.clientX = event.touches[ 0 ].clientX;
+ event.clientY = event.touches[ 0 ].clientY;
onDocumentMouseDown( event );
- }
+ }
function onDocumentMouseDown( event ) {
@@ -130,13 +130,13 @@
x: Math.random() * 800 - 400,
y: Math.random() * 800 - 400,
z: Math.random() * 800 - 400 }, 2000 )
- .easing( TWEEN.Easing.Elastic.Out).start();
+ .easing( TWEEN.Easing.Elastic.Out ).start();
new TWEEN.Tween( intersects[ 0 ].object.rotation ).to( {
x: Math.random() * 2 * Math.PI,
y: Math.random() * 2 * Math.PI,
z: Math.random() * 2 * Math.PI }, 2000 )
- .easing( TWEEN.Easing.Elastic.Out).start();
+ .easing( TWEEN.Easing.Elastic.Out ).start();
}
@@ -148,6 +148,7 @@
}
*/
+
}
// | true |
Other | mrdoob | three.js | e79b63e9db28426b9ebadb7342cd22034ace06ee.json | fix linter errors in canvas examples | examples/canvas_interactive_voxelpainter.html | @@ -96,7 +96,7 @@
renderer = new THREE.CanvasRenderer();
renderer.setPixelRatio( window.devicePixelRatio );
renderer.setSize( window.innerWidth, window.innerHeight );
- container.appendChild(renderer.domElement);
+ container.appendChild( renderer.domElement );
document.addEventListener( 'mousedown', onDocumentMouseDown, false );
document.addEventListener( 'keydown', onDocumentKeyDown, false );
@@ -163,7 +163,7 @@
function onDocumentKeyDown( event ) {
- switch( event.keyCode ) {
+ switch ( event.keyCode ) {
case 16: isShiftDown = true; break;
@@ -173,16 +173,17 @@
function onDocumentKeyUp( event ) {
- switch( event.keyCode ) {
+ switch ( event.keyCode ) {
case 16: isShiftDown = false; break;
}
+
}
function save() {
- window.open( renderer.domElement.toDataURL('image/png'), 'mywindow' );
+ window.open( renderer.domElement.toDataURL( 'image/png' ), 'mywindow' );
return false;
} | true |
Other | mrdoob | three.js | e79b63e9db28426b9ebadb7342cd22034ace06ee.json | fix linter errors in canvas examples | examples/canvas_lights_pointlights.html | @@ -47,8 +47,8 @@
<script>
var camera, scene, renderer,
- light1, light2, light3,
- loader, mesh;
+ light1, light2, light3,
+ loader, mesh;
init();
animate(); | true |
Other | mrdoob | three.js | e79b63e9db28426b9ebadb7342cd22034ace06ee.json | fix linter errors in canvas examples | examples/canvas_lines.html | @@ -26,19 +26,18 @@
<script>
var mouseX = 0, mouseY = 0,
+ windowHalfX = window.innerWidth / 2,
+ windowHalfY = window.innerHeight / 2,
- windowHalfX = window.innerWidth / 2,
- windowHalfY = window.innerHeight / 2,
-
- camera, scene, renderer;
+ camera, scene, renderer;
init();
animate();
function init() {
- var container = document.createElement('div');
- document.body.appendChild(container);
+ var container = document.createElement( 'div' );
+ document.body.appendChild( container );
camera = new THREE.PerspectiveCamera( 75, window.innerWidth / window.innerHeight, 1, 10000 );
camera.position.z = 100;
@@ -114,7 +113,7 @@
//
- function onDocumentMouseMove(event) {
+ function onDocumentMouseMove( event ) {
mouseX = event.clientX - windowHalfX;
mouseY = event.clientY - windowHalfY; | true |
Other | mrdoob | three.js | e79b63e9db28426b9ebadb7342cd22034ace06ee.json | fix linter errors in canvas examples | examples/canvas_lines_colors.html | @@ -202,6 +202,7 @@
mouseX = event.touches[ 0 ].pageX - windowHalfX;
mouseY = event.touches[ 0 ].pageY - windowHalfY;
+
}
}
@@ -230,7 +231,7 @@
if ( object.isLine ) {
- object.rotation.y = time * ( i % 2 ? 1 : -1 );
+ object.rotation.y = time * ( i % 2 ? 1 : - 1 );
}
| true |
Other | mrdoob | three.js | e79b63e9db28426b9ebadb7342cd22034ace06ee.json | fix linter errors in canvas examples | examples/canvas_lines_dashed.html | @@ -61,7 +61,7 @@
var subdivisions = 3;
var recursion = 1;
- var points = hilbert3D( new THREE.Vector3( 0,0,0 ), 25.0, recursion, 0, 1, 2, 3, 4, 5, 6, 7 );
+ var points = hilbert3D( new THREE.Vector3( 0, 0, 0 ), 25.0, recursion, 0, 1, 2, 3, 4, 5, 6, 7 );
var spline = new THREE.CatmullRomCurve3( points );
var samples = spline.getPoints( points.length * subdivisions ); | true |
Other | mrdoob | three.js | e79b63e9db28426b9ebadb7342cd22034ace06ee.json | fix linter errors in canvas examples | examples/canvas_materials.html | @@ -34,8 +34,8 @@
function init() {
- container = document.createElement('div');
- document.body.appendChild(container);
+ container = document.createElement( 'div' );
+ document.body.appendChild( container );
camera = new THREE.PerspectiveCamera( 45, window.innerWidth / window.innerHeight, 1, 2000 );
camera.position.set( 0, 200, 800 );
@@ -132,7 +132,7 @@
container.appendChild( renderer.domElement );
stats = new Stats();
- container.appendChild(stats.dom);
+ container.appendChild( stats.dom );
//
@@ -149,20 +149,6 @@
}
- function loadImage( path ) {
-
- var image = document.createElement( 'img' );
- var texture = new THREE.Texture( image, THREE.UVMapping );
-
- image.onload = function () { texture.needsUpdate = true; };
- image.src = path;
-
- return texture;
-
- }
-
- //
-
function animate() {
requestAnimationFrame( animate );
@@ -180,7 +166,7 @@
camera.position.z = Math.sin( timer ) * 1000;
camera.lookAt( scene.position );
- for ( var i = 0, l = objects.length; i < l; i++ ) {
+ for ( var i = 0, l = objects.length; i < l; i ++ ) {
var object = objects[ i ];
| true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.