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 | d64351575ab16ebd4aa86211f1897760d9bf04be.json | Upgrade dev dependencies. | examples/jsm/utils/GeometryCompressionUtils.js | @@ -58,7 +58,7 @@ var GeometryCompressionUtils = {
let result;
if ( encodeMethod == "DEFAULT" ) {
- // TODO: Add 1 byte to the result, making the encoded length to be 4 bytes.
+ // TODO: Add 1 byte to the result, making the encoded length to be 4 bytes.
result = new Uint8Array( count * 3 );
for ( let idx = 0; idx < array.length; idx += 3 ) {
@@ -268,7 +268,7 @@ var GeometryCompressionUtils = {
let array = uvs.array;
- for ( let i = 0; i < array.length; i++ ) {
+ for ( let i = 0; i < array.length; i ++ ) {
range.min = Math.min( range.min, array[ i ] );
range.max = Math.max( range.max, array[ i ] );
@@ -838,7 +838,7 @@ function PackedPhongMaterial( parameters ) {
"}",
].join( "\n" );
- // Use the original MeshPhongMaterial's fragmentShader.
+ // Use the original MeshPhongMaterial's fragmentShader.
this.fragmentShader = [
"#define PHONG",
| true |
Other | mrdoob | three.js | d64351575ab16ebd4aa86211f1897760d9bf04be.json | Upgrade dev dependencies. | package-lock.json | @@ -1,6 +1,6 @@
{
"name": "three",
- "version": "0.113.2",
+ "version": "0.114.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -30,12 +30,6 @@
"integrity": "sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==",
"dev": true
},
- "@types/estree": {
- "version": "0.0.41",
- "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.41.tgz",
- "integrity": "sha512-rIAmXyJlqw4KEBO7+u9gxZZSQHaCNnIzYrnNmYVpgfJhxTqO0brCX0SYpqUTkVI5mwwUwzmtspLBGBKroMeynA==",
- "dev": true
- },
"@types/json-schema": {
"version": "7.0.4",
"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.4.tgz",
@@ -48,65 +42,53 @@
"integrity": "sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM=",
"dev": true
},
- "@types/node": {
- "version": "13.1.4",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-13.1.4.tgz",
- "integrity": "sha512-Lue/mlp2egZJoHXZr4LndxDAd7i/7SQYhV0EjWfb/a4/OZ6tuVwMCVPiwkU5nsEipxEf7hmkSU7Em5VQ8P5NGA==",
- "dev": true
- },
- "@types/webgl2": {
- "version": "0.0.5",
- "resolved": "https://registry.npmjs.org/@types/webgl2/-/webgl2-0.0.5.tgz",
- "integrity": "sha512-oGaKsBbxQOY5+aJFV3KECDhGaXt+yZJt2y/OZsnQGLRkH6Fvr7rv4pCt3SRH1somIHfej/c4u7NSpCyd9x+1Ow==",
- "dev": true
- },
"@typescript-eslint/eslint-plugin": {
- "version": "2.15.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.15.0.tgz",
- "integrity": "sha512-XRJFznI5v4K1WvIrWmjFjBAdQWaUTz4xJEdqR7+wAFsv6Q9dP3mOlE6BMNT3pdlp9eF1+bC5m5LZTmLMqffCVw==",
+ "version": "2.23.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.23.0.tgz",
+ "integrity": "sha512-8iA4FvRsz8qTjR0L/nK9RcRUN3QtIHQiOm69FzV7WS3SE+7P7DyGGwh3k4UNR2JBbk+Ej2Io+jLAaqKibNhmtw==",
"dev": true,
"requires": {
- "@typescript-eslint/experimental-utils": "2.15.0",
+ "@typescript-eslint/experimental-utils": "2.23.0",
"eslint-utils": "^1.4.3",
"functional-red-black-tree": "^1.0.1",
"regexpp": "^3.0.0",
"tsutils": "^3.17.1"
}
},
"@typescript-eslint/experimental-utils": {
- "version": "2.15.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.15.0.tgz",
- "integrity": "sha512-Qkxu5zndY5hqlcQkmA88gfLvqQulMpX/TN91XC7OuXsRf4XG5xLGie0sbpX97o/oeccjeZYRMipIsjKk/tjDHA==",
+ "version": "2.23.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.23.0.tgz",
+ "integrity": "sha512-OswxY59RcXH3NNPmq+4Kis2CYZPurRU6mG5xPcn24CjFyfdVli5mySwZz/g/xDbJXgDsYqNGq7enV0IziWGXVQ==",
"dev": true,
"requires": {
"@types/json-schema": "^7.0.3",
- "@typescript-eslint/typescript-estree": "2.15.0",
+ "@typescript-eslint/typescript-estree": "2.23.0",
"eslint-scope": "^5.0.0"
}
},
"@typescript-eslint/parser": {
- "version": "2.15.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.15.0.tgz",
- "integrity": "sha512-6iSgQsqAYTaHw59t0tdjzZJluRAjswdGltzKEdLtcJOxR2UVTPHYvZRqkAVGCkaMVb6Fpa60NnuozNCvsSpA9g==",
+ "version": "2.23.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.23.0.tgz",
+ "integrity": "sha512-k61pn/Nepk43qa1oLMiyqApC6x5eP5ddPz6VUYXCAuXxbmRLqkPYzkFRKl42ltxzB2luvejlVncrEpflgQoSUg==",
"dev": true,
"requires": {
"@types/eslint-visitor-keys": "^1.0.0",
- "@typescript-eslint/experimental-utils": "2.15.0",
- "@typescript-eslint/typescript-estree": "2.15.0",
+ "@typescript-eslint/experimental-utils": "2.23.0",
+ "@typescript-eslint/typescript-estree": "2.23.0",
"eslint-visitor-keys": "^1.1.0"
}
},
"@typescript-eslint/typescript-estree": {
- "version": "2.15.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.15.0.tgz",
- "integrity": "sha512-L6Pog+w3VZzXkAdyqA0VlwybF8WcwZX+mufso86CMxSdWmcizJ38lgBdpqTbc9bo92iyi0rOvmATKiwl+amjxg==",
+ "version": "2.23.0",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.23.0.tgz",
+ "integrity": "sha512-pmf7IlmvXdlEXvE/JWNNJpEvwBV59wtJqA8MLAxMKLXNKVRC3HZBXR/SlZLPWTCcwOSg9IM7GeRSV3SIerGVqw==",
"dev": true,
"requires": {
"debug": "^4.1.1",
"eslint-visitor-keys": "^1.1.0",
"glob": "^7.1.6",
"is-glob": "^4.0.1",
- "lodash.unescape": "4.0.1",
+ "lodash": "^4.17.15",
"semver": "^6.3.0",
"tsutils": "^3.17.1"
}
@@ -1187,6 +1169,13 @@
"integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
"dev": true
},
+ "fsevents": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz",
+ "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==",
+ "dev": true,
+ "optional": true
+ },
"functional-red-black-tree": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
@@ -1244,60 +1233,60 @@
}
},
"google-closure-compiler": {
- "version": "20200101.0.0",
- "resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20200101.0.0.tgz",
- "integrity": "sha512-UVDxedg7jbi1F+R4KSWezIZcjB4+4EJSvd2Tf/+J8vw5+6BjBFaIv5E3vy9nTpSXorKIUheJPzE+lt9GRc3Fdg==",
+ "version": "20200224.0.0",
+ "resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20200224.0.0.tgz",
+ "integrity": "sha512-V81dRYygdHbZtOtU16VX26xAdJBB1UZyfSg3OTzdNl3l/xEIx1D/L7TYUqjeTXsxcy+JruJ/UfUlIJAOaMRTog==",
"dev": true,
"requires": {
"chalk": "2.x",
- "google-closure-compiler-java": "^20200101.0.0",
- "google-closure-compiler-js": "^20200101.0.0",
- "google-closure-compiler-linux": "^20200101.0.0",
- "google-closure-compiler-osx": "^20200101.0.0",
- "google-closure-compiler-windows": "^20200101.0.0",
+ "google-closure-compiler-java": "^20200224.0.0",
+ "google-closure-compiler-js": "^20200224.0.0",
+ "google-closure-compiler-linux": "^20200224.0.0",
+ "google-closure-compiler-osx": "^20200224.0.0",
+ "google-closure-compiler-windows": "^20200224.0.0",
"minimist": "1.x",
"vinyl": "2.x",
"vinyl-sourcemaps-apply": "^0.2.0"
},
"dependencies": {
"minimist": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
- "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+ "version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.4.tgz",
+ "integrity": "sha512-wTiNDqe4D2rbTJGZk1qcdZgFtY0/r+iuE6GDT7V0/+Gu5MLpIDm4+CssDECR79OJs/OxLPXMzdxy153b5Qy3hg==",
"dev": true
}
}
},
"google-closure-compiler-java": {
- "version": "20200101.0.0",
- "resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20200101.0.0.tgz",
- "integrity": "sha512-hW4FjcEO3wAu7p/Cz8zwQIggvVio0SmnVzImukK8A6suAyHLiLDX5vhFPC31a/jyZ8uxfUSEImWrt/SFdKt0eA==",
+ "version": "20200224.0.0",
+ "resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20200224.0.0.tgz",
+ "integrity": "sha512-palFcDoScauZjWIsGDzMK6h+IctcRb55I3wJX8Ko/DTSz72xwadRdKm0lGt8OoYL7SKEO+IjgD7s8XrAGpLnlQ==",
"dev": true
},
"google-closure-compiler-js": {
- "version": "20200101.0.0",
- "resolved": "https://registry.npmjs.org/google-closure-compiler-js/-/google-closure-compiler-js-20200101.0.0.tgz",
- "integrity": "sha512-0PdYhSU2FWkLU7eUg+0+BlnJHcGLMhWB69SzQ/0z7qBES/tuor7ruHi7HUopKaxQwhblC4DtDb8IDinieY+R1w==",
+ "version": "20200224.0.0",
+ "resolved": "https://registry.npmjs.org/google-closure-compiler-js/-/google-closure-compiler-js-20200224.0.0.tgz",
+ "integrity": "sha512-70VKN0kbnTRtu2dqxDjWZQGfEQIHj7b7oUUCsYPO5oEXCDfgxNc13oYUJXvrTONLRWlHCNl/I8FNrVOwZ3gY/g==",
"dev": true
},
"google-closure-compiler-linux": {
- "version": "20200101.0.0",
- "resolved": "https://registry.npmjs.org/google-closure-compiler-linux/-/google-closure-compiler-linux-20200101.0.0.tgz",
- "integrity": "sha512-8S1WMbRPrBXV6SUi0DyzHa9EPmyNJ8FcBUG3tIrS6hoQIP71kZl+TrSOwwUAZYKf7KhXl41P3HPMFnI4LXbtrw==",
+ "version": "20200224.0.0",
+ "resolved": "https://registry.npmjs.org/google-closure-compiler-linux/-/google-closure-compiler-linux-20200224.0.0.tgz",
+ "integrity": "sha512-/BaE889EPrXWOKJVolA9++e99xBDMzeFBf7zF7nBB8PUmU5DlvtsoLL82xnT6nbZC1ktHaETlVx+vYGju8zKBQ==",
"dev": true,
"optional": true
},
"google-closure-compiler-osx": {
- "version": "20200101.0.0",
- "resolved": "https://registry.npmjs.org/google-closure-compiler-osx/-/google-closure-compiler-osx-20200101.0.0.tgz",
- "integrity": "sha512-rZh2+4/JwhKLVSwOWKBp+WJnLZCfOq6MQW06ayulhvq3WjJ0Ny9XZTpLUKiEbnMQf7+ARcFb8zIeiUp0Q2aFqg==",
+ "version": "20200224.0.0",
+ "resolved": "https://registry.npmjs.org/google-closure-compiler-osx/-/google-closure-compiler-osx-20200224.0.0.tgz",
+ "integrity": "sha512-WXVNW9nPUqjvCe38mUIlBGEPVPCTKLtdaXC+q+kQdonkJFHNrpdyYWa746Y8cNP/byQyDNpPsqcKseZTLh17sQ==",
"dev": true,
"optional": true
},
"google-closure-compiler-windows": {
- "version": "20200101.0.0",
- "resolved": "https://registry.npmjs.org/google-closure-compiler-windows/-/google-closure-compiler-windows-20200101.0.0.tgz",
- "integrity": "sha512-WcH6BPPSiQq1NnOO7PxKfS0FZ+mQRz4pIoRkrItafTKXWtBCL5NZWd8BjPayBJKxsmoiVFsOpkjzLe8ryBXciQ==",
+ "version": "20200224.0.0",
+ "resolved": "https://registry.npmjs.org/google-closure-compiler-windows/-/google-closure-compiler-windows-20200224.0.0.tgz",
+ "integrity": "sha512-l6w2D8r9+GC9CQTAYEMAuNI996Zb6YV5qG7+FR0gCoL6h6S3Mc7mi87bafgwaicsVcmmHE/9kCBuW4ZyTMs5Fg==",
"dev": true,
"optional": true
},
@@ -1726,12 +1715,6 @@
"integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
"dev": true
},
- "lodash.unescape": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/lodash.unescape/-/lodash.unescape-4.0.1.tgz",
- "integrity": "sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=",
- "dev": true
- },
"lru-cache": {
"version": "4.1.5",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
@@ -1795,7 +1778,7 @@
},
"mkdirp": {
"version": "0.5.1",
- "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+ "resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
"dev": true,
"requires": {
@@ -1941,7 +1924,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
},
@@ -2008,7 +1991,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
},
@@ -2349,14 +2332,12 @@
}
},
"rollup": {
- "version": "1.28.0",
- "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.28.0.tgz",
- "integrity": "sha512-v2J/DmQi9+Nf6frGqzwZRvbiuTTrqH0yzoUF4Eybf8sONT4UpLZzJYnYzW96Zm9X1+4SJmijfnFBWCzHDAXYnQ==",
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.0.5.tgz",
+ "integrity": "sha512-bECGz+RYpw3NYCvLnABu3REUROYbnZsfQZA37ekm/KlgKt/fyxBNN4waBnlLwzx4r6jNBs56SbTn7PEgJjw3fQ==",
"dev": true,
"requires": {
- "@types/estree": "*",
- "@types/node": "*",
- "acorn": "^7.1.0"
+ "fsevents": "~2.1.2"
}
},
"rollup-plugin-buble": {
@@ -2682,7 +2663,7 @@
},
"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
},
@@ -2768,9 +2749,9 @@
"dev": true
},
"typescript": {
- "version": "3.7.4",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.4.tgz",
- "integrity": "sha512-A25xv5XCtarLwXpcDNZzCGvW2D1S3/bACratYBx2sax8PefsFhlYmkQicKHvpYflFS8if4zne5zT5kpJ7pzuvw==",
+ "version": "3.8.3",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz",
+ "integrity": "sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==",
"dev": true
},
"unicode-canonical-property-names-ecmascript": { | true |
Other | mrdoob | three.js | d64351575ab16ebd4aa86211f1897760d9bf04be.json | Upgrade dev dependencies. | package.json | @@ -74,26 +74,25 @@
},
"homepage": "https://threejs.org/",
"devDependencies": {
- "@types/webgl2": "^0.0.5",
- "@typescript-eslint/eslint-plugin": "^2.15.0",
- "@typescript-eslint/parser": "^2.15.0",
+ "@typescript-eslint/eslint-plugin": "^2.23.0",
+ "@typescript-eslint/parser": "^2.23.0",
"concurrently": "^5.0.2",
"cross-env": "^7.0.0",
"eslint": "^6.8.0",
"eslint-config-mdcs": "^4.2.3",
"eslint-plugin-html": "^6.0.0",
"failonlyreporter": "^1.0.0",
- "google-closure-compiler": "20200101.0.0",
+ "google-closure-compiler": "20200224.0.0",
"http-server": "^0.12.1",
"image-output": "2.4.1",
"pixelmatch": "5.1.0",
"pngjs": "3.4.0",
"puppeteer": "^2.1.1",
"qunit": "^2.9.3",
- "rollup": "^1.28.0",
+ "rollup": "^2.0.5",
"rollup-plugin-buble": "^0.19.8",
"serve-handler": "^6.1.2",
- "typescript": "^3.7.4"
+ "typescript": "^3.8.3"
},
"jspm": {
"files": [ | true |
Other | mrdoob | three.js | d64351575ab16ebd4aa86211f1897760d9bf04be.json | Upgrade dev dependencies. | src/materials/LineDashedMaterial.d.ts | @@ -1,4 +1,3 @@
-import { Color } from './../math/Color';
import { LineBasicMaterial, LineBasicMaterialParameters } from './LineBasicMaterial';
export interface LineDashedMaterialParameters extends LineBasicMaterialParameters { | true |
Other | mrdoob | three.js | d64351575ab16ebd4aa86211f1897760d9bf04be.json | Upgrade dev dependencies. | utils/build/tsconfig-examples.lint.json | @@ -1,6 +1,7 @@
{
"compilerOptions": {
"noEmit": true,
+ "target": "ES6"
},
"include": [
"../../examples/jsm/**/*.ts" | true |
Other | mrdoob | three.js | d64351575ab16ebd4aa86211f1897760d9bf04be.json | Upgrade dev dependencies. | utils/build/tsconfig.lint.json | @@ -1,6 +1,7 @@
{
"compilerOptions": {
"noEmit": true,
+ "target": "ES6"
},
"include": [
"../../src/**/*.ts" | true |
Other | mrdoob | three.js | dc136b6082269d125da004d16ac665ed37bb87ab.json | remove extraneous plus in shader chunk | src/renderers/shaders/ShaderChunk/shadowmap_pars_fragment.glsl.js | @@ -146,7 +146,7 @@ export default /* glsl */`
texture2DCompare( shadowMap, uv + vec2( 2.0 * dx, -dy ), shadowCoord.z ),
f.x ),
mix( texture2DCompare( shadowMap, uv + vec2( -dx, 2.0 * dy ), shadowCoord.z ),
- texture2DCompare( shadowMap, uv + + vec2( 2.0 * dx, 2.0 * dy ), shadowCoord.z ),
+ texture2DCompare( shadowMap, uv + vec2( 2.0 * dx, 2.0 * dy ), shadowCoord.z ),
f.x ),
f.y )
) * ( 1.0 / 9.0 ); | false |
Other | mrdoob | three.js | 4c91e53687252e2b7f5e59c9325c229a0aa758c5.json | run eslint on simplehttpserver | utils/servers/simplehttpserver.js | @@ -30,7 +30,7 @@ var port = 8000,
"mp4": "video/mp4",
"txt": "text/plain",
"bin": "application/octet-stream"
- };
+ };
// https://github.com/parshap/node-sanitize-filename/blob/master/index.js#L33-L47
var illegalRe = /[\?<>:\*\|":]/g;
@@ -39,15 +39,17 @@ var reservedRe = /^\.+$/;
var windowsReservedRe = /^(con|prn|aux|nul|com[0-9]|lpt[0-9])(\..*)?$/i;
var windowsTrailingRe = /[\. ]+$/;
-function sanitize(input) {
- var sanitized = input
- .replace(/\//g, "\\")
- .replace(illegalRe, "")
- .replace(controlRe, "")
- .replace(reservedRe, "")
- .replace(windowsReservedRe, "")
- .replace(windowsTrailingRe, "");
- return sanitized;
+function sanitize( input ) {
+
+ var sanitized = input
+ .replace( /\//g, "\\" )
+ .replace( illegalRe, "" )
+ .replace( controlRe, "" )
+ .replace( reservedRe, "" )
+ .replace( windowsReservedRe, "" )
+ .replace( windowsTrailingRe, "" );
+ return sanitized;
+
}
@@ -56,8 +58,8 @@ port = process.argv[ 2 ] ? parseInt( process.argv[ 2 ], 0 ) : port;
function handleRequest( request, response ) {
- var urlObject = urlParser.parse( request.url, true );
- var pathname = decodeURIComponent( sanitize( urlObject.pathname ) );
+ var urlObject = urlParser.parse( request.url, true );
+ var pathname = decodeURIComponent( sanitize( urlObject.pathname ) );
console.log( '[' + ( new Date() ).toUTCString() + '] ' + '"' + request.method + ' ' + pathname + '"' );
@@ -119,7 +121,7 @@ function handleRequest( request, response ) {
files.forEach( function ( item ) {
var urlpath = path.join( pathname, item ),
- itemStats = fs.statSync( path.join( currentDir, urlpath ) );
+ itemStats = fs.statSync( path.join( currentDir, urlpath ) );
if ( itemStats.isDirectory() ) {
@@ -144,7 +146,7 @@ function handleRequest( request, response ) {
http.createServer( handleRequest ).listen( port );
-require( 'dns' ).lookup( require( 'os' ).hostname(), function ( err, addr, fam ) {
+require( 'dns' ).lookup( require( 'os' ).hostname(), function ( err, addr ) {
console.log( 'Running at http://' + addr + ( ( port === 80 ) ? '' : ':' ) + port + '/' );
| false |
Other | mrdoob | three.js | dff916771ff83e79b29f0d80370193e6941a0f75.json | sanitize even simplehttpserver | utils/servers/simplehttpserver.js | @@ -30,14 +30,34 @@ var port = 8000,
"mp4": "video/mp4",
"txt": "text/plain",
"bin": "application/octet-stream"
- };
+ };
+
+// https://github.com/parshap/node-sanitize-filename/blob/master/index.js#L33-L47
+var illegalRe = /[\?<>:\*\|":]/g;
+var controlRe = /[\x00-\x1f\x80-\x9f]/g;
+var reservedRe = /^\.+$/;
+var windowsReservedRe = /^(con|prn|aux|nul|com[0-9]|lpt[0-9])(\..*)?$/i;
+var windowsTrailingRe = /[\. ]+$/;
+
+function sanitize(input) {
+ var sanitized = input
+ .replace(/\//g, "\\")
+ .replace(illegalRe, "")
+ .replace(controlRe, "")
+ .replace(reservedRe, "")
+ .replace(windowsReservedRe, "")
+ .replace(windowsTrailingRe, "");
+ return sanitized;
+}
+
+
port = process.argv[ 2 ] ? parseInt( process.argv[ 2 ], 0 ) : port;
function handleRequest( request, response ) {
- var urlObject = urlParser.parse( request.url, true );
- var pathname = decodeURIComponent( urlObject.pathname );
+ var urlObject = urlParser.parse( request.url, true );
+ var pathname = decodeURIComponent( sanitize( urlObject.pathname ) );
console.log( '[' + ( new Date() ).toUTCString() + '] ' + '"' + request.method + ' ' + pathname + '"' );
@@ -98,8 +118,8 @@ function handleRequest( request, response ) {
files.unshift( '.', '..' );
files.forEach( function ( item ) {
- var urlpath = pathname + item,
- itemStats = fs.statSync( currentDir + urlpath );
+ var urlpath = path.join( pathname, item ),
+ itemStats = fs.statSync( path.join( currentDir, urlpath ) );
if ( itemStats.isDirectory() ) {
| false |
Other | mrdoob | three.js | bac522527102244405d6881a8467b1f96381a7c9.json | add Marching TS def file | examples/jsm/objects/MarchingCubes.d.ts | @@ -0,0 +1,73 @@
+import {
+ BufferGeometry,
+ Material,
+ ImmediateRenderObject
+} from '../../../src/Three';
+
+export class MarchingCubes extends ImmediateRenderObject {
+ constructor(resolution: number, material: Material, enableUvs?: boolean, enableColors?: boolean);
+
+ enableUvs: boolean;
+ enableColors: boolean;
+
+ resolution: number;
+
+ // parameters
+
+ isolation: number;
+
+ // size of field, 32 is pushing it in Javascript :)
+
+ size: number;
+ size2: number;
+ size3: number;
+ halfsize: number;
+
+ // deltas
+
+ delta: number;
+ yd: number;
+ zd: number;
+
+ field: Float32Array;
+ normal_cache: Float32Array;
+ palette: Float32Array;
+
+ maxCount: number;
+ count: number;
+
+ hasPositions: boolean;
+ hasNormals: boolean;
+ hasColors: boolean;
+ hasUvs: boolean;
+
+ positionArray: Float32Array;
+ normalArray: Float32Array;
+
+ uvArray: Float32Array;
+ colorArray: Float32Array;
+
+ begin(): void;
+ end(): void;
+
+ addBall( ballx: number, bally: number, ballz: number, strength: number, subtract: number, colors: any ): void;
+
+ addPlaneX( strength: number, subtract: number ): void;
+ addPlaneY( strength: number, subtract: number ): void;
+ addPlaneZ( strength: number, subtract: number ): void;
+
+ setCell ( x: number, y: number, z: number, value: number ): void;
+ getCell ( x: number, y: number, z: number ): number;
+
+ blur( intensity: number ): void;
+
+ reset(): void;
+ render( renderCallback: any ): void;
+ generateGeometry(): BufferGeometry;
+ generateBufferGeometry(): BufferGeometry;
+
+}
+
+export const edgeTable: Int32Array[];
+export const triTable: Int32Array[];
+ | false |
Other | mrdoob | three.js | b637382cb704d81b0a45bde091b67059872fc977.json | Add projectionMatrixInverse to type definitions | src/cameras/Camera.d.ts | @@ -23,6 +23,11 @@ export class Camera extends Object3D {
* This is the matrix which contains the projection.
*/
projectionMatrix: Matrix4;
+
+ /**
+ * This is the inverse of projectionMatrix.
+ */
+ projectionMatrixInverse: Matrix4;
isCamera: true;
| false |
Other | mrdoob | three.js | 1a6337b26091cf838ed8a83a6edda8c4101dddaf.json | Add sizeAttentuation to SpriteMaterial typing. | src/materials/SpriteMaterial.d.ts | @@ -6,6 +6,7 @@ export interface SpriteMaterialParameters extends MaterialParameters {
color?: Color | string | number;
map?: Texture;
rotation?: number;
+ sizeAttenuation?: boolean;
}
export class SpriteMaterial extends Material {
@@ -15,6 +16,7 @@ export class SpriteMaterial extends Material {
color: Color;
map: Texture | null;
rotation: number;
+ sizeAttenuation: boolean;
isSpriteMaterial: true;
setValues( parameters: SpriteMaterialParameters ): void; | false |
Other | mrdoob | three.js | cd998e7576f64f9102413f17d39186ffd6259dc4.json | Fix Material.d.ts lint errors | src/materials/Material.d.ts | @@ -3,15 +3,15 @@ import { Shader } from './../renderers/shaders/ShaderLib';
import { EventDispatcher } from './../core/EventDispatcher';
import { WebGLRenderer } from './../renderers/WebGLRenderer';
import {
- BlendingDstFactor,
- BlendingEquation,
- Blending,
- BlendingSrcFactor,
- DepthModes,
- Side,
- Colors,
- StencilFunc,
- StencilOp
+ BlendingDstFactor,
+ BlendingEquation,
+ Blending,
+ BlendingSrcFactor,
+ DepthModes,
+ Side,
+ Colors,
+ StencilFunc,
+ StencilOp
} from '../constants';
// Materials //////////////////////////////////////////////////////////////////////////////////
@@ -47,17 +47,17 @@ export interface MaterialParameters {
flatShading?: boolean;
side?: Side;
shadowSide?: Side;
- transparent?: boolean;
- vertexColors?: Colors;
- vertexTangents?: boolean;
- visible?: boolean;
- stencilWrite?: boolean;
- stencilFunc?: StencilFunc;
- stencilRef?: number;
- stencilMask?: number;
- stencilFail?: StencilOp;
- stencilZFail?: StencilOp;
- stencilZPass?: StencilOp;
+ transparent?: boolean;
+ vertexColors?: Colors;
+ vertexTangents?: boolean;
+ visible?: boolean;
+ stencilWrite?: boolean;
+ stencilFunc?: StencilFunc;
+ stencilRef?: number;
+ stencilMask?: number;
+ stencilFail?: StencilOp;
+ stencilZFail?: StencilOp;
+ stencilZPass?: StencilOp;
}
/**
@@ -153,42 +153,42 @@ export class Material extends EventDispatcher {
*/
id: number;
- /**
+ /**
* Whether rendering this material has any effect on the stencil buffer. Default is *false*.
*/
- stencilWrite: boolean;
+ stencilWrite: boolean;
- /**
+ /**
* The stencil comparison function to use. Default is {@link AlwaysStencilFunc}. See stencil operation constants for all possible values.
*/
- stencilFunc: StencilFunc;
+ stencilFunc: StencilFunc;
- /**
+ /**
* The value to use when performing stencil comparisons or stencil operations. Default is *0*.
*/
- stencilRef: number;
+ stencilRef: number;
- /**
+ /**
* The bit mask to use when comparing against or writing to the stencil buffer. Default is *0xFF*.
*/
- stencilMask: number;
+ stencilMask: number;
- /**
+ /**
* Which stencil operation to perform when the comparison function returns false. Default is {@link KeepStencilOp}. See the stencil operation constants for all possible values.
*/
- stencilFail: StencilOp;
+ stencilFail: StencilOp;
- /**
+ /**
* Which stencil operation to perform when the comparison function returns true but the depth test fails. Default is {@link KeepStencilOp}. See the stencil operation constants for all possible values.
*/
- stencilZFail: StencilOp;
+ stencilZFail: StencilOp;
- /**
+ /**
* Which stencil operation to perform when the comparison function returns true and the depth test passes. Default is {@link KeepStencilOp}. See the stencil operation constants for all possible values.
*/
- stencilZPass: StencilOp;
+ stencilZPass: StencilOp;
- /**
+ /**
* Used to check whether this or derived classes are materials. Default is true.
* You should not change this, as it used internally for optimisation.
*/ | false |
Other | mrdoob | three.js | 2f1f4c27ea22651d1c2a57e4d9bc26da795e74fc.json | add missing setFromObject method | src/helpers/BoxHelper.d.ts | @@ -8,4 +8,6 @@ export class BoxHelper extends LineSegments {
update( object?: Object3D ): void;
+ setFromObject( object: Object3D ): this;
+
} | false |
Other | mrdoob | three.js | 920ce423cd93f04017480a914ab6cfcb646d7f90.json | Fix depthTexture types in WebGLRenderTarget.d.ts
Added depthTexture argument to WebGLRenderTargetOptions and changed depthTexture property on WebGLRenderTarget to be of DepthTexture type instead of Texture type. | src/renderers/WebGLRenderTarget.d.ts | @@ -1,5 +1,6 @@
import { Vector4 } from './../math/Vector4';
import { Texture } from './../textures/Texture';
+import { DepthTexture } from './../textures/DepthTexture';
import { EventDispatcher } from './../core/EventDispatcher';
import { Wrapping, TextureFilter, TextureDataType } from '../constants';
@@ -14,6 +15,7 @@ export interface WebGLRenderTargetOptions {
depthBuffer?: boolean; // true;
stencilBuffer?: boolean; // true;
generateMipmaps?: boolean; // true;
+ depthTexture?: DepthTexture;
}
export class WebGLRenderTarget extends EventDispatcher {
@@ -33,7 +35,7 @@ export class WebGLRenderTarget extends EventDispatcher {
texture: Texture;
depthBuffer: boolean;
stencilBuffer: boolean;
- depthTexture: Texture;
+ depthTexture: DepthTexture;
/**
* @deprecated Use {@link Texture#wrapS texture.wrapS} instead.
*/ | false |
Other | mrdoob | three.js | c0090c138f5f712dfa9a59e9e50931e52e504e93.json | remove multiview attribute from renderer | src/renderers/WebGLRenderer.js | @@ -316,8 +316,6 @@ function WebGLRenderer( parameters ) {
var multiview = new WebGLMultiview( _this, _gl );
- this.multiview = multiview;
-
// shadow map
var shadowMap = new WebGLShadowMap( _this, objects, capabilities.maxTextureSize ); | true |
Other | mrdoob | three.js | c0090c138f5f712dfa9a59e9e50931e52e504e93.json | remove multiview attribute from renderer | src/renderers/webgl/WebGLMultiview.js | @@ -26,18 +26,6 @@ function WebGLMultiview( renderer, gl ) {
}
- function getNumViews() {
-
- if ( renderTarget && renderer.getRenderTarget() === renderTarget ) {
-
- return renderTarget.numViews;
-
- }
-
- return 0;
-
- }
-
function getCameraArray( camera ) {
if ( camera.isArrayCamera ) return camera.cameras;
@@ -218,7 +206,6 @@ function WebGLMultiview( renderer, gl ) {
this.attachRenderTarget = attachRenderTarget;
this.detachRenderTarget = detachRenderTarget;
- this.getNumViews = getNumViews;
this.updateCameraProjectionMatricesUniform = updateCameraProjectionMatricesUniform;
this.updateCameraViewMatricesUniform = updateCameraViewMatricesUniform;
this.updateObjectMatricesUniforms = updateObjectMatricesUniforms; | true |
Other | mrdoob | three.js | c0090c138f5f712dfa9a59e9e50931e52e504e93.json | remove multiview attribute from renderer | src/renderers/webgl/WebGLProgram.js | @@ -6,6 +6,7 @@ import { WebGLUniforms } from './WebGLUniforms.js';
import { WebGLShader } from './WebGLShader.js';
import { ShaderChunk } from '../shaders/ShaderChunk.js';
import { NoToneMapping, AddOperation, MixOperation, MultiplyOperation, EquirectangularRefractionMapping, CubeRefractionMapping, SphericalReflectionMapping, EquirectangularReflectionMapping, CubeUVRefractionMapping, CubeUVReflectionMapping, CubeReflectionMapping, PCFSoftShadowMap, PCFShadowMap, VSMShadowMap, ACESFilmicToneMapping, CineonToneMapping, Uncharted2ToneMapping, ReinhardToneMapping, LinearToneMapping, GammaEncoding, RGBDEncoding, RGBM16Encoding, RGBM7Encoding, RGBEEncoding, sRGBEncoding, LinearEncoding, LogLuvEncoding } from '../../constants.js';
+import { WebGLMultiviewRenderTarget } from '../WebGLMultiviewRenderTarget.js';
var programIdCount = 0;
@@ -340,7 +341,8 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,
var prefixVertex, prefixFragment;
- var numMultiviewViews = renderer.multiview.getNumViews();
+ var renderTarget = renderer.getRenderTarget();
+ var numMultiviewViews = renderTarget instanceof WebGLMultiviewRenderTarget ? renderTarget.numViews : 0;
if ( material.isRawShaderMaterial ) {
| true |
Other | mrdoob | three.js | 5a1f73f2a6fa0d599030f915b44d7e033bc832c2.json | Remove unneeded changes on webglprogram | src/renderers/webgl/WebGLProgram.js | @@ -672,8 +672,11 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,
var vertexGlsl = prefixVertex + vertexShader;
var fragmentGlsl = prefixFragment + fragmentShader;
- var glVertexShader = WebGLShader( gl, gl.VERTEX_SHADER, vertexGlsl, renderer.debug.checkShaderErrors );
- var glFragmentShader = WebGLShader( gl, gl.FRAGMENT_SHADER, fragmentGlsl, renderer.debug.checkShaderErrors );
+ // console.log( '*VERTEX*', vertexGlsl );
+ // console.log( '*FRAGMENT*', fragmentGlsl );
+
+ var glVertexShader = WebGLShader( gl, gl.VERTEX_SHADER, vertexGlsl );
+ var glFragmentShader = WebGLShader( gl, gl.FRAGMENT_SHADER, fragmentGlsl );
gl.attachShader( program, glVertexShader );
gl.attachShader( program, glFragmentShader ); | false |
Other | mrdoob | three.js | 4fd113ba58787ded22b6e1d4adf2cb0ddccd37d7.json | Change webvr_multiview to use modules | examples/webvr_multiview.html | @@ -18,13 +18,12 @@
</style>
</head>
<body>
+ <script type="module">
- <script src="../build/three.js"></script>
- <script src="js/vr/WebVR.js"></script>
-
- <script src="js/geometries/BoxLineGeometry.js"></script>
- <script src="js/libs/stats.min.js"></script>
- <script>
+ import * as THREE from '../build/three.module.js';
+ import { BoxLineGeometry } from './jsm/geometries/BoxLineGeometry.js';
+ import { WEBVR } from './jsm/vr/WebVR.js';
+ import Stats from './jsm/libs/stats.module.js';
var container;
var camera, scene, renderer;
@@ -73,7 +72,7 @@
camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 0.1, 10 );
room = new THREE.LineSegments(
- new THREE.BoxLineGeometry( 6, 6, 6, 10, 10, 10 ),
+ new BoxLineGeometry( 6, 6, 6, 10, 10, 10 ),
new THREE.LineBasicMaterial( { color: renderer.multiview.isAvailable() ? 0x99ff99 : 0xff3333 } )
);
room.geometry.translate( 0, 3, 0 );
@@ -85,7 +84,7 @@
var geometry = new THREE.IcosahedronBufferGeometry( radius );
- for ( var i = 0; i < 20000; i ++ ) {
+ for ( var i = 0; i < 2000; i ++ ) {
var object = new THREE.Mesh( geometry, new THREE.MeshLambertMaterial( { color: Math.random() * 0xffffff } ) );
| false |
Other | mrdoob | three.js | 4e421126402a59c8b11c6283e201bb924ffb5811.json | Fix lint issues and some minor changes | examples/webvr_multiview.html | @@ -85,7 +85,7 @@
var geometry = new THREE.IcosahedronBufferGeometry( radius );
- for ( var i = 0; i < 5000; i ++ ) {
+ for ( var i = 0; i < 20000; i ++ ) {
var object = new THREE.Mesh( geometry, new THREE.MeshLambertMaterial( { color: Math.random() * 0xffffff } ) );
| true |
Other | mrdoob | three.js | 4e421126402a59c8b11c6283e201bb924ffb5811.json | Fix lint issues and some minor changes | src/renderers/WebGLRenderer.js | @@ -81,7 +81,7 @@ function WebGLRenderer( parameters ) {
* Enables error checking and reporting when shader programs are being compiled
* @type {boolean}
*/
- checkShaderErrors: false
+ checkShaderErrors: true
};
// clearing | true |
Other | mrdoob | three.js | 4e421126402a59c8b11c6283e201bb924ffb5811.json | Fix lint issues and some minor changes | src/renderers/webgl/WebGLMultiview.js | @@ -52,7 +52,7 @@ function WebGLMultiview( renderer, gl, contextAttributes ) {
function isAvailable() {
- return capabilities.multiview && !contextAttributes.antialias;
+ return capabilities.multiview && ! contextAttributes.antialias;
}
| true |
Other | mrdoob | three.js | 2f61505f454199cc24628f8d52b0f3d63860cced.json | Remove webgl_multiple_views_multiple example | examples/files.js | @@ -201,7 +201,6 @@ var files = {
"webgl_multiple_renderers",
"webgl_multiple_scenes_comparison",
"webgl_multiple_views",
- "webgl_multiple_views_multiview",
"webgl_nearestneighbour",
"webgl_panorama_cube",
"webgl_panorama_dualfisheye", | true |
Other | mrdoob | three.js | 2f61505f454199cc24628f8d52b0f3d63860cced.json | Remove webgl_multiple_views_multiple example | examples/webgl_multiple_views_multiview.html | @@ -1,325 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <title>three.js performance - animation</title>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
- <style>
- body {
- font-family: Monospace;
- background-color: #000;
- margin: 0px;
- overflow: hidden;
- }
- #info {
- position: absolute;
- top: 10px;
- width: 100%;
- text-align: center;
- z-index: 100;
- display:block;
- }
- #info p {
- max-width: 600px;
- margin-left: auto;
- margin-right: auto;
- padding: 0 2em;
- }
- #info a {
- color: #2fa1d6;
- font-weight: bold;
- }
- .dg.ac {
- z-index: 999 !important;
- }
- </style>
- </head>
-
- <body>
-
- <div id="container"></div>
-
- <script src="../build/three.js"></script>
- <script src="js/loaders/GLTFLoader.js"></script>
- <script src="js/libs/stats.min.js"></script>
- <script>
-
- var container, clock, stats, ms;
- var camera, scene, renderer, panel, balls;
- var radius = 0.08;
- var AMOUNT = 2;
-
- var mixers = [];
- var cameras = [];
-
- init();
-
- function addNumLink( value ) {
-
- return `<a href="?num=${ value }">${ value }</a>`;
-
- }
-
- function init() {
-
- container = document.getElementById('container');
-
- const urlParams = new URLSearchParams(window.location.search);
- const multiview = urlParams.has('enableMultiview');
-
- var ASPECT_RATIO = window.innerWidth / window.innerHeight;
- var WIDTH = ( window.innerWidth / AMOUNT ) * window.devicePixelRatio;
- var HEIGHT = ( window.innerHeight / AMOUNT ) * window.devicePixelRatio;
-
- for ( var y = 0; y < AMOUNT; y ++ ) {
-
- for ( var x = 0; x < AMOUNT; x ++ ) {
-
- var subcamera = new THREE.PerspectiveCamera( 40 + (x + y) * 20, ASPECT_RATIO, 0.25, 100 );
- subcamera.viewport = new THREE.Vector4( Math.floor( x * WIDTH ), Math.floor( y * HEIGHT ), Math.ceil( WIDTH ), Math.ceil( HEIGHT ) );
-
- subcamera.position.x = ( x / AMOUNT ) * 5 - 0.5;
- subcamera.position.y = ( y / AMOUNT ) * 5 + 1;
- subcamera.position.z = 6;
- subcamera.position.multiplyScalar( 1.5 );
-
- subcamera.lookAt( 0, 2, 0 );
- subcamera.updateMatrixWorld();
- cameras.push( subcamera );
-
- }
-
- }
-
- camera = new THREE.ArrayCamera( cameras );
-
- // Needed to do the frustum culling
- camera.fov = 180;
- camera.position.set(0, 0, 6);
- camera.aspect = ASPECT_RATIO;
- camera.updateProjectionMatrix();
-
- //
-
- scene = new THREE.Scene();
- scene.background = new THREE.Color( 0xe0e0e0 );
- scene.fog = new THREE.Fog( 0xe0e0e0, 20, 100 );
-
- clock = new THREE.Clock();
-
- // lights
-
- var light = new THREE.HemisphereLight( 0xffffff, 0x444444 );
- light.position.set( 0, 20, 0 );
- scene.add( light );
-
- light = new THREE.DirectionalLight( 0xffffff );
- light.position.set( 0, 20, 10 );
- scene.add( light );
-
- // ground
-
- var mesh = new THREE.Mesh( new THREE.PlaneBufferGeometry( 2000, 2000 ), new THREE.MeshPhongMaterial( { color: 0x999999, depthWrite: false } ) );
- mesh.rotation.x = - Math.PI / 2;
- scene.add( mesh );
-
- var grid = new THREE.GridHelper( 200, 40, 0x000000, 0x000000 );
- grid.material.opacity = 0.2;
- grid.material.transparent = true;
- scene.add( grid );
-
- // balls
- balls = new THREE.Group();
- scene.add( balls );
-
- var geometry = new THREE.IcosahedronBufferGeometry( radius, 2 );
-
- var numObjects = urlParams.get('num') || 1000;
-
- for ( var i = 0; i < numObjects; i ++ ) {
-
- var object = new THREE.Mesh( geometry, new THREE.MeshLambertMaterial( { color: Math.random() * 0xffffff } ) );
-
- object.position.x = Math.random() * 20 - 10;
- object.position.y = Math.random() * 10 + 5;
- object.position.z = Math.random() * 20 - 10;
-
- object.userData.velocity = new THREE.Vector3();
- object.userData.velocity.x = Math.random() * 0.01 - 0.005;
- object.userData.velocity.y = Math.random() * 0.01 - 0.005;
- object.userData.velocity.z = Math.random() * 0.01 - 0.005;
-
- balls.add( object );
-
- }
-
-
- // model
-
- var loader = new THREE.GLTFLoader();
-
- loader.load( 'models/gltf/RobotExpressive/RobotExpressive.glb', function( gltf ) {
-
- var model = gltf.scene;
- var animations = gltf.animations;
-
- scene.add( model );
-
- var mixer = new THREE.AnimationMixer( model );
- mixer.clipAction( animations[ 10 ] ).play();
- mixers.push( mixer );
-
- animate();
-
- }, undefined, function( e ) {
-
- console.error( e );
-
- } );
-
- var canvas = document.createElement( 'canvas' );
- var context = canvas.getContext( 'webgl2', { antialias: false } );
- renderer = new THREE.WebGLRenderer( { context: context, canvas: canvas, antialias: true, multiview: multiview } );
- renderer.setPixelRatio( window.devicePixelRatio );
- renderer.setSize( window.innerWidth, window.innerHeight );
- renderer.gammaOutput = true;
- renderer.gammaFactor = 2.2;
- container.appendChild( renderer.domElement );
-
- console.log(renderer.multiview);
- //
-
- function colorize( value ) {
- return value ? '<b style="color:#3f3">true</b>' : '<b style="color:#f33">false</b>';
- }
-
- var info = document.createElement( 'div' );
- info.style.position = 'absolute';
- info.style.top = '10px';
- info.style.width = '100%';
- info.style.textAlign = 'center';
- container.appendChild(info);
-
- info.innerHTML = `<a href="http://threejs.org" target="_blank" rel="noopener">three.js</a> webgl - multiple views using multiview extension - by <a href="https://twitter.com/fernandojsg">fernandojsg</a><br/>`;
- info.innerHTML += 'enabled: ' + colorize( renderer.multiview.isEnabled() ) + ` <a href="?num=${ numObjects }&${ multiview ? '' : 'enableMultiview' }">toggle</a>`
- + `<br/>available: ${ colorize( renderer.multiview.isAvailable() ) }<br/>Number of balls:
- ${addNumLink(200)}
- ${addNumLink(500)}
- ${addNumLink(1000)}
- ${addNumLink(2500)}
- ${addNumLink(5000)}
- <br/><br/>`;
-
- ms = document.createElement('div');
- ms.innerHTML = '';
- info.appendChild(ms);
-
- stats = new Stats();
- document.body.appendChild( stats.dom );
- panel = stats.addPanel( new Stats.Panel( 'renderer.render()', '#ff8', '#221' ) );
- stats.showPanel( 3 );
-
- window.addEventListener( 'resize', onWindowResize, false );
-
- }
-
- function onWindowResize() {
-
- var ASPECT_RATIO = window.innerWidth / window.innerHeight;
- var WIDTH = ( window.innerWidth / AMOUNT ) * window.devicePixelRatio;
- var HEIGHT = ( window.innerHeight / AMOUNT ) * window.devicePixelRatio;
-
- camera.aspect = ASPECT_RATIO;
- camera.updateProjectionMatrix();
-
- for ( var y = 0; y < AMOUNT; y ++ ) {
-
- for ( var x = 0; x < AMOUNT; x ++ ) {
-
- var subcamera = camera.cameras[ AMOUNT * y + x ];
- subcamera.viewport.set(
- Math.floor( x * WIDTH ),
- Math.floor( y * HEIGHT ),
- Math.ceil( WIDTH ),
- Math.ceil( HEIGHT ) );
- subcamera.aspect = ASPECT_RATIO;
- subcamera.updateProjectionMatrix();
-
- }
-
- }
-
- renderer.setSize( window.innerWidth, window.innerHeight );
-
- }
-
- //
-
- function animate() {
-
- requestAnimationFrame( animate );
-
- var delta = clock.getDelta();
- var time = clock.getElapsedTime();
-
- for ( var i = 0, il = mixers.length; i < il; i ++ ) {
-
- mixers[ i ].update( delta );
-
- }
-
- // Update camera animations
- cameras[ 0 ].position.y += Math.sin( time * 2 ) * 0.02;
- cameras[ 0 ].updateMatrixWorld();
-
- cameras[ 1 ].position.z += Math.sin( time ) * 0.1;
- cameras[ 1 ].updateMatrixWorld();
-
- cameras[ 3 ].position.x = Math.sin( time ) * Math.PI;
- cameras[ 3 ].position.z = Math.cos( time ) * Math.PI;
- cameras[ 3 ].lookAt( 0, 2, 0 );
- cameras[ 3 ].updateMatrixWorld();
-
- // delta *=1000;
-
- delta *= 0.5;
-
- // Update balls
- for ( var i = 0; i < balls.children.length; i ++ ) {
-
- var object = balls.children[ i ];
-
- object.position.y += object.userData.velocity.y * delta;
-
- // keep objects inside room
- if ( object.position.y < radius || object.position.y > 15 ) {
-
- object.position.y = Math.max( object.position.y, radius );
-
- object.userData.velocity.y = - object.userData.velocity.y * 0.8;
-
- }
-
- object.userData.velocity.y -= 9.8 * delta;
-
- }
-
- //
-
- var t = performance.now();
-
- renderer.render( scene, camera );
-
- var trender = performance.now() - t;
- ms.innerHTML = `renderer.render time: ${ trender.toFixed( 2 ) }ms`;
-
- panel.update(performance.now() - t, 460);
-
- stats.update();
-
- }
-
- </script>
-
- </body>
-</html>
\ No newline at end of file | true |
Other | mrdoob | three.js | 66b671b2e33c93a46ce341cc0f8ac1e774be9e38.json | Detect antialias on multiview.isAvailable() | examples/webvr_multiview.html | @@ -23,16 +23,17 @@
<script src="js/vr/WebVR.js"></script>
<script src="js/geometries/BoxLineGeometry.js"></script>
-
+ <script src="js/libs/stats.min.js"></script>
<script>
var container;
var camera, scene, renderer;
var room;
+ var stats;
var count = 0;
- var radius = 0.08;
+ var radius = 0.02;
var normal = new THREE.Vector3();
var relativeVelocity = new THREE.Vector3();
@@ -46,6 +47,18 @@
container = document.createElement( 'div' );
document.body.appendChild( container );
+ //
+
+ var canvas = document.createElement( 'canvas' );
+ var context = canvas.getContext( 'webgl2', { antialias: false } );
+
+ renderer = new THREE.WebGLRenderer( { canvas: canvas, context: context } );
+
+ renderer.setPixelRatio( window.devicePixelRatio );
+ renderer.setSize( window.innerWidth, window.innerHeight );
+ renderer.vr.enabled = true;
+ container.appendChild( renderer.domElement );
+
var info = document.createElement( 'div' );
info.style.position = 'absolute';
info.style.top = '10px';
@@ -61,7 +74,7 @@
room = new THREE.LineSegments(
new THREE.BoxLineGeometry( 6, 6, 6, 10, 10, 10 ),
- new THREE.LineBasicMaterial( { color: 0x808080 } )
+ new THREE.LineBasicMaterial( { color: renderer.multiview.isAvailable() ? 0x99ff99 : 0xff3333 } )
);
room.geometry.translate( 0, 3, 0 );
scene.add( room );
@@ -72,7 +85,7 @@
var geometry = new THREE.IcosahedronBufferGeometry( radius );
- for ( var i = 0; i < 2000; i ++ ) {
+ for ( var i = 0; i < 5000; i ++ ) {
var object = new THREE.Mesh( geometry, new THREE.MeshLambertMaterial( { color: Math.random() * 0xffffff } ) );
@@ -91,22 +104,13 @@
//
- var canvas = document.createElement( 'canvas' );
- var context = canvas.getContext( 'webgl2', { antialias: false } );
-
- renderer = new THREE.WebGLRenderer( { canvas: canvas, context: context } );
-
- renderer.setPixelRatio( window.devicePixelRatio );
- renderer.setSize( window.innerWidth, window.innerHeight );
- renderer.vr.enabled = true;
- container.appendChild( renderer.domElement );
-
- //
-
document.body.appendChild( WEBVR.createButton( renderer ) );
//
+ stats = new Stats();
+ container.appendChild( stats.dom );
+
window.addEventListener( 'resize', onWindowResize, false );
}
@@ -131,6 +135,7 @@
function render() {
//
+ stats.update();
var delta = clock.getDelta();
| true |
Other | mrdoob | three.js | 66b671b2e33c93a46ce341cc0f8ac1e774be9e38.json | Detect antialias on multiview.isAvailable() | src/renderers/WebGLRenderer.js | @@ -314,7 +314,7 @@ function WebGLRenderer( parameters ) {
// Multiview
- var multiview = new WebGLMultiview( _this, _gl );
+ var multiview = new WebGLMultiview( _this, _gl, _gl.getContextAttributes() );
this.multiview = multiview;
| true |
Other | mrdoob | three.js | 66b671b2e33c93a46ce341cc0f8ac1e774be9e38.json | Detect antialias on multiview.isAvailable() | src/renderers/webgl/WebGLMultiview.js | @@ -8,7 +8,7 @@ import { Matrix3 } from '../../math/Matrix3.js';
import { Matrix4 } from '../../math/Matrix4.js';
import { Vector2 } from '../../math/Vector2.js';
-function WebGLMultiview( renderer, gl ) {
+function WebGLMultiview( renderer, gl, contextAttributes ) {
var DEFAULT_NUMVIEWS = 2;
@@ -52,7 +52,7 @@ function WebGLMultiview( renderer, gl ) {
function isAvailable() {
- return capabilities.multiview;
+ return capabilities.multiview && !contextAttributes.antialias;
}
@@ -205,8 +205,6 @@ function WebGLMultiview( renderer, gl ) {
if ( isAvailable() ) {
- console.log('multiivew enabled!');
-
renderTarget = new WebGLMultiviewRenderTarget( 0, 0, DEFAULT_NUMVIEWS );
renderSize = new Vector2(); | true |
Other | mrdoob | three.js | be3c3ba7686750239a4a71a783b97754c4c58e57.json | Add webvr_multiview example | examples/files.js | @@ -339,6 +339,7 @@ var files = {
"webvr_cubes",
"webvr_dragging",
"webvr_lorenzattractor",
+ "webvr_multiview",
"webvr_panorama",
"webvr_paint",
"webvr_rollercoaster", | true |
Other | mrdoob | three.js | be3c3ba7686750239a4a71a783b97754c4c58e57.json | Add webvr_multiview example | examples/webvr_multiview.html | @@ -0,0 +1,178 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+ <title>three.js webvr - ball shooter</title>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+ <style>
+ body {
+ font-family: Monospace;
+ background-color: #101010;
+ color: #fff;
+ margin: 0px;
+ overflow: hidden;
+ }
+ a {
+ color: #48f;
+ }
+ </style>
+ </head>
+ <body>
+
+ <script src="../build/three.js"></script>
+ <script src="js/vr/WebVR.js"></script>
+
+ <script src="js/geometries/BoxLineGeometry.js"></script>
+
+ <script>
+
+ var container;
+ var camera, scene, renderer;
+
+ var room;
+
+ var count = 0;
+ var radius = 0.08;
+ var normal = new THREE.Vector3();
+ var relativeVelocity = new THREE.Vector3();
+
+ var clock = new THREE.Clock();
+
+ init();
+ animate();
+
+ function init() {
+
+ container = document.createElement( 'div' );
+ document.body.appendChild( container );
+
+ var info = document.createElement( 'div' );
+ info.style.position = 'absolute';
+ info.style.top = '10px';
+ info.style.width = '100%';
+ info.style.textAlign = 'center';
+ info.innerHTML = '<a href="https://threejs.org" target="_blank" rel="noopener">three.js</a> webvr - ball shooter';
+ container.appendChild( info );
+
+ scene = new THREE.Scene();
+ scene.background = new THREE.Color( 0x505050 );
+
+ camera = new THREE.PerspectiveCamera( 70, window.innerWidth / window.innerHeight, 0.1, 10 );
+
+ room = new THREE.LineSegments(
+ new THREE.BoxLineGeometry( 6, 6, 6, 10, 10, 10 ),
+ new THREE.LineBasicMaterial( { color: 0x808080 } )
+ );
+ room.geometry.translate( 0, 3, 0 );
+ scene.add( room );
+
+ var light = new THREE.HemisphereLight( 0xffffff, 0x444444 );
+ light.position.set( 1, 1, 1 );
+ scene.add( light );
+
+ var geometry = new THREE.IcosahedronBufferGeometry( radius );
+
+ for ( var i = 0; i < 2000; i ++ ) {
+
+ var object = new THREE.Mesh( geometry, new THREE.MeshLambertMaterial( { color: Math.random() * 0xffffff } ) );
+
+ object.position.x = Math.random() * 4 - 2;
+ object.position.y = Math.random() * 4;
+ object.position.z = Math.random() * 4 - 2;
+
+ object.userData.velocity = new THREE.Vector3();
+ object.userData.velocity.x = 2 * Math.random() - 1;
+ object.userData.velocity.y = 2 * Math.random() - 1;
+ object.userData.velocity.z = 2 * Math.random() - 1;
+
+ room.add( object );
+
+ }
+
+ //
+
+ var canvas = document.createElement( 'canvas' );
+ var context = canvas.getContext( 'webgl2', { antialias: false } );
+
+ renderer = new THREE.WebGLRenderer( { canvas: canvas, context: context } );
+
+ renderer.setPixelRatio( window.devicePixelRatio );
+ renderer.setSize( window.innerWidth, window.innerHeight );
+ renderer.vr.enabled = true;
+ container.appendChild( renderer.domElement );
+
+ //
+
+ document.body.appendChild( WEBVR.createButton( renderer ) );
+
+ //
+
+ window.addEventListener( 'resize', onWindowResize, false );
+
+ }
+
+ function onWindowResize() {
+
+ camera.aspect = window.innerWidth / window.innerHeight;
+ camera.updateProjectionMatrix();
+
+ renderer.setSize( window.innerWidth, window.innerHeight );
+
+ }
+
+ //
+
+ function animate() {
+
+ renderer.setAnimationLoop( render );
+
+ }
+
+ function render() {
+
+ //
+
+ var delta = clock.getDelta();
+
+ var range = 3 - radius;
+
+ for ( var i = 0; i < room.children.length; i ++ ) {
+
+ var object = room.children[ i ];
+
+ object.position.x += object.userData.velocity.x * delta;
+ object.position.y += object.userData.velocity.y * delta;
+ object.position.z += object.userData.velocity.z * delta;
+
+ // keep objects inside room
+
+ if ( object.position.x < - range || object.position.x > range ) {
+
+ object.position.x = THREE.Math.clamp( object.position.x, - range, range );
+ object.userData.velocity.x = - object.userData.velocity.x;
+
+ }
+
+ if ( object.position.y < radius || object.position.y > 6 ) {
+
+ object.position.y = Math.max( object.position.y, radius );
+ object.userData.velocity.y = - object.userData.velocity.y;
+
+ }
+
+ if ( object.position.z < - range || object.position.z > range ) {
+
+ object.position.z = THREE.Math.clamp( object.position.z, - range, range );
+ object.userData.velocity.z = - object.userData.velocity.z;
+
+ }
+
+ }
+
+ renderer.render( scene, camera );
+
+ }
+
+ </script>
+ </body>
+</html> | true |
Other | mrdoob | three.js | 8d8204f26a36564ffec14dec0dbd1547fd4bfd60.json | Remove ballshooter_multiview from examples list | examples/files.js | @@ -336,7 +336,6 @@ var files = {
],
"webvr": [
"webvr_ballshooter",
- "webvr_ballshooter_multiview",
"webvr_cubes",
"webvr_dragging",
"webvr_lorenzattractor", | false |
Other | mrdoob | three.js | f4c0cf956a3b682b3c2d21d54b20e5cc6c0f67fa.json | Remove ballshooter_multivew from files | examples/files.js | @@ -201,7 +201,6 @@ var files = {
"webgl_multiple_renderers",
"webgl_multiple_scenes_comparison",
"webgl_multiple_views",
- "webgl_multiple_views_multiview",
"webgl_nearestneighbour",
"webgl_panorama_cube",
"webgl_panorama_dualfisheye", | false |
Other | mrdoob | three.js | 24a5191cd961a54284d60632c1b5d3bcb455d3fd.json | Fix minor style issues | examples/webgl_multiple_views_multiview.html | @@ -80,7 +80,6 @@
var ASPECT_RATIO = window.innerWidth / window.innerHeight;
- var SIZE = 1 / AMOUNT;
var WIDTH = ( window.innerWidth / AMOUNT ) * window.devicePixelRatio;
var HEIGHT = ( window.innerHeight / AMOUNT ) * window.devicePixelRatio;
| true |
Other | mrdoob | three.js | 24a5191cd961a54284d60632c1b5d3bcb455d3fd.json | Fix minor style issues | examples/webvr_ballshooter_multiview.html | @@ -294,9 +294,10 @@
var trender = performance.now() - ts;
// Compute average of the last frames
- for (var i = 0; i < avgCounter.length-1; ++i) avgCounter[i] = avgCounter[i+1];
- avgCounter[avgCounter.length-1] = trender;
- var avg = avgCounter.reduce(function(a, b) { return a + b; }) / avgCounter.length;
+ for ( var i = 0; i < avgCounter.length - 1; ++ i ) avgCounter[ i ] = avgCounter[ i + 1 ];
+
+ avgCounter[ avgCounter.length - 1 ] = trender;
+ var avg = avgCounter.reduce( function( a, b ) { return a + b; }) / avgCounter.length;
ms.innerHTML = `renderer.render time: ${ trender.toFixed( 2 ) }ms (avg: ${ avg.toFixed( 2 ) }ms)`;
| true |
Other | mrdoob | three.js | 24a5191cd961a54284d60632c1b5d3bcb455d3fd.json | Fix minor style issues | src/renderers/webgl/WebGLMultiview.js | @@ -183,7 +183,7 @@ function WebGLMultiview( renderer, requested, options ) {
function detachRenderTarget( camera ) {
- if ( renderTarget !== renderer.getRenderTarget() ) return false;
+ if ( renderTarget !== renderer.getRenderTarget() ) return;
renderer.setRenderTarget( currentRenderTarget );
flush( camera ); | true |
Other | mrdoob | three.js | b0d9a7415cf48e0d1b8185e06056879b0139a596.json | Remove unneeded closure | src/math/Quaternion.js | @@ -349,54 +349,48 @@ Object.assign( Quaternion.prototype, {
},
- setFromUnitVectors: function () {
+ setFromUnitVectors: function ( vFrom, vTo ) {
// assumes direction vectors vFrom and vTo are normalized
- var r;
-
var EPS = 0.000001;
- return function setFromUnitVectors( vFrom, vTo ) {
-
- r = vFrom.dot( vTo ) + 1;
-
- if ( r < EPS ) {
-
- r = 0;
+ var r = vFrom.dot( vTo ) + 1;
- if ( Math.abs( vFrom.x ) > Math.abs( vFrom.z ) ) {
+ if ( r < EPS ) {
- this._x = - vFrom.y;
- this._y = vFrom.x;
- this._z = 0;
- this._w = r;
+ r = 0;
- } else {
+ if ( Math.abs( vFrom.x ) > Math.abs( vFrom.z ) ) {
- this._x = 0;
- this._y = - vFrom.z;
- this._z = vFrom.y;
- this._w = r;
-
- }
+ this._x = - vFrom.y;
+ this._y = vFrom.x;
+ this._z = 0;
+ this._w = r;
} else {
- // crossVectors( vFrom, vTo ); // inlined to avoid cyclic dependency on Vector3
-
- this._x = vFrom.y * vTo.z - vFrom.z * vTo.y;
- this._y = vFrom.z * vTo.x - vFrom.x * vTo.z;
- this._z = vFrom.x * vTo.y - vFrom.y * vTo.x;
+ this._x = 0;
+ this._y = - vFrom.z;
+ this._z = vFrom.y;
this._w = r;
}
- return this.normalize();
+ } else {
- };
+ // crossVectors( vFrom, vTo ); // inlined to avoid cyclic dependency on Vector3
- }(),
+ this._x = vFrom.y * vTo.z - vFrom.z * vTo.y;
+ this._y = vFrom.z * vTo.x - vFrom.x * vTo.z;
+ this._z = vFrom.x * vTo.y - vFrom.y * vTo.x;
+ this._w = r;
+
+ }
+
+ return this.normalize();
+
+ },
angleTo: function ( q ) {
| false |
Other | mrdoob | three.js | 9cf1fe31598e76e58098c3598bf8ff0529f26e63.json | Remove redundant blit from AfterimagePass
It's much faster to just swap the buffers in AfterimagePass instead of doing a blit to copy them. | examples/js/postprocessing/AfterimagePass.js | @@ -41,10 +41,8 @@ THREE.AfterimagePass = function ( damp ) {
this.compFsQuad = new THREE.Pass.FullScreenQuad( this.shaderMaterial );
- var material = new THREE.MeshBasicMaterial( {
- map: this.textureComp.texture
- } );
- this.screenFsQuad = new THREE.Pass.FullScreenQuad( material );
+ var material = new THREE.MeshBasicMaterial();
+ this.copyFsQuad = new THREE.Pass.FullScreenQuad( material );
};
@@ -60,24 +58,29 @@ THREE.AfterimagePass.prototype = Object.assign( Object.create( THREE.Pass.protot
renderer.setRenderTarget( this.textureComp );
this.compFsQuad.render( renderer );
- renderer.setRenderTarget( this.textureOld );
- this.screenFsQuad.render( renderer );
+ this.copyFsQuad.material.map = this.textureComp.texture;
if ( this.renderToScreen ) {
renderer.setRenderTarget( null );
- this.screenFsQuad.render( renderer );
+ this.copyFsQuad.render( renderer );
} else {
renderer.setRenderTarget( writeBuffer );
if ( this.clear ) renderer.clear();
- this.screenFsQuad.render( renderer );
+ this.copyFsQuad.render( renderer );
}
+ // Swap buffers.
+ var temp = this.textureOld;
+ this.textureOld = this.textureComp;
+ this.textureComp = temp;
+ // Now textureOld contains the latest image, ready for the next frame.
+
},
setSize: function ( width, height ) { | false |
Other | mrdoob | three.js | 9e402e577be661179043699e3295f2b1def50042.json | Add resizing support to AfterimagePass | examples/js/postprocessing/AfterimagePass.js | @@ -78,6 +78,13 @@ THREE.AfterimagePass.prototype = Object.assign( Object.create( THREE.Pass.protot
}
+ },
+
+ setSize: function ( width, height ) {
+
+ this.textureComp.setSize( width, height );
+ this.textureOld.setSize( width, height );
+
}
} ); | false |
Other | mrdoob | three.js | e1f0cf4240a25fd74fe3d91086a289d278f3663d.json | Add threejsfundamentals links useful-links
I added it twice, once as a starting resource and again as a advanced resource since it's trying to be both. I hope that's okay.
Also FYI, some of the links point to really old tutorials from like 2012 that I'm just guessing won't work with current three.js | docs/manual/en/introduction/Useful-links.html | @@ -33,6 +33,9 @@ <h2>Tutorials and courses</h2>
<h3>Getting started with three.js</h3>
<ul>
+ <li>
+ [link:https://threejsfundamentals.org/threejs/lessons/threejs-fundamentals.html Three.js Fundamentals starting lesson]
+ </li>
<li>
[link:https://codepen.io/rachsmith/post/beginning-with-3d-webgl-pt-1-the-scene Beginning with 3D WebGL] by [link:https://codepen.io/rachsmith/ Rachel Smith].
</li>
@@ -43,6 +46,9 @@ <h3>Getting started with three.js</h3>
<h3>More extensive / advanced articles and courses</h3>
<ul>
+ <li>
+ [link:https://threejsfundamentals.org/ Three.js Fundamentals]
+ </li>
<li>
[link:http://blog.cjgammon.com/ Collection of tutorials] by [link:http://www.cjgammon.com/ CJ Gammon].
</li> | false |
Other | mrdoob | three.js | cdf6dc326bb8da769c329f835eb373fc2388a49d.json | Clarify documentation for Object3D copy method
Related to: #14009 | docs/api/en/core/Object3D.html | @@ -229,6 +229,8 @@ <h3>[method:this copy]( [param:Object3D object], [param:Boolean recursive] )</h3
recursive -- if true, descendants of the object are also copied. Default is true.<br /><br />
Copy the given object into this object.
+
+ Note, the callbacks [page:.onAfterRender] and [page:.onBeforeRender] are not copied across.
</p>
<h3>[method:Object3D getObjectById]( [param:Integer id] )</h3> | false |
Other | mrdoob | three.js | 58b6bd2dadd9986192ec80683af53e4f2c229ba5.json | Avoid cyclic dependency on Vector3 | src/math/Quaternion.js | @@ -6,7 +6,6 @@
*/
import { _Math } from './Math.js';
-import { Vector3 } from './Vector3.js';
function Quaternion( x, y, z, w ) {
@@ -354,15 +353,12 @@ Object.assign( Quaternion.prototype, {
// assumes direction vectors vFrom and vTo are normalized
- var v1 = new Vector3();
var r;
var EPS = 0.000001;
return function setFromUnitVectors( vFrom, vTo ) {
- if ( v1 === undefined ) v1 = new Vector3();
-
r = vFrom.dot( vTo ) + 1;
if ( r < EPS ) {
@@ -371,24 +367,30 @@ Object.assign( Quaternion.prototype, {
if ( Math.abs( vFrom.x ) > Math.abs( vFrom.z ) ) {
- v1.set( - vFrom.y, vFrom.x, 0 );
+ this._x = - vFrom.y;
+ this._y = vFrom.x;
+ this._z = 0;
+ this._w = r;
} else {
- v1.set( 0, - vFrom.z, vFrom.y );
+ this._x = 0;
+ this._y = - vFrom.z;
+ this._z = vFrom.y;
+ this._w = r;
}
} else {
- v1.crossVectors( vFrom, vTo );
+ // crossVectors( vFrom, vTo ); // inlined to avoid cyclic dependency on Vector3
- }
+ this._x = vFrom.y * vTo.z - vFrom.z * vTo.y;
+ this._y = vFrom.z * vTo.x - vFrom.x * vTo.z;
+ this._z = vFrom.x * vTo.y - vFrom.y * vTo.x;
+ this._w = r;
- this._x = v1.x;
- this._y = v1.y;
- this._z = v1.z;
- this._w = r;
+ }
return this.normalize();
| false |
Other | mrdoob | three.js | 04174a3d7aaf8c838811efe74455f379e65d73aa.json | Avoid cyclic dependency | src/math/Box3.js | @@ -1,5 +1,4 @@
import { Vector3 } from './Vector3.js';
-import { Sphere } from './Sphere.js';
/**
* @author bhouston / http://clara.io
@@ -523,8 +522,8 @@ Object.assign( Box3.prototype, {
if ( target === undefined ) {
- console.warn( 'THREE.Box3: .getBoundingSphere() target is now required' );
- target = new Sphere();
+ console.error( 'THREE.Box3: .getBoundingSphere() target is now required' );
+ //target = new Sphere(); // removed to avoid cyclic dependency
}
| false |
Other | mrdoob | three.js | 7b53ebb2f030553c37a3ac368e01d61e6ddc863e.json | fix texture path bug | examples/js/loaders/LWOLoader.js | @@ -650,12 +650,13 @@ THREE.LWOLoader = ( function () {
},
- // if texture files are contained in the standard "../Images"
- // directory, then LW stores the path as relative.
- // Otherwise it stores the full drive path, on windows "C:/dir/subdir/texture.jpg"
+ // Lightwave expects textures to be in folder called Images relative
+ // to the model
+ // Otherwise, the full absolute path is stored: D://some_directory/textures/bumpMap.png
+ // In this case, we'll strip out everything and load 'bumpMap.png' from the same directory as the model
cleanPath( path ) {
- if ( path.indexOf( 'Images' ) === 0 ) return '../' + path;
+ if ( path.indexOf( 'Images' ) === 0 ) return './' + path;
return path.split( '/' ).pop().split( '\\' ).pop();
}, | false |
Other | mrdoob | three.js | 1d02bf9cb42d4c020bcd00e3fe51e0284bf160de.json | Remove menu z-index change | editor/css/dark.css | @@ -95,10 +95,6 @@ select {
padding-right: 8px;
}
- #menubar .menu * {
- z-index: 2;
- }
-
#menubar .menu.right {
float: right;
cursor: auto; | true |
Other | mrdoob | three.js | 1d02bf9cb42d4c020bcd00e3fe51e0284bf160de.json | Remove menu z-index change | editor/css/light.css | @@ -91,10 +91,6 @@ select {
padding-right: 8px;
}
- #menubar .menu * {
- z-index: 2;
- }
-
#menubar .menu.right {
float: right;
cursor: auto; | true |
Other | mrdoob | three.js | aeda49d636ab6f396d9cf7f4c6c02315c7a83256.json | Fix style per review comment | examples/js/exporters/GLTFExporter.js | @@ -1360,8 +1360,8 @@ THREE.GLTFExporter.prototype = {
}
- if (primitive.indices === null)
- delete primitive.indices
+ if ( primitive.indices === null ) delete primitive.indices;
+
}
var material = processMaterial( materials[ groups[ i ].materialIndex ] ); | false |
Other | mrdoob | three.js | 9bcf4f46fd67872d25a7c31ce056ed90dc281b21.json | Remove uneeded code | editor/js/Viewport.js | @@ -142,9 +142,7 @@ var Viewport = function ( editor ) {
};
var sceneCameraDisplay = new UI.Row();
- sceneCameraDisplay.setId( 'cameraSelect' );
- sceneCameraDisplay.dom.setAttribute( 'layout', config.getKey( 'project/renderer/sceneCameras' ) || 'topLeft' );
- sceneCameraDisplay.setDisplay( 'none' );
+ sceneCameraDisplay.setId( 'cameraSelect' ).setDisplay( 'none' );
document.body.appendChild( sceneCameraDisplay.dom );
var cameraSelect = new UI.Select().onChange( render ); | false |
Other | mrdoob | three.js | 37777d7cb37de4a3fc1d59657e1a2392a8d47a5c.json | Update code style | editor/js/Config.js | @@ -21,7 +21,6 @@ var Config = function () {
'project/renderer/gammaOutput': false,
'project/renderer/shadows': true,
'project/renderer/showHelpers': true,
- 'project/renderer/sceneCameras': 'topRight',
'project/renderer/showSceneCameras': true,
'project/vr': false, | true |
Other | mrdoob | three.js | 37777d7cb37de4a3fc1d59657e1a2392a8d47a5c.json | Update code style | editor/js/Viewport.js | @@ -178,10 +178,11 @@ var Viewport = function ( editor ) {
var optionSelected = config.getKey( 'project/renderer/showSceneCameras' ) === true;
sceneCameraDisplay.setDisplay( optionSelected && Object.keys( cameras ).length > 0 ? 'block' : 'none' );
- if(optionSelected === false)
- {
- cameraSelect.setValue(camera.uuid);
+ if ( optionSelected === false ) {
+
+ cameraSelect.setValue( camera.uuid );
render();
+
}
} ); | true |
Other | mrdoob | three.js | f1e6332d135f8ce4e9334dfe3783154a2295935a.json | Show support for FloatType | examples/webgl_loader_texture_hdr.html | @@ -77,27 +77,48 @@
camera = new THREE.OrthographicCamera( - aspect, aspect, 1, - 1, 0, 1 );
- new THREE.RGBELoader().load( 'textures/memorial.hdr', function ( texture, textureData ) {
+ var type = THREE.UnsignedByteType;
+ //var type = THREE.FloatType;
- //console.log( textureData );
- //console.log( texture );
+ new THREE.RGBELoader()
+ .setType( type )
+ .load( 'textures/memorial.hdr', function ( texture, textureData ) {
- texture.encoding = THREE.RGBEEncoding;
- texture.minFilter = THREE.NearestFilter;
- texture.magFilter = THREE.NearestFilter;
- texture.flipY = true;
+ switch ( type ) {
- var material = new THREE.MeshBasicMaterial( { map: texture } );
+ case THREE.UnsignedByteType:
- var quad = new THREE.PlaneBufferGeometry( 1.5 * textureData.width / textureData.height, 1.5 );
+ texture.encoding = THREE.RGBEEncoding;
+ texture.minFilter = THREE.NearestFilter;
+ texture.magFilter = THREE.NearestFilter;
+ break;
- var mesh = new THREE.Mesh( quad, material );
+ case THREE.FloatType:
- scene.add( mesh );
+ texture.encoding = THREE.LinearEncoding;
+ texture.minFilter = THREE.LinearFilter;
+ texture.magFilter = THREE.LinearFilter;
+ break;
- render();
+ }
- } );
+ texture.generateMipmaps = false;
+ texture.flipY = true;
+
+ //console.log( textureData );
+ //console.log( texture );
+
+ var material = new THREE.MeshBasicMaterial( { map: texture } );
+
+ var quad = new THREE.PlaneBufferGeometry( 1.5 * textureData.width / textureData.height, 1.5 );
+
+ var mesh = new THREE.Mesh( quad, material );
+
+ scene.add( mesh );
+
+ render();
+
+ } );
//
| false |
Other | mrdoob | three.js | 8eac01fec0455fdbe6937e1590b0da442e2cc84f.json | Fix typo in webvr_video.html | examples/webvr_video.html | @@ -66,7 +66,7 @@
var texture = new THREE.Texture( video );
texture.generateMipmaps = false;
texture.minFilter = THREE.NearestFilter;
- texture.maxFilter = THREE.NearestFilter;
+ texture.magFilter = THREE.NearestFilter;
texture.format = THREE.RGBFormat;
setInterval( function () { | false |
Other | mrdoob | three.js | e3a3bd51a555a90cc1f67c2a164e164de233ec91.json | remove webgl_hdr.html example | examples/webgl_hdr.html | @@ -1,223 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <title>three.js webgl - materials - HDR texture</title>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
- <style>
- body {
- color: #fff;
- font-family:Monospace;
- font-size:13px;
- text-align:center;
- font-weight: bold;
-
- background-color: #000;
- margin: 0px;
- overflow: hidden;
- }
-
- #info {
- color:#fff;
- position: absolute;
- top: 0px; width: 100%;
- padding: 5px;
-
- }
-
- a { color: red; }
-
- </style>
- </head>
- <body>
-
- <div id="container"></div>
- <div id="info">
- <a href="http://threejs.org" target="_blank" rel="noopener">three.js</a> - webgl HDR texture example -
- based on <a href="http://spidergl.org/example.php?id=13" target="_blank" rel="noopener">SpiderGL</a>
- </div>
-
- <script src="../build/three.js"></script>
-
- <script src="js/WebGL.js"></script>
- <script src="js/libs/stats.min.js"></script>
-
- <!-- HDR fragment shader -->
-
- <script id="fs-hdr" type="x-shader/x-fragment">
-
- uniform sampler2D tDiffuse;
- uniform float exposure;
- uniform float brightMax;
-
- varying vec2 vUv;
-
- vec3 decode_pnghdr( const in vec4 color ) {
-
- // remove gamma correction
- vec4 res = color * color;
-
- // decoded RI
- float ri = pow( 2.0, res.w * 32.0 - 16.0 );
-
- // decoded HDR pixel
- res.xyz = res.xyz * ri;
- return res.xyz;
-
- }
-
- void main() {
-
- vec4 color = texture2D( tDiffuse, vUv );
- color.xyz = decode_pnghdr( color );
-
- // apply gamma correction and exposure
- //gl_FragColor = vec4( pow( exposure * color.xyz, vec3( 0.474 ) ), 1.0 );
-
- // Perform tone-mapping
- float Y = dot(vec4(0.30, 0.59, 0.11, 0.0), color);
- float YD = exposure * (exposure/brightMax + 1.0) / (exposure + 1.0);
- color *= YD;
-
- gl_FragColor = vec4( color.xyz, 1.0 );
-
- }
-
- </script>
-
- <!-- HDR vertex shader -->
-
- <script id="vs-hdr" type="x-shader/x-vertex">
-
- varying vec2 vUv;
-
- void main() {
-
- vUv = uv;
- gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
-
- }
-
- </script>
-
-
- <script>
-
- if ( WEBGL.isWebGLAvailable() === false ) {
-
- document.body.appendChild( WEBGL.getWebGLErrorMessage() );
-
- }
-
- var container, stats;
-
- var camera, scene, renderer;
- var materialHDR, quad;
-
- var sign = 1, rate = 1;
-
- var clock = new THREE.Clock();
-
- init();
- animate();
-
- function init() {
-
- container = document.getElementById( 'container' );
-
- camera = new THREE.PerspectiveCamera( 50, window.innerWidth / window.innerHeight, 1, 10000 );
- camera.position.z = 900;
-
- scene = new THREE.Scene();
-
- var texture = new THREE.TextureLoader().load( "textures/memorial.png" );
- texture.minFilter = THREE.LinearFilter;
- texture.magFilter = THREE.NearestFilter;
-
- materialHDR = new THREE.ShaderMaterial( {
-
- uniforms: {
- "tDiffuse": { value: texture },
- "exposure": { value: 0.125 },
- "brightMax": { value: 0.5 }
- },
- vertexShader: getText( 'vs-hdr' ),
- fragmentShader: getText( 'fs-hdr' )
-
- } );
-
- var plane = new THREE.PlaneBufferGeometry( 512, 768 );
-
- quad = new THREE.Mesh( plane, materialHDR );
- quad.position.z = - 100;
- scene.add( quad );
-
- renderer = new THREE.WebGLRenderer();
- renderer.setPixelRatio( window.devicePixelRatio );
- renderer.setSize( window.innerWidth, window.innerHeight );
- container.appendChild( renderer.domElement );
-
- stats = new Stats();
- container.appendChild( stats.dom );
-
- //
-
- window.addEventListener( 'resize', onWindowResize, false );
-
- }
-
- function onWindowResize() {
-
- camera.aspect = window.innerWidth / window.innerHeight;
- camera.updateProjectionMatrix();
-
- renderer.setSize( window.innerWidth, window.innerHeight );
-
- }
-
- function getText( id ) {
-
- return document.getElementById( id ).textContent;
-
- }
-
- //
-
- function animate() {
-
- requestAnimationFrame( animate );
-
- render();
- stats.update();
-
- }
-
- function render() {
-
- var delta = clock.getDelta() * 5;
-
- if ( materialHDR.uniforms[ "exposure" ].value > 0 || materialHDR.uniforms[ "exposure" ].value < 1 ) {
-
- rate = 0.25;
-
- } else {
-
- rate = 1;
-
- }
-
- if ( materialHDR.uniforms[ "exposure" ].value > 5 || materialHDR.uniforms[ "exposure" ].value <= 0 ) {
-
- sign *= - 1;
-
- }
-
- materialHDR.uniforms[ "exposure" ].value += sign * rate * delta;
-
- renderer.render( scene, camera );
-
- }
-
- </script>
- </body>
-</html> | false |
Other | mrdoob | three.js | a5d295bf2059bbd158b2b20ae6eb556aafec58b3.json | Add support for linting typescript files | package.json | @@ -25,6 +25,7 @@
"test": "test"
},
"eslintConfig": {
+ "parser": "@typescript-eslint/parser",
"extends": "mdcs",
"plugins": [
"html"
@@ -38,7 +39,7 @@
"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",
- "lint": "eslint src",
+ "lint": "eslint src --ext js --ext ts",
"test": "npm run build-test && qunit test/unit/three.source.unit.js",
"travis": "npm run lint && npm test"
},
@@ -59,6 +60,8 @@
"eslint": "^5.16.0",
"eslint-config-mdcs": "^4.2.3",
"eslint-plugin-html": "^5.0.3",
+ "@typescript-eslint/parser": "^1.9.0",
+ "typescript": "^3.4.5",
"google-closure-compiler": "20190415.0.0",
"http-server": "^0.11.1",
"qunit": "^2.9.2", | false |
Other | mrdoob | three.js | 154fd0c90cc922597dafe93758fbe64833db6d0f.json | Remove ballshooter_multivew from files | examples/files.js | @@ -206,7 +206,6 @@ var files = {
"webgl_multiple_renderers",
"webgl_multiple_scenes_comparison",
"webgl_multiple_views",
- "webgl_multiple_views_multiview",
"webgl_nearestneighbour",
"webgl_panorama_cube",
"webgl_panorama_dualfisheye", | false |
Other | mrdoob | three.js | 807d3576d3b4bcc0b41f44ba081d5390ab47d3a1.json | Fix minor style issues | examples/webgl_multiple_views_multiview.html | @@ -80,7 +80,6 @@
var ASPECT_RATIO = window.innerWidth / window.innerHeight;
- var SIZE = 1 / AMOUNT;
var WIDTH = ( window.innerWidth / AMOUNT ) * window.devicePixelRatio;
var HEIGHT = ( window.innerHeight / AMOUNT ) * window.devicePixelRatio;
| true |
Other | mrdoob | three.js | 807d3576d3b4bcc0b41f44ba081d5390ab47d3a1.json | Fix minor style issues | examples/webvr_ballshooter_multiview.html | @@ -294,9 +294,10 @@
var trender = performance.now() - ts;
// Compute average of the last frames
- for (var i = 0; i < avgCounter.length-1; ++i) avgCounter[i] = avgCounter[i+1];
- avgCounter[avgCounter.length-1] = trender;
- var avg = avgCounter.reduce(function(a, b) { return a + b; }) / avgCounter.length;
+ for ( var i = 0; i < avgCounter.length - 1; ++ i ) avgCounter[ i ] = avgCounter[ i + 1 ];
+
+ avgCounter[ avgCounter.length - 1 ] = trender;
+ var avg = avgCounter.reduce( function( a, b ) { return a + b; }) / avgCounter.length;
ms.innerHTML = `renderer.render time: ${ trender.toFixed( 2 ) }ms (avg: ${ avg.toFixed( 2 ) }ms)`;
| true |
Other | mrdoob | three.js | 807d3576d3b4bcc0b41f44ba081d5390ab47d3a1.json | Fix minor style issues | src/renderers/webgl/WebGLMultiview.js | @@ -183,7 +183,7 @@ function WebGLMultiview( renderer, requested, options ) {
function detachRenderTarget( camera ) {
- if ( renderTarget !== renderer.getRenderTarget() ) return false;
+ if ( renderTarget !== renderer.getRenderTarget() ) return;
renderer.setRenderTarget( currentRenderTarget );
flush( camera ); | true |
Other | mrdoob | three.js | 16c4b71837b24cd207225d2f76d9f16f2b558dec.json | Add setNumViews() to WebGLMultiview | src/renderers/WebGLMultiviewRenderTarget.js | @@ -30,6 +30,19 @@ WebGLMultiviewRenderTarget.prototype = Object.assign( Object.create( WebGLRender
return this;
+ },
+
+ setNumViews: function ( numViews ) {
+
+ if ( this.numViews !== numViews ) {
+
+ this.numViews = numViews;
+ this.dispose();
+
+ }
+
+ return this;
+
}
} ); | true |
Other | mrdoob | three.js | 16c4b71837b24cd207225d2f76d9f16f2b558dec.json | Add setNumViews() to WebGLMultiview | src/renderers/WebGLRenderer.js | @@ -1245,9 +1245,9 @@ function WebGLRenderer( parameters ) {
state.setPolygonOffset( false );
- if ( this.multiview.isEnabled() ) {
+ if ( multiview.isEnabled() ) {
- this.multiview.detachRenderTarget( camera );
+ multiview.detachRenderTarget( camera );
}
| true |
Other | mrdoob | three.js | 16c4b71837b24cd207225d2f76d9f16f2b558dec.json | Add setNumViews() to WebGLMultiview | src/renderers/webgl/WebGLMultiview.js | @@ -11,44 +11,42 @@ function WebGLMultiview( renderer, requested, options ) {
options = Object.assign( {}, { debug: false }, options );
+ var DEFAULT_NUMVIEWS = 2;
var gl = renderer.context;
var canvas = renderer.domElement;
var capabilities = renderer.capabilities;
var properties = renderer.properties;
- var numViews = 2;
var renderTarget, currentRenderTarget;
- // Auxiliary matrices to be used when updating arrays of uniforms
- var aux = {
- mat4: [],
- mat3: []
- };
+ this.getMaxViews = function () {
- for ( var i = 0; i < numViews; i ++ ) {
+ return capabilities.maxMultiviewViews;
- aux.mat4[ i ] = new Matrix4();
- aux.mat3[ i ] = new Matrix3();
+ };
- }
+ this.getNumViews = function () {
- //
+ return renderTarget ? renderTarget.numViews : 1;
- this.isAvailable = function () {
+ };
- return capabilities.multiview;
+ // Auxiliary matrices to be used when updating arrays of uniforms
+ var mat4 = [];
+ var mat3 = [];
- };
+ for ( var i = 0; i < this.getMaxViews(); i ++ ) {
- this.getNumViews = function () {
+ mat4[ i ] = new Matrix4();
+ mat3[ i ] = new Matrix3();
- return numViews;
+ }
- };
+ //
- this.getMaxViews = function () {
+ this.isAvailable = function () {
- return capabilities.maxMultiviewViews;
+ return capabilities.multiview;
};
@@ -72,82 +70,88 @@ function WebGLMultiview( renderer, requested, options ) {
}
- this.updateCameraProjectionMatrices = function ( camera, p_uniforms ) {
+ this.updateCameraProjectionMatrices = function ( camera, uniforms ) {
+
+ var numViews = this.getNumViews();
if ( camera.isArrayCamera ) {
for ( var i = 0; i < numViews; i ++ ) {
- aux.mat4[ i ].copy( camera.cameras[ i ].projectionMatrix );
+ mat4[ i ].copy( camera.cameras[ i ].projectionMatrix );
}
} else {
for ( var i = 0; i < numViews; i ++ ) {
- aux.mat4[ i ].copy( camera.projectionMatrix );
+ mat4[ i ].copy( camera.projectionMatrix );
}
}
- p_uniforms.setValue( gl, 'projectionMatrices', aux.mat4 );
+ uniforms.setValue( gl, 'projectionMatrices', mat4 );
};
- this.updateCameraViewMatrices = function ( camera, p_uniforms ) {
+ this.updateCameraViewMatrices = function ( camera, uniforms ) {
+
+ var numViews = this.getNumViews();
if ( camera.isArrayCamera ) {
for ( var i = 0; i < numViews; i ++ ) {
- aux.mat4[ i ].copy( camera.cameras[ i ].matrixWorldInverse );
+ mat4[ i ].copy( camera.cameras[ i ].matrixWorldInverse );
}
} else {
for ( var i = 0; i < numViews; i ++ ) {
- aux.mat4[ i ].copy( camera.matrixWorldInverse );
+ mat4[ i ].copy( camera.matrixWorldInverse );
}
}
- p_uniforms.setValue( gl, 'viewMatrices', aux.mat4 );
+ uniforms.setValue( gl, 'viewMatrices', mat4 );
};
- this.updateObjectMatrices = function ( object, camera, p_uniforms ) {
+ this.updateObjectMatrices = function ( object, camera, uniforms ) {
+
+ var numViews = this.getNumViews();
if ( camera.isArrayCamera ) {
for ( var i = 0; i < numViews; i ++ ) {
- aux.mat4[ i ].multiplyMatrices( camera.cameras[ i ].matrixWorldInverse, object.matrixWorld );
- aux.mat3[ i ].getNormalMatrix( aux.mat4[ i ] );
+ mat4[ i ].multiplyMatrices( camera.cameras[ i ].matrixWorldInverse, object.matrixWorld );
+ mat3[ i ].getNormalMatrix( mat4[ i ] );
}
} else {
// In this case we still need to provide an array of matrices but just the first one will be used
- aux.mat4[ 0 ].multiplyMatrices( camera.matrixWorldInverse, object.matrixWorld );
- aux.mat3[ 0 ].getNormalMatrix( aux.mat4[ 0 ] );
+ mat4[ 0 ].multiplyMatrices( camera.matrixWorldInverse, object.matrixWorld );
+ mat3[ 0 ].getNormalMatrix( mat4[ 0 ] );
for ( var i = 1; i < numViews; i ++ ) {
- aux.mat4[ i ].copy( aux.mat4[ 0 ] );
- aux.mat3[ i ].copy( aux.mat3[ 0 ] );
+ mat4[ i ].copy( mat4[ 0 ] );
+ mat3[ i ].copy( mat3[ 0 ] );
}
}
- p_uniforms.setValue( gl, 'modelViewMatrices', aux.mat4 );
- p_uniforms.setValue( gl, 'normalMatrices', aux.mat3 );
+ uniforms.setValue( gl, 'modelViewMatrices', mat4 );
+ uniforms.setValue( gl, 'normalMatrices', mat3 );
};
@@ -167,6 +171,12 @@ function WebGLMultiview( renderer, requested, options ) {
width *= bounds.z;
height *= bounds.w;
+ renderTarget.setNumViews( camera.cameras.length );
+
+ } else {
+
+ renderTarget.setNumViews( DEFAULT_NUMVIEWS );
+
}
renderTarget.setSize( width, height );
@@ -213,7 +223,7 @@ function WebGLMultiview( renderer, requested, options ) {
if ( this.isEnabled() ) {
- renderTarget = new WebGLMultiviewRenderTarget( canvas.width, canvas.height, numViews );
+ renderTarget = new WebGLMultiviewRenderTarget( canvas.width, canvas.height, this.numViews );
}
| true |
Other | mrdoob | three.js | 16c4b71837b24cd207225d2f76d9f16f2b558dec.json | Add setNumViews() to WebGLMultiview | src/renderers/webgl/WebGLTextures.js | @@ -1007,11 +1007,11 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
ext.framebufferTextureMultiviewOVR( _gl.FRAMEBUFFER, _gl.DEPTH_STENCIL_ATTACHMENT, depthStencilTexture, 0, 0, numViews );
var viewFramebuffers = new Array( numViews );
- for ( var viewIndex = 0; viewIndex < numViews; ++ viewIndex ) {
+ for ( var i = 0; i < numViews; ++ i ) {
- viewFramebuffers[ viewIndex ] = _gl.createFramebuffer();
- _gl.bindFramebuffer( _gl.FRAMEBUFFER, viewFramebuffers[ viewIndex ] );
- _gl.framebufferTextureLayer( _gl.FRAMEBUFFER, _gl.COLOR_ATTACHMENT0, colorTexture, 0, viewIndex );
+ viewFramebuffers[ i ] = _gl.createFramebuffer();
+ _gl.bindFramebuffer( _gl.FRAMEBUFFER, viewFramebuffers[ i ] );
+ _gl.framebufferTextureLayer( _gl.FRAMEBUFFER, _gl.COLOR_ATTACHMENT0, colorTexture, 0, i );
}
| true |
Other | mrdoob | three.js | 6509ac6bb3fd818f8200a846f3d4aef23cac9baa.json | Add WebGL multiple views with multiview example | examples/files.js | @@ -206,6 +206,7 @@ var files = {
"webgl_multiple_renderers",
"webgl_multiple_scenes_comparison",
"webgl_multiple_views",
+ "webvr_multiple_views_multiview",
"webgl_nearestneighbour",
"webgl_panorama_cube",
"webgl_panorama_dualfisheye", | true |
Other | mrdoob | three.js | 6509ac6bb3fd818f8200a846f3d4aef23cac9baa.json | Add WebGL multiple views with multiview example | examples/webgl_multiple_views_multiview.html | @@ -0,0 +1,294 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+ <title>three.js performance - animation</title>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
+ <style>
+ body {
+ font-family: Monospace;
+ background-color: #000;
+ margin: 0px;
+ overflow: hidden;
+ }
+ #info {
+ position: absolute;
+ top: 10px;
+ width: 100%;
+ text-align: center;
+ z-index: 100;
+ display:block;
+ }
+ #info p {
+ max-width: 600px;
+ margin-left: auto;
+ margin-right: auto;
+ padding: 0 2em;
+ }
+ #info a {
+ color: #2fa1d6;
+ font-weight: bold;
+ }
+ .dg.ac {
+ z-index: 999 !important;
+ }
+ </style>
+ </head>
+
+ <body>
+
+ <div id="container"></div>
+ <div id="info">
+ <a href="http://threejs.org" target="_blank" rel="noopener">three.js</a> webgl - multiple views using multiview extension - by <a href="https://twitter.com/fernandojsg">fernandojsg</a><br/>
+ <span id="options"></span>
+ </div>
+
+ <script src="../build/three.js"></script>
+ <script src="js/loaders/GLTFLoader.js"></script>
+ <script src="js/libs/stats.min.js"></script>
+ <script>
+
+ var container, clock, stats;
+ var camera, scene, renderer, panel, balls;
+ var radius = 0.08;
+
+ var mixers = [];
+ var cameras = [];
+
+ init();
+
+ function addNumLink( value ) {
+
+ return `<a href="?num=${ value }">${ value }</a>`;
+
+ }
+
+ function init() {
+
+ const urlParams = new URLSearchParams(window.location.search);
+
+ container = document.getElementById('container');
+
+ var options = document.getElementById('options');
+ options.innerHTML =`Number of balls:
+ ${addNumLink(200)}
+ ${addNumLink(500)}
+ ${addNumLink(1000)}
+ ${addNumLink(2500)}
+ ${addNumLink(5000)}`;
+
+
+ var ASPECT_RATIO = window.innerWidth / window.innerHeight;
+ var AMOUNT = 2;
+ var SIZE = 1 / AMOUNT;
+ var WIDTH = ( window.innerWidth / AMOUNT ) * window.devicePixelRatio;
+ var HEIGHT = ( window.innerHeight / AMOUNT ) * window.devicePixelRatio;
+
+ for ( var y = 0; y < AMOUNT; y ++ ) {
+
+ for ( var x = 0; x < AMOUNT; x ++ ) {
+
+ var subcamera = new THREE.PerspectiveCamera( 40 + (x + y) * 20, ASPECT_RATIO, 0.25, 100 );
+ subcamera.bounds = new THREE.Vector4( x / AMOUNT, y / AMOUNT, SIZE, SIZE );
+
+ subcamera.position.x = ( x / AMOUNT ) * 5 - 0.5;
+ subcamera.position.y = ( y / AMOUNT ) * 5 + 1;
+ subcamera.position.z = 6;
+ subcamera.position.multiplyScalar( 1.5 );
+
+ subcamera.lookAt( 0, 2, 0 );
+ subcamera.updateMatrixWorld();
+ cameras.push( subcamera );
+
+ }
+
+ }
+
+ camera = new THREE.ArrayCamera( cameras );
+
+ // Needed to do the frustum culling
+ camera.fov = 180;
+ camera.position.set(0, 0, 6);
+ camera.aspect = ASPECT_RATIO;
+ camera.updateProjectionMatrix();
+
+ //
+
+ scene = new THREE.Scene();
+ scene.background = new THREE.Color( 0xe0e0e0 );
+ scene.fog = new THREE.Fog( 0xe0e0e0, 20, 100 );
+
+ clock = new THREE.Clock();
+
+ // lights
+
+ var light = new THREE.HemisphereLight( 0xffffff, 0x444444 );
+ light.position.set( 0, 20, 0 );
+ scene.add( light );
+
+ light = new THREE.DirectionalLight( 0xffffff );
+ light.position.set( 0, 20, 10 );
+ scene.add( light );
+
+ // ground
+
+ var mesh = new THREE.Mesh( new THREE.PlaneBufferGeometry( 2000, 2000 ), new THREE.MeshPhongMaterial( { color: 0x999999, depthWrite: false } ) );
+ mesh.rotation.x = - Math.PI / 2;
+ scene.add( mesh );
+
+ var grid = new THREE.GridHelper( 200, 40, 0x000000, 0x000000 );
+ grid.material.opacity = 0.2;
+ grid.material.transparent = true;
+ scene.add( grid );
+
+ // balls
+ balls = new THREE.Group();
+ scene.add( balls );
+
+ var geometry = new THREE.IcosahedronBufferGeometry( radius, 2 );
+
+ var numObjects = urlParams.get('num') || 1000;
+
+ for ( var i = 0; i < numObjects; i ++ ) {
+
+ var object = new THREE.Mesh( geometry, new THREE.MeshLambertMaterial( { color: Math.random() * 0xffffff } ) );
+
+ object.position.x = Math.random() * 20 - 10;
+ object.position.y = Math.random() * 10 + 5;
+ object.position.z = Math.random() * 20 - 10;
+
+ object.userData.velocity = new THREE.Vector3();
+ object.userData.velocity.x = Math.random() * 0.01 - 0.005;
+ object.userData.velocity.y = Math.random() * 0.01 - 0.005;
+ object.userData.velocity.z = Math.random() * 0.01 - 0.005;
+
+ balls.add( object );
+
+ }
+
+
+ // model
+
+ var loader = new THREE.GLTFLoader();
+
+ loader.load( 'models/gltf/RobotExpressive/RobotExpressive.glb', function( gltf ) {
+
+ var model = gltf.scene;
+ var animations = gltf.animations;
+
+ scene.add( model );
+
+ var mixer = new THREE.AnimationMixer( model );
+ mixer.clipAction( animations[ 10 ] ).play();
+ mixers.push( mixer );
+
+ animate();
+
+ }, undefined, function( e ) {
+
+ console.error( e );
+
+ } );
+
+ var canvas = document.createElement( 'canvas' );
+ var context = canvas.getContext( 'webgl2', { antialias: false } );
+ renderer = new THREE.WebGLRenderer( { context: context, canvas: canvas, antialias: true, multiview: true } );
+ renderer.setPixelRatio( window.devicePixelRatio );
+ renderer.setSize( window.innerWidth, window.innerHeight );
+ renderer.gammaOutput = true;
+ renderer.gammaFactor = 2.2;
+ container.appendChild( renderer.domElement );
+
+ //
+
+ stats = new Stats();
+ document.body.appendChild( stats.dom );
+ panel = stats.addPanel( new Stats.Panel( 'renderer.render()', '#ff8', '#221' ) );
+ stats.showPanel( 3 );
+
+ window.addEventListener( 'resize', onWindowResize, false );
+
+ }
+
+ function onWindowResize() {
+
+ camera.aspect = window.innerWidth / window.innerHeight;
+ camera.updateProjectionMatrix();
+
+ for ( var i = 0; i < cameras.length; i ++ ) {
+
+ cameras[ i ].aspect = camera.aspect;
+ cameras[ i ].updateProjectionMatrix();
+
+ }
+
+ renderer.setSize( window.innerWidth, window.innerHeight );
+
+ }
+
+ //
+
+ function animate() {
+
+ requestAnimationFrame( animate );
+
+ var delta = clock.getDelta();
+ var time = clock.getElapsedTime();
+
+ for ( var i = 0, il = mixers.length; i < il; i ++ ) {
+
+ mixers[ i ].update( delta );
+
+ }
+
+ // Update camera animations
+ cameras[ 0 ].position.y += Math.sin( time * 2 ) * 0.02;
+ cameras[ 0 ].updateMatrixWorld();
+
+ cameras[ 1 ].position.z += Math.sin( time ) * 0.1;
+ cameras[ 1 ].updateMatrixWorld();
+
+ cameras[ 3 ].position.x = Math.sin( time ) * Math.PI;
+ cameras[ 3 ].position.z = Math.cos( time ) * Math.PI;
+ cameras[ 3 ].lookAt( 0, 2, 0 );
+ cameras[ 3 ].updateMatrixWorld();
+
+ // delta *=1000;
+
+ delta *= 0.5;
+
+ // Update balls
+ for ( var i = 0; i < balls.children.length; i ++ ) {
+
+ var object = balls.children[ i ];
+
+ object.position.y += object.userData.velocity.y * delta;
+
+ // keep objects inside room
+ if ( object.position.y < radius || object.position.y > 15 ) {
+
+ object.position.y = Math.max( object.position.y, radius );
+
+ object.userData.velocity.y = - object.userData.velocity.y * 0.8;
+
+ }
+
+ object.userData.velocity.y -= 9.8 * delta;
+
+ }
+
+ //
+
+ var t = performance.now();
+ renderer.render( scene, camera );
+
+ panel.update(performance.now() - t, 460);
+
+ stats.update();
+
+ }
+
+ </script>
+
+ </body>
+</html> | true |
Other | mrdoob | three.js | b59ce1721c59b687e0870958a4b477ea195b3269.json | Add modelview and normalview matrices | src/renderers/WebGLRenderer.js | @@ -1464,8 +1464,16 @@ function WebGLRenderer( parameters ) {
object.onBeforeRender( _this, scene, camera, geometry, material, group );
currentRenderState = renderStates.get( scene, _currentArrayCamera || camera );
- object.modelViewMatrix.multiplyMatrices( camera.matrixWorldInverse, object.matrixWorld );
- object.normalMatrix.getNormalMatrix( object.modelViewMatrix );
+ if ( multiview.isEnabled() ) {
+
+ multiview.computeObjectMatrices( object, camera );
+
+ } else {
+
+ object.modelViewMatrix.multiplyMatrices( camera.matrixWorldInverse, object.matrixWorld );
+ object.normalMatrix.getNormalMatrix( object.modelViewMatrix );
+
+ }
if ( object.isImmediateRenderObject ) {
@@ -2016,8 +2024,18 @@ function WebGLRenderer( parameters ) {
// common matrices
- p_uniforms.setValue( _gl, 'modelViewMatrix', object.modelViewMatrix );
- p_uniforms.setValue( _gl, 'normalMatrix', object.normalMatrix );
+ if ( material.supportsMultiview && multiview.isEnabled() ) {
+
+ p_uniforms.setValue( _gl, 'modelViewMatrices', object.modelViewMatrices );
+ p_uniforms.setValue( _gl, 'normalMatrices', object.normalMatrices );
+
+ } else {
+
+ p_uniforms.setValue( _gl, 'modelViewMatrix', object.modelViewMatrix );
+ p_uniforms.setValue( _gl, 'normalMatrix', object.normalMatrix );
+
+ }
+
p_uniforms.setValue( _gl, 'modelMatrix', object.matrixWorld );
return program; | true |
Other | mrdoob | three.js | b59ce1721c59b687e0870958a4b477ea195b3269.json | Add modelview and normalview matrices | src/renderers/webgl/WebGLMultiview.js | @@ -3,6 +3,8 @@
*/
import { WebGLRenderTarget } from '../WebGLRenderTarget.js';
+import { Matrix3 } from '../../math/Matrix3.js';
+import { Matrix4 } from '../../math/Matrix4.js';
function WebGLMultiview( requested, gl, canvas, extensions, capabilities, properties ) {
@@ -24,7 +26,6 @@ function WebGLMultiview( requested, gl, canvas, extensions, capabilities, proper
};
-
if ( requested && ! this.isAvailable() ) {
console.warn( 'WebGLRenderer: Multiview requested but not supported by the browser' );
@@ -46,6 +47,47 @@ function WebGLMultiview( requested, gl, canvas, extensions, capabilities, proper
depthStencil: null
};
+ this.computeObjectMatrices = function ( object, camera ) {
+
+ if ( ! object.modelViewMatrices ) {
+
+ object.modelViewMatrices = new Array( numViews );
+ object.normalMatrices = new Array( numViews );
+
+ for ( var i = 0; i < numViews; i ++ ) {
+
+ object.modelViewMatrices[ i ] = new Matrix4();
+ object.normalMatrices[ i ] = new Matrix3();
+
+ }
+
+ }
+
+ if ( camera.isArrayCamera ) {
+
+ for ( var i = 0; i < numViews; i ++ ) {
+
+ object.modelViewMatrices[ i ].multiplyMatrices( camera.cameras[ i ].matrixWorldInverse, object.matrixWorld );
+ object.normalMatrices[ i ].getNormalMatrix( object.modelViewMatrices[ i ] );
+
+ }
+
+ } else {
+
+ // In this case we still need to provide an array of matrices but just the first one will be used
+ object.modelViewMatrices[ 0 ].multiplyMatrices( camera.matrixWorldInverse, object.matrixWorld );
+ object.normalMatrices[ 0 ].getNormalMatrix( object.modelViewMatrices[ 0 ] );
+
+ for ( var i = 0; i < numViews; i ++ ) {
+
+ object.modelViewMatrices[ i ].copy( object.modelViewMatrices[ 0 ] );
+ object.normalMatrices[ i ].copy( object.normalMatrices[ 0 ] );
+
+ }
+
+ }
+
+ };
// @todo Get ArrayCamera
this.createMultiviewRenderTargetTexture = function () { | true |
Other | mrdoob | three.js | b59ce1721c59b687e0870958a4b477ea195b3269.json | Add modelview and normalview matrices | src/renderers/webgl/WebGLProgram.js | @@ -414,11 +414,13 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,
'uniform vec3 cameraPosition;',
material.supportsMultiview && renderer.multiview.isEnabled() ? [
- 'uniform mat4 modelViewMatrix;',
- 'uniform mat3 normalMatrix;',
+ 'uniform mat4 modelViewMatrices[2];',
+ 'uniform mat3 normalMatrices[2];',
'uniform mat4 viewMatrices[2];',
'uniform mat4 projectionMatrices[2];',
+ '#define modelViewMatrix modelViewMatrices[VIEW_ID]',
+ '#define normalMatrix normalMatrices[VIEW_ID]',
'#define viewMatrix viewMatrices[VIEW_ID]',
'#define projectionMatrix projectionMatrices[VIEW_ID]'
| true |
Other | mrdoob | three.js | fc502ee14cf6d7136a1da0e8f43745c424253707.json | Add number of objects parameter on multiview demo | examples/webvr_ballshooter_multiview.html | @@ -112,9 +112,20 @@
}
+ function addNumLink( value ) {
+
+ return `<a href="?num=${ value }&${!multiview ? '' : 'enableMultiview'}">${ value }</a>`;
+
+ }
+
// @todo Change enabled for requested and check renderer.vr.multiview
- info.innerHTML = '<b>OVR_multiview2</b> demo<br/>requested: ' + colorize(multiview) + ` <a href="${multiview ? '?' : '?enableMultiview'}">toggle</a>`
- + `<br/>available: ${ colorize( renderer.multiview.isAvailable() ) }<br/>enabled: ${ colorize( renderer.multiview.isEnabled() ) }<br/><br/>`;
+ info.innerHTML = '<b>OVR_multiview2</b> demo<br/>requested: ' + colorize( multiview ) + ` <a href="?num=${ numObjects }&${ multiview ? '' : 'enableMultiview' }">toggle</a>`
+ + `<br/>available: ${ colorize( renderer.multiview.isAvailable() ) }<br/>enabled: ${ colorize( renderer.multiview.isEnabled() ) }<br/>
+ ${addNumLink(200)}
+ ${addNumLink(500)}
+ ${addNumLink(1000)}
+ ${addNumLink(5000)}
+ <br/>`;
container.appendChild( info );
ms = document.createElement('div');
ms.innerHTML = ''; | false |
Other | mrdoob | three.js | f3c8c6d6e83f1f3bd99904712509a57b4d3ef84f.json | Add multiview status on example | examples/webvr_ballshooter_multiview.html | @@ -44,23 +44,12 @@
animate();
function init() {
- const urlParams = new URLSearchParams(window.location.search);
- const multiview = urlParams.has('enableMultiview');
container = document.createElement( 'div' );
document.body.appendChild( container );
- var info = document.createElement( 'div' );
- info.style.position = 'absolute';
- info.style.top = '10px';
- info.style.width = '100%';
- info.style.textAlign = 'center';
- // @todo Change enabled for requested and check renderer.vr.multiview
- info.innerHTML = 'OVR_multiview2 demo - ' + (multiview ? '<b style="color:#3f3">multiview enabled</b>' : '<b style="color:#f33">multiview not enabled</b>') + ` <a href="${multiview ? '?' : '?enableMultiview'}">toggle</a>`;
- container.appendChild( info );
- ms = document.createElement('div');
- ms.innerHTML = '';
- info.appendChild(ms);
+ const urlParams = new URLSearchParams(window.location.search);
+ const multiview = urlParams.has('enableMultiview');
scene = new THREE.Scene();
scene.background = new THREE.Color( 0x505050 );
@@ -111,6 +100,29 @@
//
+ var info = document.createElement( 'div' );
+ info.style.position = 'absolute';
+ info.style.top = '10px';
+ info.style.width = '100%';
+ info.style.textAlign = 'center';
+
+ function colorize( value ) {
+
+ return value ? '<b style="color:#3f3">true</b>' : '<b style="color:#f33">false</b>';
+
+ }
+
+ // @todo Change enabled for requested and check renderer.vr.multiview
+ info.innerHTML = '<b>OVR_multiview2</b> demo<br/>requested: ' + colorize(multiview) + ` <a href="${multiview ? '?' : '?enableMultiview'}">toggle</a>`
+ + `<br/>available: ${ colorize( renderer.multiview.isAvailable() ) }<br/>enabled: ${ colorize( renderer.multiview.isEnabled() ) }<br/><br/>`;
+ container.appendChild( info );
+ ms = document.createElement('div');
+ ms.innerHTML = '';
+ info.appendChild(ms);
+
+ //+ (multiview ? '<b style="color:#3f3">true</b>' : '<b style="color:#f33">false</b>')
+ //
+
document.body.appendChild( WEBVR.createButton( renderer ) );
// controllers | true |
Other | mrdoob | three.js | f3c8c6d6e83f1f3bd99904712509a57b4d3ef84f.json | Add multiview status on example | src/renderers/WebGLRenderer.js | @@ -62,7 +62,7 @@ function WebGLRenderer( parameters ) {
var _canvas = parameters.canvas !== undefined ? parameters.canvas : document.createElementNS( 'http://www.w3.org/1999/xhtml', 'canvas' ),
_context = parameters.context !== undefined ? parameters.context : null,
- _multiview = parameters.multiview !== undefined ? parameters.multiview : false,
+ _multiviewRequested = parameters.multiview !== undefined ? parameters.multiview : false,
_alpha = parameters.alpha !== undefined ? parameters.alpha : false,
_depth = parameters.depth !== undefined ? parameters.depth : true,
@@ -318,8 +318,8 @@ function WebGLRenderer( parameters ) {
this.vr = vr;
- var multiviewObject = new WebGLMultiview(_multiview, _gl, _canvas, extensions, capabilities );
- var multiviewEnabled = this.multiviewEnabled = multiviewObject.isEnabled();
+ var multiview = this.multiview = new WebGLMultiview(_multiviewRequested, _gl, _canvas, extensions, capabilities );
+ var multiviewEnabled = this.multiviewEnabled = multiview.isEnabled();
// shadow map
@@ -1373,7 +1373,7 @@ function WebGLRenderer( parameters ) {
if ( multiviewEnabled ) {
- multiviewObject.bindMultiviewFrameBuffer( camera );
+ multiview.bindMultiviewFrameBuffer( camera );
_gl.disable( _gl.SCISSOR_TEST );
@@ -1406,7 +1406,7 @@ function WebGLRenderer( parameters ) {
}
- multiviewObject.unbindMultiviewFrameBuffer( camera );
+ multiview.unbindMultiviewFrameBuffer( camera );
} else {
| true |
Other | mrdoob | three.js | f3c8c6d6e83f1f3bd99904712509a57b4d3ef84f.json | Add multiview status on example | src/renderers/webgl/WebGLMultiview.js | @@ -1,3 +1,7 @@
+/**
+ * @author fernandojsg / http://fernandojsg.com
+ */
+
function WebGLMultiview( requested, gl, canvas, extensions, capabilities ) {
this.isAvailable = function () { | true |
Other | mrdoob | three.js | f3c8c6d6e83f1f3bd99904712509a57b4d3ef84f.json | Add multiview status on example | src/renderers/webgl/WebGLProgram.js | @@ -415,10 +415,10 @@ function WebGLProgram( renderer, extensions, code, material, shader, parameters,
renderer.multiviewEnabled ? [
'uniform mat4 modelViewMatrix;',
- 'uniform mat4 projectionMatrices[2];',
'uniform mat3 normalMatrix;',
-
'uniform mat4 viewMatrices[2];',
+ 'uniform mat4 projectionMatrices[2];',
+
'#define viewMatrix viewMatrices[VIEW_ID]',
'#define projectionMatrix projectionMatrices[VIEW_ID]'
| true |
Other | mrdoob | three.js | 6f91e54fcd8b9413643cd9fe064cb492f6a14a26.json | Remove polyfill for Helio. | examples/js/vr/HelioWebXRPolyfill.js | @@ -4,6 +4,10 @@
if ( /(Helio)/g.test( navigator.userAgent ) && "xr" in navigator ) {
+ if ('isSessionSupported' in navigator.xr) {
+ return;
+ }
+
console.log( "Helio WebXR Polyfill (Lumin 0.97.0)" );
const isHelio96 = navigator.userAgent.includes( "Chrome/73" ); | false |
Other | mrdoob | three.js | 9d018e0a463178fa28ac3043d666383c2493a788.json | Remove unneeded copy function | examples/js/lines/LineMaterial.js | @@ -373,23 +373,3 @@ THREE.LineMaterial.prototype.constructor = THREE.LineMaterial;
THREE.LineMaterial.prototype.isLineMaterial = true;
-THREE.LineMaterial.prototype.copy = function ( source ) {
-
- THREE.ShaderMaterial.prototype.copy.call( this, source );
-
- this.color.copy( source.color );
-
- this.linewidth = source.linewidth;
-
- this.dashScale = source.dashScale;
-
- this.dashSize = source.dashSize;
-
- this.gapSize = source.gapSize;
-
- this.resolution = source.resolution;
-
- return this;
-
-};
- | true |
Other | mrdoob | three.js | 9d018e0a463178fa28ac3043d666383c2493a788.json | Remove unneeded copy function | examples/jsm/lines/LineMaterial.js | @@ -381,25 +381,5 @@ LineMaterial.prototype.constructor = LineMaterial;
LineMaterial.prototype.isLineMaterial = true;
-LineMaterial.prototype.copy = function ( source ) {
-
- ShaderMaterial.prototype.copy.call( this, source );
-
- this.color.copy( source.color );
-
- this.linewidth = source.linewidth;
-
- this.dashScale = source.dashScale;
-
- this.dashSize = source.dashSize;
-
- this.gapSize = source.gapSize;
-
- this.resolution = source.resolution;
-
- return this;
-
-};
-
export { LineMaterial }; | true |
Other | mrdoob | three.js | ea7d602a0619ba2b12d81f09e2472d455f004e36.json | Remove other copy functions | examples/js/lines/LineSegmentsGeometry.js | @@ -239,20 +239,6 @@ THREE.LineSegmentsGeometry.prototype = Object.assign( Object.create( THREE.Insta
// todo
- },
-
- clone: function () {
-
- // todo
-
- },
-
- copy: function ( /* source */ ) {
-
- // todo
-
- return this;
-
}
} ); | true |
Other | mrdoob | three.js | ea7d602a0619ba2b12d81f09e2472d455f004e36.json | Remove other copy functions | examples/js/lines/Wireframe.js | @@ -52,14 +52,6 @@ THREE.Wireframe.prototype = Object.assign( Object.create( THREE.Mesh.prototype )
};
- }() ),
-
- copy: function ( /* source */ ) {
-
- // todo
-
- return this;
-
- }
+ }() )
} ); | true |
Other | mrdoob | three.js | ea7d602a0619ba2b12d81f09e2472d455f004e36.json | Remove other copy functions | examples/js/lines/WireframeGeometry2.js | @@ -19,14 +19,6 @@ THREE.WireframeGeometry2.prototype = Object.assign( Object.create( THREE.LineSeg
constructor: THREE.WireframeGeometry2,
- isWireframeGeometry2: true,
-
- copy: function ( /* source */ ) {
-
- // todo
-
- return this;
-
- }
+ isWireframeGeometry2: true
} ); | true |
Other | mrdoob | three.js | f8648ce40b18a403fb0ae27052acce88e33ed1c7.json | Add version of lumin | examples/js/vr/HelioWebXRPolyfill.js | @@ -2,132 +2,166 @@
* @author mvilledieu / http://github.com/mvilledieu
*/
-if (/(Helio)/g.test(navigator.userAgent) && "xr" in navigator) {
- console.log("Helio WebXR Polyfill", navigator.xr);
+if ( /(Helio)/g.test( navigator.userAgent ) && "xr" in navigator ) {
- // WebXRManager - XR.supportSession() Polyfill - WebVR.js line 147
+ console.log( "Helio WebXR Polyfill (Lumin 0.96.0)", navigator.xr );
- if (
- "supportsSession" in navigator.xr === false &&
+ // WebXRManager - XR.supportSession() Polyfill - WebVR.js line 147
+
+ if (
+ "supportsSession" in navigator.xr === false &&
"supportsSessionMode" in navigator.xr
- ) {
- navigator.xr.supportsSession = navigator.xr.supportsSessionMode;
- }
+ ) {
+
+ navigator.xr.supportsSession = navigator.xr.supportsSessionMode;
+
+ }
+
+ if ( "requestSession" in navigator.xr ) {
+
+ const tempRequestSession = navigator.xr.requestSession.bind( navigator.xr );
+
+ navigator.xr.requestSession = function ( sessionType ) {
+
+ return new Promise( ( resolve, reject ) => {
+
+ tempRequestSession( {
+ mode: sessionType
+ } )
+ .then( function ( session ) {
+
+ // WebXRManager - xrFrame.getPose() Polyfill - line 279
+
+ const tempRequestAnimationFrame = session.requestAnimationFrame.bind(
+ session
+ );
+
+ session.requestAnimationFrame = function ( callback ) {
+
+ return tempRequestAnimationFrame( function ( time, frame ) {
+
+ // WebXRManager - xrFrame.getViewerPose() Polyfill - line 279
+ // Transforms view.viewMatrix to view.transform.inverse.matrix
+
+ const tempGetViewerPose = frame.getViewerPose.bind( frame );
+
+ frame.getViewerPose = function ( referenceSpace ) {
+
+ const pose = tempGetViewerPose( referenceSpace );
+
+ pose.views.forEach( function ( view ) {
+
+ view.transform = {
+ inverse: {
+ matrix: view.viewMatrix
+ }
+ };
+
+ } );
+
+ return pose;
+
+ };
+
+ // WebXRManager - xrFrame.getPose() Polyfill - line 259
+
+ frame.getPose = function ( targetRaySpace, referenceSpace ) {
+
+ const inputPose = frame.getInputPose(
+ targetRaySpace,
+ referenceSpace
+ );
+
+ inputPose.transform = {
+ matrix: inputPose.targetRay.transformMatrix
+ };
+
+ return inputPose;
+
+ };
+
+ callback( time, frame );
+
+ } );
+
+ };
+
+ // WebXRManager - xrFrame.getPose( inputSource.targetRaySpace, referenceSpace) Polyfill - line 279
+
+ const tempGetInputSources = session.getInputSources.bind( session );
+
+ session.getInputSources = function () {
+
+ const res = tempGetInputSources();
+
+ res.forEach( xrInputSource => {
+
+ Object.defineProperty( xrInputSource, "targetRaySpace", {
+ get: function () {
+
+ return xrInputSource;
+
+ }
+ } );
+
+ } );
+
+ return res;
+
+ };
+
+ // WebXRManager - xrSession.getInputSources() Polyfill Line 132 - 136
+
+ session.inputSources = Object.defineProperty(
+ session,
+ "inputSources",
+ {
+ get: session.getInputSources
+ }
+ );
+
+ // WebXRManager - xrSession.updateRenderState() Polyfill Line 129
+
+ session.updateRenderState = function ( { baseLayer } ) {
+
+ session.baseLayer = baseLayer;
+
+ // WebXRManager - xrSession.renderState.baseLayer Polyfill Line 219
+
+ session.renderState = {
+ baseLayer: baseLayer
+ };
+
+ };
+
+ // WebXRManager - xrSession.requestReferenceSpace() Polyfill Line 130
+
+ const tempRequestReferenceSpace = session.requestReferenceSpace.bind(
+ session
+ );
+
+ session.requestReferenceSpace = function () {
+
+ return tempRequestReferenceSpace( {
+ type: "stationary",
+ subtype: "floor-level"
+ } );
+
+ };
+
+ resolve( session );
+
+ } )
+ .catch( function ( error ) {
+
+ return reject( error );
+
+ } );
+
+ } );
- if ("requestSession" in navigator.xr) {
- const tempRequestSession = navigator.xr.requestSession.bind(navigator.xr);
+ };
- navigator.xr.requestSession = function(sessionType) {
- return new Promise((resolve, reject) => {
- tempRequestSession({
- mode: sessionType
- })
- .then(function(session) {
- // WebXRManager - xrFrame.getPose() Polyfill - line 279
+ }
- const tempRequestAnimationFrame = session.requestAnimationFrame.bind(
- session
- );
-
- session.requestAnimationFrame = function(callback) {
- return tempRequestAnimationFrame(function(time, frame) {
- // WebXRManager - xrFrame.getViewerPose() Polyfill - line 279
- // Transforms view.viewMatrix to view.transform.inverse.matrix
-
- const tempGetViewerPose = frame.getViewerPose.bind(frame);
-
- frame.getViewerPose = function(referenceSpace) {
- const pose = tempGetViewerPose(referenceSpace);
-
- pose.views.forEach(function(view) {
- view.transform = {
- inverse: {
- matrix: view.viewMatrix
- }
- };
- });
-
- return pose;
- };
-
- // WebXRManager - xrFrame.getPose() Polyfill - line 259
-
- frame.getPose = function(targetRaySpace, referenceSpace) {
- const inputPose = frame.getInputPose(
- targetRaySpace,
- referenceSpace
- );
-
- inputPose.transform = {
- matrix: inputPose.targetRay.transformMatrix
- };
-
- return inputPose;
- };
-
- callback(time, frame);
- });
- };
-
- // WebXRManager - xrFrame.getPose( inputSource.targetRaySpace, referenceSpace) Polyfill - line 279
-
- const tempGetInputSources = session.getInputSources.bind(session);
-
- session.getInputSources = function() {
- const res = tempGetInputSources();
-
- res.forEach(xrInputSource => {
- Object.defineProperty(xrInputSource, "targetRaySpace", {
- get: function() {
- return xrInputSource;
- }
- });
- });
-
- return res;
- };
-
- // WebXRManager - xrSession.getInputSources() Polyfill Line 132 - 136
-
- session.inputSources = Object.defineProperty(
- session,
- "inputSources",
- {
- get: session.getInputSources
- }
- );
-
- // WebXRManager - xrSession.updateRenderState() Polyfill Line 129
-
- session.updateRenderState = function({ baseLayer }) {
- session.baseLayer = baseLayer;
-
- // WebXRManager - xrSession.renderState.baseLayer Polyfill Line 219
-
- session.renderState = {
- baseLayer: baseLayer
- };
- };
-
- // WebXRManager - xrSession.requestReferenceSpace() Polyfill Line 130
-
- const tempRequestReferenceSpace = session.requestReferenceSpace.bind(
- session
- );
-
- session.requestReferenceSpace = function() {
- return tempRequestReferenceSpace({
- type: "stationary",
- subtype: "floor-level"
- });
- };
-
- resolve(session);
- })
- .catch(function(error) {
- return reject(error);
- });
- });
- };
- }
} | false |
Other | mrdoob | three.js | 87245cb81f80266dd66df4c4e41df1501f8d4d0a.json | Follow GLTFLoader api for parse() | examples/js/loaders/LDrawLoader.js | @@ -599,11 +599,11 @@ THREE.LDrawLoader = ( function () {
},
- parse: function ( text, onParsed ) {
+ parse: function ( text, path, onLoad ) {
// Async parse. This function calls onParse with the parsed THREE.Object3D as parameter
- this.processObject( text, onProcessed, null, "" );
+ this.processObject( text, onLoad, null, path );
},
| false |
Other | mrdoob | three.js | c5024cdace6d9f11371ebab6462cc7020d4d9938.json | remove need for state.id | src/renderers/WebGLRenderer.js | @@ -1441,8 +1441,7 @@ function WebGLRenderer( parameters ) {
var lights = currentRenderState.state.lights;
var shadowsArray = currentRenderState.state.shadowsArray;
- var lightsHash = materialProperties.lightsHash;
- var lightsStateHash = lights.state.hash;
+ var lightsStateVersion = lights.state.version;
var parameters = programCache.getParameters(
material, lights.state, shadowsArray, fog, _clipping.numPlanes, _clipping.numIntersection, object );
@@ -1462,11 +1461,9 @@ function WebGLRenderer( parameters ) {
// changed glsl or parameters
releaseMaterialProgramReference( material );
- } else if ( lightsHash.stateID !== lightsStateHash.stateID ||
- lightsHash.version !== lightsStateHash.version ) {
+ } else if ( materialProperties.lightsStateVersion !== lightsStateVersion ) {
- lightsHash.stateID = lightsStateHash.stateID;
- lightsHash.version = lightsStateHash.version;
+ materialProperties.lightsStateVersion = lightsStateVersion;
programChange = false;
@@ -1567,14 +1564,8 @@ function WebGLRenderer( parameters ) {
materialProperties.fog = fog;
// store the light setup it was created for
- if ( lightsHash === undefined ) {
- materialProperties.lightsHash = lightsHash = {};
-
- }
-
- lightsHash.stateID = lightsStateHash.stateID;
- lightsHash.version = lightsStateHash.version;
+ materialProperties.lightsStateVersion = lightsStateVersion;
if ( material.lights ) {
@@ -1613,9 +1604,6 @@ function WebGLRenderer( parameters ) {
var materialProperties = properties.get( material );
var lights = currentRenderState.state.lights;
- var lightsHash = materialProperties.lightsHash;
- var lightsStateHash = lights.state.hash;
-
if ( _clippingEnabled ) {
if ( _localClippingEnabled || camera !== _currentCamera ) {
@@ -1645,8 +1633,7 @@ function WebGLRenderer( parameters ) {
material.needsUpdate = true;
- } else if ( material.lights && ( lightsHash.stateID !== lightsStateHash.stateID ||
- lightsHash.version !== lightsStateHash.version ) ) {
+ } else if ( material.lights && materialProperties.lightsStateVersion !== lights.state.version ) {
material.needsUpdate = true;
| true |
Other | mrdoob | three.js | c5024cdace6d9f11371ebab6462cc7020d4d9938.json | remove need for state.id | src/renderers/webgl/WebGLLights.js | @@ -100,25 +100,23 @@ function UniformsCache() {
}
-var count = 0;
+var nextVersion = 0;
function WebGLLights() {
var cache = new UniformsCache();
var state = {
- id: count ++,
+ version: 0,
hash: {
- stateID: - 1,
directionalLength: - 1,
pointLength: - 1,
spotLength: - 1,
rectAreaLength: - 1,
hemiLength: - 1,
shadowsLength: - 1,
- version: 0
},
ambient: [ 0, 0, 0 ],
@@ -347,15 +345,14 @@ function WebGLLights() {
state.point.length = pointLength;
state.hemi.length = hemiLength;
- hash.stateID = state.id;
hash.directionalLength = directionalLength;
hash.pointLength = pointLength;
hash.spotLength = spotLength;
hash.rectAreaLength = rectAreaLength;
hash.hemiLength = hemiLength;
hash.shadowsLength = shadows.length;
- hash.version ++;
+ state.version = nextVersion++;
}
| true |
Other | mrdoob | three.js | 58bd51ef3668a2c225dc168d3be4f9f1564ece69.json | Update skeleton only once in a frame | src/objects/Skeleton.js | @@ -16,6 +16,8 @@ function Skeleton( bones, boneInverses ) {
this.bones = bones.slice( 0 );
this.boneMatrices = new Float32Array( this.bones.length * 16 );
+ this.version = - 1;
+
// use the supplied bone inverses or calculate the inverses
if ( boneInverses === undefined ) { | true |
Other | mrdoob | three.js | 58bd51ef3668a2c225dc168d3be4f9f1564ece69.json | Update skeleton only once in a frame | src/renderers/WebGLRenderer.js | @@ -1306,7 +1306,14 @@ function WebGLRenderer( parameters ) {
if ( object.isSkinnedMesh ) {
- object.skeleton.update();
+ // update skeleton only once in a frame
+
+ if ( object.skeleton.version !== info.render.frame ) {
+
+ object.skeleton.update();
+ object.skeleton.version = info.render.frame;
+
+ }
}
| true |
Other | mrdoob | three.js | 2bef01fc9c151931a685e2e1a4e0436f85fe8122.json | fix eslint issues | test/unit/src/math/Quaternion.tests.js | @@ -713,31 +713,40 @@ export default QUnit.module( 'Maths', () => {
QUnit.test( "_onChange", ( assert ) => {
-
+ var b = false;
var f = function () {
- var b = true;
+ b = true;
};
var a = new Quaternion( 11, 12, 13, 1 );
a._onChange( f );
assert.ok( a._onChangeCallback === f, "Passed!" );
+ a._onChangeCallback();
+ assert.ok( b, "Passed!" );
+
+
} );
QUnit.test( "_onChangeCallback", ( assert ) => {
+ var b = false;
var f = function () {
- var b = true;
+ b = true;
};
var a = new Quaternion( 11, 12, 13, 1 );
a._onChangeCallback = f;
assert.ok( a._onChangeCallback === f, "Passed!" );
+
+ a._onChangeCallback();
+ assert.ok( b, "Passed!" );
+
} );
// OTHERS | false |
Other | mrdoob | three.js | 2a2cafcac2af98a008b3761d2bc4e63c905ef6a3.json | add quaternion tests | test/unit/src/math/Quaternion.tests.js | @@ -358,9 +358,20 @@ export default QUnit.module( 'Maths', () => {
} );
- QUnit.todo( "clone", ( assert ) => {
+ QUnit.test( "clone", ( assert ) => {
- assert.ok( false, "everything's gonna be alright" );
+
+ var a = new Quaternion().clone();
+ assert.ok( a.x == 0, "Passed!" );
+ assert.ok( a.y == 0, "Passed!" );
+ assert.ok( a.z == 0, "Passed!" );
+ assert.ok( a.w == 1, "Passed!" );
+
+ var b = a.set( x, y, z, w ).clone();
+ assert.ok( b.x == x, "Passed!" );
+ assert.ok( b.y == y, "Passed!" );
+ assert.ok( b.z === z, "Passed!" );
+ assert.ok( b.w === w, "Passed!" );
} );
@@ -600,9 +611,39 @@ export default QUnit.module( 'Maths', () => {
} );
- QUnit.todo( "slerp", ( assert ) => {
+ QUnit.test( "slerp", ( assert ) => {
+
+ var a = new Quaternion( x, y, z, w );
+ var b = new Quaternion( - x, - y, - z, - w );
+
+ var c = a.clone().slerp( b, 0 );
+ var d = a.clone().slerp( b, 1 );
+
+ assert.ok( a.equals( c ), "Passed" );
+ assert.ok( b.equals( d ), "Passed" );
+
- assert.ok( false, "everything's gonna be alright" );
+ var D = Math.SQRT1_2;
+
+ var e = new Quaternion( 1, 0, 0, 0 );
+ var f = new Quaternion( 0, 0, 1, 0 );
+ var expected = new Quaternion( D, 0, D, 0 );
+ var result = e.clone().slerp( f, 0.5 );
+ assert.ok( Math.abs( result.x - expected.x ) <= eps, "Check x" );
+ assert.ok( Math.abs( result.y - expected.y ) <= eps, "Check y" );
+ assert.ok( Math.abs( result.z - expected.z ) <= eps, "Check z" );
+ assert.ok( Math.abs( result.w - expected.w ) <= eps, "Check w" );
+
+
+ var g = new Quaternion( 0, D, 0, D );
+ var h = new Quaternion( 0, - D, 0, D );
+ expected = new Quaternion( 0, 0, 0, 1 );
+ result = g.clone().slerp( h, 0.5 );
+
+ assert.ok( Math.abs( result.x - expected.x ) <= eps, "Check x" );
+ assert.ok( Math.abs( result.y - expected.y ) <= eps, "Check y" );
+ assert.ok( Math.abs( result.z - expected.z ) <= eps, "Check z" );
+ assert.ok( Math.abs( result.w - expected.w ) <= eps, "Check w" );
} );
@@ -626,9 +667,20 @@ export default QUnit.module( 'Maths', () => {
} );
- QUnit.todo( "fromArray", ( assert ) => {
+ QUnit.test( "fromArray", ( assert ) => {
+
+ var a = new Quaternion();
+ a.fromArray( [ x, y, z, w ] );
+ assert.ok( a.x == x, "Passed!" );
+ assert.ok( a.y == y, "Passed!" );
+ assert.ok( a.z === z, "Passed!" );
+ assert.ok( a.w === w, "Passed!" );
- assert.ok( false, "everything's gonna be alright" );
+ a.fromArray( [ undefined, x, y, z, w, undefined ], 1 );
+ assert.ok( a.x == x, "Passed!" );
+ assert.ok( a.y == y, "Passed!" );
+ assert.ok( a.z === z, "Passed!" );
+ assert.ok( a.w === w, "Passed!" );
} );
| false |
Other | mrdoob | three.js | 2655e47d8cb64c003e73ad3a86ad2e0ec609be51.json | fix lint errors | examples/js/misc/GPUComputationRenderer.js | @@ -97,7 +97,7 @@
* @param {WebGLRenderer} renderer The renderer
*/
-THREE.GPUComputationRenderer = function( sizeX, sizeY, renderer ) {
+THREE.GPUComputationRenderer = function ( sizeX, sizeY, renderer ) {
this.variables = [];
@@ -118,7 +118,7 @@ THREE.GPUComputationRenderer = function( sizeX, sizeY, renderer ) {
scene.add( mesh );
- this.addVariable = function( variableName, computeFragmentShader, initialValueTexture ) {
+ this.addVariable = function ( variableName, computeFragmentShader, initialValueTexture ) {
var material = this.createShaderMaterial( computeFragmentShader );
@@ -140,13 +140,13 @@ THREE.GPUComputationRenderer = function( sizeX, sizeY, renderer ) {
};
- this.setVariableDependencies = function( variable, dependencies ) {
+ this.setVariableDependencies = function ( variable, dependencies ) {
variable.dependencies = dependencies;
};
- this.init = function() {
+ this.init = function () {
if ( ! renderer.extensions.get( "OES_texture_float" ) ) {
@@ -160,7 +160,7 @@ THREE.GPUComputationRenderer = function( sizeX, sizeY, renderer ) {
}
- for ( var i = 0; i < this.variables.length; i++ ) {
+ for ( var i = 0; i < this.variables.length; i ++ ) {
var variable = this.variables[ i ];
@@ -175,24 +175,28 @@ THREE.GPUComputationRenderer = function( sizeX, sizeY, renderer ) {
var uniforms = material.uniforms;
if ( variable.dependencies !== null ) {
- for ( var d = 0; d < variable.dependencies.length; d++ ) {
+ for ( var d = 0; d < variable.dependencies.length; d ++ ) {
var depVar = variable.dependencies[ d ];
if ( depVar.name !== variable.name ) {
// Checks if variable exists
var found = false;
- for ( var j = 0; j < this.variables.length; j++ ) {
+ for ( var j = 0; j < this.variables.length; j ++ ) {
if ( depVar.name === this.variables[ j ].name ) {
+
found = true;
break;
+
}
}
if ( ! found ) {
+
return "Variable dependency not found. Variable=" + variable.name + ", dependency=" + depVar.name;
+
}
}
@@ -202,7 +206,9 @@ THREE.GPUComputationRenderer = function( sizeX, sizeY, renderer ) {
material.fragmentShader = "\nuniform sampler2D " + depVar.name + ";\n" + material.fragmentShader;
}
+
}
+
}
this.currentTextureIndex = 0;
@@ -211,20 +217,20 @@ THREE.GPUComputationRenderer = function( sizeX, sizeY, renderer ) {
};
- this.compute = function() {
+ this.compute = function () {
var currentTextureIndex = this.currentTextureIndex;
var nextTextureIndex = this.currentTextureIndex === 0 ? 1 : 0;
- for ( var i = 0, il = this.variables.length; i < il; i++ ) {
+ for ( var i = 0, il = this.variables.length; i < il; i ++ ) {
var variable = this.variables[ i ];
// Sets texture dependencies uniforms
if ( variable.dependencies !== null ) {
var uniforms = variable.material.uniforms;
- for ( var d = 0, dl = variable.dependencies.length; d < dl; d++ ) {
+ for ( var d = 0, dl = variable.dependencies.length; d < dl; d ++ ) {
var depVar = variable.dependencies[ d ];
@@ -240,15 +246,16 @@ THREE.GPUComputationRenderer = function( sizeX, sizeY, renderer ) {
}
this.currentTextureIndex = nextTextureIndex;
+
};
- this.getCurrentRenderTarget = function( variable ) {
+ this.getCurrentRenderTarget = function ( variable ) {
return variable.renderTargets[ this.currentTextureIndex ];
};
- this.getAlternateRenderTarget = function( variable ) {
+ this.getAlternateRenderTarget = function ( variable ) {
return variable.renderTargets[ this.currentTextureIndex === 0 ? 1 : 0 ];
@@ -282,7 +289,7 @@ THREE.GPUComputationRenderer = function( sizeX, sizeY, renderer ) {
this.createShaderMaterial = createShaderMaterial;
- this.createRenderTarget = function( sizeXTexture, sizeYTexture, wrapS, wrapT, minFilter, magFilter ) {
+ this.createRenderTarget = function ( sizeXTexture, sizeYTexture, wrapS, wrapT, minFilter, magFilter ) {
sizeXTexture = sizeXTexture || sizeX;
sizeYTexture = sizeYTexture || sizeY;
@@ -308,7 +315,7 @@ THREE.GPUComputationRenderer = function( sizeX, sizeY, renderer ) {
};
- this.createTexture = function() {
+ this.createTexture = function () {
var a = new Float32Array( sizeX * sizeY * 4 );
var texture = new THREE.DataTexture( a, sizeX, sizeY, THREE.RGBAFormat, THREE.FloatType );
@@ -318,21 +325,21 @@ THREE.GPUComputationRenderer = function( sizeX, sizeY, renderer ) {
};
- this.renderTexture = function( input, output ) {
+ this.renderTexture = function ( input, output ) {
// Takes a texture, and render out in rendertarget
// input = Texture
// output = RenderTarget
passThruUniforms.texture.value = input;
- this.doRenderTarget( passThruShader, output);
+ this.doRenderTarget( passThruShader, output );
passThruUniforms.texture.value = null;
};
- this.doRenderTarget = function( material, output ) {
+ this.doRenderTarget = function ( material, output ) {
var currentRenderTarget = renderer.getRenderTarget();
| true |
Other | mrdoob | three.js | 2655e47d8cb64c003e73ad3a86ad2e0ec609be51.json | fix lint errors | examples/jsm/misc/GPUComputationRenderer.js | @@ -112,7 +112,7 @@ import {
WebGLRenderTarget
} from "../../../build/three.module.js";
-var GPUComputationRenderer = function( sizeX, sizeY, renderer ) {
+var GPUComputationRenderer = function ( sizeX, sizeY, renderer ) {
this.variables = [];
@@ -133,7 +133,7 @@ var GPUComputationRenderer = function( sizeX, sizeY, renderer ) {
scene.add( mesh );
- this.addVariable = function( variableName, computeFragmentShader, initialValueTexture ) {
+ this.addVariable = function ( variableName, computeFragmentShader, initialValueTexture ) {
var material = this.createShaderMaterial( computeFragmentShader );
@@ -155,13 +155,13 @@ var GPUComputationRenderer = function( sizeX, sizeY, renderer ) {
};
- this.setVariableDependencies = function( variable, dependencies ) {
+ this.setVariableDependencies = function ( variable, dependencies ) {
variable.dependencies = dependencies;
};
- this.init = function() {
+ this.init = function () {
if ( ! renderer.extensions.get( "OES_texture_float" ) ) {
@@ -175,7 +175,7 @@ var GPUComputationRenderer = function( sizeX, sizeY, renderer ) {
}
- for ( var i = 0; i < this.variables.length; i++ ) {
+ for ( var i = 0; i < this.variables.length; i ++ ) {
var variable = this.variables[ i ];
@@ -190,24 +190,29 @@ var GPUComputationRenderer = function( sizeX, sizeY, renderer ) {
var uniforms = material.uniforms;
if ( variable.dependencies !== null ) {
- for ( var d = 0; d < variable.dependencies.length; d++ ) {
+ for ( var d = 0; d < variable.dependencies.length; d ++ ) {
var depVar = variable.dependencies[ d ];
if ( depVar.name !== variable.name ) {
// Checks if variable exists
var found = false;
- for ( var j = 0; j < this.variables.length; j++ ) {
+ for ( var j = 0; j < this.variables.length; j ++ ) {
if ( depVar.name === this.variables[ j ].name ) {
+
found = true;
break;
+
}
}
+
if ( ! found ) {
+
return "Variable dependency not found. Variable=" + variable.name + ", dependency=" + depVar.name;
+
}
}
@@ -217,7 +222,9 @@ var GPUComputationRenderer = function( sizeX, sizeY, renderer ) {
material.fragmentShader = "\nuniform sampler2D " + depVar.name + ";\n" + material.fragmentShader;
}
+
}
+
}
this.currentTextureIndex = 0;
@@ -226,20 +233,20 @@ var GPUComputationRenderer = function( sizeX, sizeY, renderer ) {
};
- this.compute = function() {
+ this.compute = function () {
var currentTextureIndex = this.currentTextureIndex;
var nextTextureIndex = this.currentTextureIndex === 0 ? 1 : 0;
- for ( var i = 0, il = this.variables.length; i < il; i++ ) {
+ for ( var i = 0, il = this.variables.length; i < il; i ++ ) {
var variable = this.variables[ i ];
// Sets texture dependencies uniforms
if ( variable.dependencies !== null ) {
var uniforms = variable.material.uniforms;
- for ( var d = 0, dl = variable.dependencies.length; d < dl; d++ ) {
+ for ( var d = 0, dl = variable.dependencies.length; d < dl; d ++ ) {
var depVar = variable.dependencies[ d ];
@@ -255,15 +262,16 @@ var GPUComputationRenderer = function( sizeX, sizeY, renderer ) {
}
this.currentTextureIndex = nextTextureIndex;
+
};
- this.getCurrentRenderTarget = function( variable ) {
+ this.getCurrentRenderTarget = function ( variable ) {
return variable.renderTargets[ this.currentTextureIndex ];
};
- this.getAlternateRenderTarget = function( variable ) {
+ this.getAlternateRenderTarget = function ( variable ) {
return variable.renderTargets[ this.currentTextureIndex === 0 ? 1 : 0 ];
@@ -297,7 +305,7 @@ var GPUComputationRenderer = function( sizeX, sizeY, renderer ) {
this.createShaderMaterial = createShaderMaterial;
- this.createRenderTarget = function( sizeXTexture, sizeYTexture, wrapS, wrapT, minFilter, magFilter ) {
+ this.createRenderTarget = function ( sizeXTexture, sizeYTexture, wrapS, wrapT, minFilter, magFilter ) {
sizeXTexture = sizeXTexture || sizeX;
sizeYTexture = sizeYTexture || sizeY;
@@ -323,7 +331,7 @@ var GPUComputationRenderer = function( sizeX, sizeY, renderer ) {
};
- this.createTexture = function() {
+ this.createTexture = function () {
var a = new Float32Array( sizeX * sizeY * 4 );
var texture = new DataTexture( a, sizeX, sizeY, RGBAFormat, FloatType );
@@ -333,21 +341,21 @@ var GPUComputationRenderer = function( sizeX, sizeY, renderer ) {
};
- this.renderTexture = function( input, output ) {
+ this.renderTexture = function ( input, output ) {
// Takes a texture, and render out in rendertarget
// input = Texture
// output = RenderTarget
passThruUniforms.texture.value = input;
- this.doRenderTarget( passThruShader, output);
+ this.doRenderTarget( passThruShader, output );
passThruUniforms.texture.value = null;
};
- this.doRenderTarget = function( material, output ) {
+ this.doRenderTarget = function ( material, output ) {
var currentRenderTarget = renderer.getRenderTarget();
| true |
Other | mrdoob | three.js | d2c7ae35a46970303dbc60911d2085b13cd641f5.json | fix ocean shader for WebGL2 | examples/js/shaders/OceanShaders.js | @@ -110,9 +110,11 @@ THREE.OceanShaders[ 'ocean_initial_spectrum' ] = {
'return sqrt(G * k * (1.0 + pow2(k / KM)));',
'}',
+ '#if __VERSION__ == 100',
'float tanh (float x) {',
'return (1.0 - exp(-2.0 * x)) / (1.0 + exp(-2.0 * x));',
'}',
+ '#endif',
'void main (void) {',
'vec2 coordinates = gl_FragCoord.xy - 0.5;', | true |
Other | mrdoob | three.js | d2c7ae35a46970303dbc60911d2085b13cd641f5.json | fix ocean shader for WebGL2 | examples/jsm/shaders/OceanShaders.js | @@ -114,9 +114,11 @@ OceanShaders[ 'ocean_initial_spectrum' ] = {
'return sqrt(G * k * (1.0 + pow2(k / KM)));',
'}',
+ '#if __VERSION__ == 100',
'float tanh (float x) {',
'return (1.0 - exp(-2.0 * x)) / (1.0 + exp(-2.0 * x));',
'}',
+ '#endif',
'void main (void) {',
'vec2 coordinates = gl_FragCoord.xy - 0.5;', | true |
Other | mrdoob | three.js | 0813a98d47b243e2834ea9b52d360b532e7447fa.json | Fix typescript definition. | src/renderers/WebGLRenderer.d.ts | @@ -314,9 +314,10 @@ export class WebGLRenderer implements Renderer {
renderBufferDirect(
camera: Camera,
fog: Fog,
+ geometry: Geometry | BufferGeometry,
material: Material,
- geometryGroup: any,
- object: Object3D
+ object: Object3D,
+ geometryGroup: any
): void;
/** | false |
Other | mrdoob | three.js | a136ee0fd3d9c023aa893e7b52f622d722611aaf.json | fix alfabetic order | examples/files.js | @@ -160,8 +160,8 @@ var files = {
"webgl_materials_envmaps_exr",
"webgl_materials_envmaps_hdr",
"webgl_materials_envmaps_hdr_nodes",
- "webgl_materials_envmaps_pmrem_nodes",
"webgl_materials_envmaps_parallax",
+ "webgl_materials_envmaps_pmrem_nodes",
"webgl_materials_grass",
"webgl_materials_lightmap",
"webgl_materials_matcap", | false |
Other | mrdoob | three.js | cd5e51db59a65710824b18ac0f1294f4f9aaf706.json | add more unit tests | test/unit/src/math/Quaternion.tests.js | @@ -225,118 +225,119 @@ export default QUnit.module( 'Maths', () => {
} );
QUnit.test( "x", ( assert ) => {
+
var a = new Quaternion();
- assert.ok(a.x === 0, "Passed!");
+ assert.ok( a.x === 0, "Passed!" );
- a = new Quaternion(1, 2, 3);
- assert.ok(a.x === 1, "Passed!");
+ a = new Quaternion( 1, 2, 3 );
+ assert.ok( a.x === 1, "Passed!" );
- a = new Quaternion(4, 5, 6, 1);
- assert.ok(a.x === 4, "Passed!");
+ a = new Quaternion( 4, 5, 6, 1 );
+ assert.ok( a.x === 4, "Passed!" );
- a = new Quaternion(7, 8, 9);
+ a = new Quaternion( 7, 8, 9 );
a.x = 10;
- assert.ok(a.x === 10, "Passed!");
+ assert.ok( a.x === 10, "Passed!" );
- a = new Quaternion(11, 12, 13);
+ a = new Quaternion( 11, 12, 13 );
var b = false;
- a._onChange(function () {
+ a._onChange( function () {
b = true;
- });
- assert.ok(!b, "Passed!");
+ } );
+ assert.ok( ! b, "Passed!" );
a.x = 14;
- assert.ok(b, "Passed!");
- assert.ok(a.x === 14, "Passed!");
+ assert.ok( b, "Passed!" );
+ assert.ok( a.x === 14, "Passed!" );
} );
QUnit.test( "y", ( assert ) => {
var a = new Quaternion();
- assert.ok(a.y === 0, "Passed!");
+ assert.ok( a.y === 0, "Passed!" );
- a = new Quaternion(1, 2, 3);
- assert.ok(a.y === 2, "Passed!");
+ a = new Quaternion( 1, 2, 3 );
+ assert.ok( a.y === 2, "Passed!" );
- a = new Quaternion(4, 5, 6, 1);
- assert.ok(a.y === 5, "Passed!");
+ a = new Quaternion( 4, 5, 6, 1 );
+ assert.ok( a.y === 5, "Passed!" );
- a = new Quaternion(7, 8, 9);
+ a = new Quaternion( 7, 8, 9 );
a.y = 10;
- assert.ok(a.y === 10, "Passed!");
+ assert.ok( a.y === 10, "Passed!" );
- a = new Quaternion(11, 12, 13);
+ a = new Quaternion( 11, 12, 13 );
var b = false;
- a._onChange(function () {
+ a._onChange( function () {
b = true;
- });
- assert.ok(!b, "Passed!");
+ } );
+ assert.ok( ! b, "Passed!" );
a.y = 14;
- assert.ok(b, "Passed!");
- assert.ok(a.y === 14, "Passed!");
+ assert.ok( b, "Passed!" );
+ assert.ok( a.y === 14, "Passed!" );
} );
QUnit.test( "z", ( assert ) => {
var a = new Quaternion();
- assert.ok(a.z === 0, "Passed!");
+ assert.ok( a.z === 0, "Passed!" );
- a = new Quaternion(1, 2, 3);
- assert.ok(a.z === 3, "Passed!");
+ a = new Quaternion( 1, 2, 3 );
+ assert.ok( a.z === 3, "Passed!" );
- a = new Quaternion(4, 5, 6, 1);
- assert.ok(a.z === 6, "Passed!");
+ a = new Quaternion( 4, 5, 6, 1 );
+ assert.ok( a.z === 6, "Passed!" );
- a = new Quaternion(7, 8, 9);
+ a = new Quaternion( 7, 8, 9 );
a.z = 10;
- assert.ok(a.z === 10, "Passed!");
+ assert.ok( a.z === 10, "Passed!" );
- a = new Quaternion(11, 12, 13);
+ a = new Quaternion( 11, 12, 13 );
var b = false;
- a._onChange(function () {
+ a._onChange( function () {
b = true;
- });
- assert.ok(!b, "Passed!");
+ } );
+ assert.ok( ! b, "Passed!" );
a.z = 14;
- assert.ok(b, "Passed!");
- assert.ok(a.z === 14, "Passed!");
+ assert.ok( b, "Passed!" );
+ assert.ok( a.z === 14, "Passed!" );
} );
QUnit.test( "w", ( assert ) => {
var a = new Quaternion();
- assert.ok(a.w === 1, "Passed!");
+ assert.ok( a.w === 1, "Passed!" );
- a = new Quaternion(1, 2, 3);
- assert.ok(a.w === 1, "Passed!");
+ a = new Quaternion( 1, 2, 3 );
+ assert.ok( a.w === 1, "Passed!" );
- a = new Quaternion(4, 5, 6, 1);
- assert.ok(a.w === 1, "Passed!");
+ a = new Quaternion( 4, 5, 6, 1 );
+ assert.ok( a.w === 1, "Passed!" );
- a = new Quaternion(7, 8, 9);
+ a = new Quaternion( 7, 8, 9 );
a.w = 10;
- assert.ok(a.w === 10, "Passed!");
+ assert.ok( a.w === 10, "Passed!" );
- a = new Quaternion(11, 12, 13);
+ a = new Quaternion( 11, 12, 13 );
var b = false;
- a._onChange(function () {
+ a._onChange( function () {
b = true;
- });
- assert.ok(!b, "Passed!");
+ } );
+ assert.ok( ! b, "Passed!" );
a.w = 14;
- assert.ok(b, "Passed!");
- assert.ok(a.w === 14, "Passed!");
+ assert.ok( b, "Passed!" );
+ assert.ok( a.w === 14, "Passed!" );
} );
@@ -530,9 +531,17 @@ export default QUnit.module( 'Maths', () => {
} );
- QUnit.todo( "dot", ( assert ) => {
+ QUnit.test( "dot", ( assert ) => {
+
+ var a = new Quaternion();
+ var b = new Quaternion();
+
+ assert.ok( a.dot( b ) === 1, "Passed!" );
+ a = new Quaternion( 1, 2, 3, 1 );
+ b = new Quaternion( 3, 2, 1, 1 );
+
+ assert.ok( a.dot( b ) === 11, "Passed!" );
- assert.ok( false, "everything's gonna be alright" );
} );
@@ -650,15 +659,32 @@ export default QUnit.module( 'Maths', () => {
} );
- QUnit.todo( "_onChange", ( assert ) => {
+ QUnit.test( "_onChange", ( assert ) => {
- assert.ok( false, "everything's gonna be alright" );
+
+ var f = function () {
+
+ var b = true;
+
+ };
+
+ var a = new Quaternion( 11, 12, 13, 1 );
+ a._onChange( f );
+ assert.ok( a._onChangeCallback === f, "Passed!" );
} );
- QUnit.todo( "_onChangeCallback", ( assert ) => {
+ QUnit.test( "_onChangeCallback", ( assert ) => {
- assert.ok( false, "everything's gonna be alright" );
+ var f = function () {
+
+ var b = true;
+
+ };
+
+ var a = new Quaternion( 11, 12, 13, 1 );
+ a._onChangeCallback = f;
+ assert.ok( a._onChangeCallback === f, "Passed!" );
} );
| false |
Other | mrdoob | three.js | 968b226d4140eeb4182de8396382430843862185.json | remove the unnecessary words
"according to the definition of this method." | docs/api/en/extras/ShapeUtils.html | @@ -22,7 +22,7 @@ <h2>Methods</h2>
<h3>[method:Number area]( contour )</h3>
<p>
- contour -- 2D polygon. An array of THREE.Vector2(), according to the definition of this method.<br /><br />
+ contour -- 2D polygon. An array of THREE.Vector2()<br /><br />
Calculate area of a ( 2D ) contour polygon.<br /><br />
| false |
Other | mrdoob | three.js | 8e49e00734b261e67c781b5b152f0bf2a9f3853c.json | Optimize a loop in BufferGeometry.merge() | src/core/BufferGeometry.js | @@ -820,9 +820,10 @@ BufferGeometry.prototype = Object.assign( Object.create( EventDispatcher.prototy
var attribute2 = geometry.attributes[ key ];
var attributeArray2 = attribute2.array;
- var attributeSize = attribute2.itemSize;
+ var attributeOffset = attribute2.itemSize * offset;
+ var length = Math.min( attributeArray2.length, attributeArray1.length - attributeOffset );
- for ( var i = 0, j = attributeSize * offset; i < attributeArray2.length && j < attributeArray1.length; i ++, j ++ ) {
+ for ( var i = 0, j = attributeOffset; i < length; i ++, j ++ ) {
attributeArray1[ j ] = attributeArray2[ i ];
| false |
Other | mrdoob | three.js | eeb229d2f1fc036883ee58eae1ae95fde6b0cf9b.json | Remove references to THREE | src/lights/HemisphereLightProbe.js | @@ -3,6 +3,7 @@
*/
import { Color } from '../math/Color.js';
+import { Vector3 } from '../math/Vector3.js';
import { LightProbe } from './LightProbe.js';
function HemisphereLightProbe( skyColor, groundColor, intensity ) {
@@ -12,8 +13,8 @@ function HemisphereLightProbe( skyColor, groundColor, intensity ) {
var color1 = new Color().set( skyColor );
var color2 = new Color().set( groundColor );
- var sky = new THREE.Vector3( color1.r, color1.g, color1.b );
- var ground = new THREE.Vector3( color2.r, color2.g, color2.b );
+ var sky = new Vector3( color1.r, color1.g, color1.b );
+ var ground = new Vector3( color2.r, color2.g, color2.b );
// without extra factor of PI in the shader, should = 1 / Math.sqrt( Math.PI );
var c0 = Math.sqrt( Math.PI ); | false |
Other | mrdoob | three.js | 3de13b171f8ba11f1256c85fac2b54f90764a1c3.json | Remove string literals for ie11 | src/helpers/LightProbeHelper.js | @@ -28,92 +28,95 @@ function LightProbeHelper( lightProbe, size ) {
},
- vertexShader: `
+ vertexShader: [
- varying vec3 vNormal;
+ 'varying vec3 vNormal;',
- void main() {
+ 'void main() {',
- vNormal = normalize( normalMatrix * normal );
+ ' vNormal = normalize( normalMatrix * normal );',
- gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );
+ ' gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );',
- }`,
+ '}',
- fragmentShader: `
+ ].join( '\n' ),
- #define RECIPROCAL_PI 0.318309886
+ fragmentShader: [
- vec3 inverseTransformDirection( in vec3 normal, in mat4 matrix ) {
+ '#define RECIPROCAL_PI 0.318309886',
- // matrix is assumed to be orthogonal
+ 'vec3 inverseTransformDirection( in vec3 normal, in mat4 matrix ) {',
- return normalize( ( vec4( normal, 0.0 ) * matrix ).xyz );
+ ' // matrix is assumed to be orthogonal',
- }
+ ' return normalize( ( vec4( normal, 0.0 ) * matrix ).xyz );',
- vec3 linearToOutput( in vec3 a ) {
+ '}',
- #ifdef GAMMA_OUTPUT
+ 'vec3 linearToOutput( in vec3 a ) {',
- return pow( a, vec3( 1.0 / float( GAMMA_FACTOR ) ) );
+ ' #ifdef GAMMA_OUTPUT',
- #else
+ ' return pow( a, vec3( 1.0 / float( GAMMA_FACTOR ) ) );',
- return a;
+ ' #else',
- #endif
+ ' return a;',
- }
+ ' #endif',
- // get the irradiance (radiance convolved with cosine lobe) at the point 'normal' on the unit sphere
- // source: https://graphics.stanford.edu/papers/envmap/envmap.pdf
- vec3 shGetIrradianceAt( in vec3 normal, in vec3 shCoefficients[ 9 ] ) {
+ '}',
- // normal is assumed to have unit length
+ '// source: https://graphics.stanford.edu/papers/envmap/envmap.pdf',
+ 'vec3 shGetIrradianceAt( in vec3 normal, in vec3 shCoefficients[ 9 ] ) {',
- float x = normal.x, y = normal.y, z = normal.z;
+ ' // normal is assumed to have unit length',
- // band 0
- vec3 result = shCoefficients[ 0 ] * 0.886227;
+ ' float x = normal.x, y = normal.y, z = normal.z;',
- // band 1
- result += shCoefficients[ 1 ] * 2.0 * 0.511664 * y;
- result += shCoefficients[ 2 ] * 2.0 * 0.511664 * z;
- result += shCoefficients[ 3 ] * 2.0 * 0.511664 * x;
+ ' // band 0',
+ ' vec3 result = shCoefficients[ 0 ] * 0.886227;',
- // band 2
- result += shCoefficients[ 4 ] * 2.0 * 0.429043 * x * y;
- result += shCoefficients[ 5 ] * 2.0 * 0.429043 * y * z;
- result += shCoefficients[ 6 ] * ( 0.743125 * z * z - 0.247708 );
- result += shCoefficients[ 7 ] * 2.0 * 0.429043 * x * z;
- result += shCoefficients[ 8 ] * 0.429043 * ( x * x - y * y );
+ ' // band 1',
+ ' result += shCoefficients[ 1 ] * 2.0 * 0.511664 * y;',
+ ' result += shCoefficients[ 2 ] * 2.0 * 0.511664 * z;',
+ ' result += shCoefficients[ 3 ] * 2.0 * 0.511664 * x;',
- return result;
+ ' // band 2',
+ ' result += shCoefficients[ 4 ] * 2.0 * 0.429043 * x * y;',
+ ' result += shCoefficients[ 5 ] * 2.0 * 0.429043 * y * z;',
+ ' result += shCoefficients[ 6 ] * ( 0.743125 * z * z - 0.247708 );',
+ ' result += shCoefficients[ 7 ] * 2.0 * 0.429043 * x * z;',
+ ' result += shCoefficients[ 8 ] * 0.429043 * ( x * x - y * y );',
- }
+ ' return result;',
- uniform vec3 sh[ 9 ]; // sh coefficients
+ '}',
- uniform float intensity; // light probe intensity
+ 'uniform vec3 sh[ 9 ]; // sh coefficients',
- varying vec3 vNormal;
+ 'uniform float intensity; // light probe intensity',
- void main() {
+ 'varying vec3 vNormal;',
- vec3 normal = normalize( vNormal );
+ 'void main() {',
- vec3 worldNormal = inverseTransformDirection( normal, viewMatrix );
+ ' vec3 normal = normalize( vNormal );',
- vec3 irradiance = shGetIrradianceAt( worldNormal, sh );
+ ' vec3 worldNormal = inverseTransformDirection( normal, viewMatrix );',
- vec3 outgoingLight = RECIPROCAL_PI * irradiance * intensity;
+ ' vec3 irradiance = shGetIrradianceAt( worldNormal, sh );',
- outgoingLight = linearToOutput( outgoingLight );
+ ' vec3 outgoingLight = RECIPROCAL_PI * irradiance * intensity;',
- gl_FragColor = vec4( outgoingLight, 1.0 );
+ ' outgoingLight = linearToOutput( outgoingLight );',
- }`
+ ' gl_FragColor = vec4( outgoingLight, 1.0 );',
+
+ '}'
+
+ ].join( '\n' )
} );
| false |
Other | mrdoob | three.js | f3edc691ddb0bdad570907c4c7733a3c19232642.json | Remove example per mrdoob request and rebase. | examples/files.js | @@ -125,7 +125,6 @@ var files = {
"webgl_loader_sea3d_skinning",
"webgl_loader_sea3d_sound",
"webgl_loader_stl",
- "webgl_loader_stl_module",
"webgl_loader_svg",
"webgl_loader_texture_dds",
"webgl_loader_texture_exr", | true |
Other | mrdoob | three.js | f3edc691ddb0bdad570907c4c7733a3c19232642.json | Remove example per mrdoob request and rebase. | examples/webgl_loader_stl_module.html | @@ -1,272 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <title>three.js webgl - STL</title>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
- <style>
- body {
- font-family: Monospace;
- background-color: #000000;
- margin: 0px;
- overflow: hidden;
- }
-
- #info {
- color: #fff;
- position: absolute;
- top: 10px;
- width: 100%;
- text-align: center;
- z-index: 100;
- display:block;
-
- }
-
- a { color: skyblue }
- .button { background:#999; color:#eee; padding:0.2em 0.5em; cursor:pointer }
- .highlight { background:orange; color:#fff; }
-
- span {
- display: inline-block;
- width: 60px;
- text-align: center;
- }
-
- </style>
- </head>
- <body>
- <div id="info">
- <a href="http://threejs.org" target="_blank" rel="noopener">three.js</a> -
- STL loader test by <a href="https://github.com/aleeper" target="_blank" rel="noopener">aleeper</a>. PR2 head from <a href="http://www.ros.org/wiki/pr2_description">www.ros.org</a>
- </div>
-
- <script src="js/WebGL.js"></script>
- <script src="js/libs/stats.min.js"></script>
-
- <script type='module'>
- import {
- PerspectiveCamera,
- Scene,
- WebGLRenderer,
- Mesh,
- HemisphereLight,
- DirectionalLight,
- Vector3,
- Color,
- VertexColors,
- Fog,
- PlaneBufferGeometry,
- MeshPhongMaterial
- } from '../build/three.module.js';
-
- import { STLLoader } from './jsm/loaders/STLLoader.js';
-
-
- if ( WEBGL.isWebGLAvailable() === false ) {
-
- document.body.appendChild( WEBGL.getWebGLErrorMessage() );
-
- }
-
- var container, stats;
-
- var camera, cameraTarget, scene, renderer;
-
- init();
- animate();
-
- function init() {
-
- container = document.createElement( 'div' );
- document.body.appendChild( container );
-
- camera = new PerspectiveCamera( 35, window.innerWidth / window.innerHeight, 1, 15 );
- camera.position.set( 3, 0.15, 3 );
-
- cameraTarget = new Vector3( 0, - 0.25, 0 );
-
- scene = new Scene();
- scene.background = new Color( 0x72645b );
- scene.fog = new Fog( 0x72645b, 2, 15 );
-
-
- // Ground
-
- var plane = new Mesh(
- new PlaneBufferGeometry( 40, 40 ),
- new MeshPhongMaterial( { color: 0x999999, specular: 0x101010 } )
- );
- plane.rotation.x = - Math.PI / 2;
- plane.position.y = - 0.5;
- scene.add( plane );
-
- plane.receiveShadow = true;
-
-
- // ASCII file
-
- var loader = new STLLoader();
- loader.load( './models/stl/ascii/slotted_disk.stl', function ( geometry ) {
-
- var material = new MeshPhongMaterial( { color: 0xff5533, specular: 0x111111, shininess: 200 } );
- var mesh = new Mesh( geometry, material );
-
- mesh.position.set( 0, - 0.25, 0.6 );
- mesh.rotation.set( 0, - Math.PI / 2, 0 );
- mesh.scale.set( 0.5, 0.5, 0.5 );
-
- mesh.castShadow = true;
- mesh.receiveShadow = true;
-
- scene.add( mesh );
-
- } );
-
-
- // Binary files
-
- var material = new MeshPhongMaterial( { color: 0xAAAAAA, specular: 0x111111, shininess: 200 } );
-
- loader.load( './models/stl/binary/pr2_head_pan.stl', function ( geometry ) {
-
- var mesh = new Mesh( geometry, material );
-
- mesh.position.set( 0, - 0.37, - 0.6 );
- mesh.rotation.set( - Math.PI / 2, 0, 0 );
- mesh.scale.set( 2, 2, 2 );
-
- mesh.castShadow = true;
- mesh.receiveShadow = true;
-
- scene.add( mesh );
-
- } );
-
- loader.load( './models/stl/binary/pr2_head_tilt.stl', function ( geometry ) {
-
- var mesh = new Mesh( geometry, material );
-
- mesh.position.set( 0.136, - 0.37, - 0.6 );
- mesh.rotation.set( - Math.PI / 2, 0.3, 0 );
- mesh.scale.set( 2, 2, 2 );
-
- mesh.castShadow = true;
- mesh.receiveShadow = true;
-
- scene.add( mesh );
-
- } );
-
- // Colored binary STL
- loader.load( './models/stl/binary/colored.stl', function ( geometry ) {
-
- var meshMaterial = material;
- if ( geometry.hasColors ) {
-
- meshMaterial = new MeshPhongMaterial( { opacity: geometry.alpha, vertexColors: VertexColors } );
-
- }
-
- var mesh = new Mesh( geometry, meshMaterial );
-
- mesh.position.set( 0.5, 0.2, 0 );
- mesh.rotation.set( - Math.PI / 2, Math.PI / 2, 0 );
- mesh.scale.set( 0.3, 0.3, 0.3 );
-
- mesh.castShadow = true;
- mesh.receiveShadow = true;
-
- scene.add( mesh );
-
- } );
-
-
- // Lights
-
- scene.add( new HemisphereLight( 0x443333, 0x111122 ) );
-
- addShadowedLight( 1, 1, 1, 0xffffff, 1.35 );
- addShadowedLight( 0.5, 1, - 1, 0xffaa00, 1 );
- // renderer
-
- renderer = new WebGLRenderer( { antialias: true } );
- renderer.setPixelRatio( window.devicePixelRatio );
- renderer.setSize( window.innerWidth, window.innerHeight );
-
- renderer.gammaInput = true;
- renderer.gammaOutput = true;
-
- renderer.shadowMap.enabled = true;
-
- container.appendChild( renderer.domElement );
-
- // stats
-
- stats = new Stats();
- container.appendChild( stats.dom );
-
- //
-
- window.addEventListener( 'resize', onWindowResize, false );
-
- }
-
- function addShadowedLight( x, y, z, color, intensity ) {
-
- var directionalLight = new DirectionalLight( color, intensity );
- directionalLight.position.set( x, y, z );
- scene.add( directionalLight );
-
- directionalLight.castShadow = true;
-
- var d = 1;
- directionalLight.shadow.camera.left = - d;
- directionalLight.shadow.camera.right = d;
- directionalLight.shadow.camera.top = d;
- directionalLight.shadow.camera.bottom = - d;
-
- directionalLight.shadow.camera.near = 1;
- directionalLight.shadow.camera.far = 4;
-
- directionalLight.shadow.mapSize.width = 1024;
- directionalLight.shadow.mapSize.height = 1024;
-
- directionalLight.shadow.bias = - 0.002;
-
- }
-
- function onWindowResize() {
-
- camera.aspect = window.innerWidth / window.innerHeight;
- camera.updateProjectionMatrix();
-
- renderer.setSize( window.innerWidth, window.innerHeight );
-
- }
-
- function animate() {
-
- requestAnimationFrame( animate );
-
- render();
- stats.update();
-
- }
-
- function render() {
-
- var timer = Date.now() * 0.0005;
-
- camera.position.x = Math.cos( timer ) * 3;
- camera.position.z = Math.sin( timer ) * 3;
-
- camera.lookAt( cameraTarget );
-
- renderer.render( scene, camera );
-
- }
-
- </script>
- </body>
-</html> | true |
Other | mrdoob | three.js | d3a970d3f9327cf7d90d8b2e79779683415b77fa.json | Add modulrized STLLoader. | examples/webgl_loader_stl_module.html | @@ -0,0 +1,272 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+ <title>three.js webgl - STL</title>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
+ <style>
+ body {
+ font-family: Monospace;
+ background-color: #000000;
+ margin: 0px;
+ overflow: hidden;
+ }
+
+ #info {
+ color: #fff;
+ position: absolute;
+ top: 10px;
+ width: 100%;
+ text-align: center;
+ z-index: 100;
+ display:block;
+
+ }
+
+ a { color: skyblue }
+ .button { background:#999; color:#eee; padding:0.2em 0.5em; cursor:pointer }
+ .highlight { background:orange; color:#fff; }
+
+ span {
+ display: inline-block;
+ width: 60px;
+ text-align: center;
+ }
+
+ </style>
+ </head>
+ <body>
+ <div id="info">
+ <a href="http://threejs.org" target="_blank" rel="noopener">three.js</a> -
+ STL loader test by <a href="https://github.com/aleeper" target="_blank" rel="noopener">aleeper</a>. PR2 head from <a href="http://www.ros.org/wiki/pr2_description">www.ros.org</a>
+ </div>
+
+ <script src="js/WebGL.js"></script>
+ <script src="js/libs/stats.min.js"></script>
+
+ <script type='module'>
+ import {
+ PerspectiveCamera,
+ Scene,
+ WebGLRenderer,
+ Mesh,
+ HemisphereLight,
+ DirectionalLight,
+ Vector3,
+ Color,
+ VertexColors,
+ Fog,
+ PlaneBufferGeometry,
+ MeshPhongMaterial
+ } from '../build/three.module.js';
+
+ import { STLLoader } from './jsm/loaders/STLLoader.js';
+
+
+ if ( WEBGL.isWebGLAvailable() === false ) {
+
+ document.body.appendChild( WEBGL.getWebGLErrorMessage() );
+
+ }
+
+ var container, stats;
+
+ var camera, cameraTarget, scene, renderer;
+
+ init();
+ animate();
+
+ function init() {
+
+ container = document.createElement( 'div' );
+ document.body.appendChild( container );
+
+ camera = new PerspectiveCamera( 35, window.innerWidth / window.innerHeight, 1, 15 );
+ camera.position.set( 3, 0.15, 3 );
+
+ cameraTarget = new Vector3( 0, - 0.25, 0 );
+
+ scene = new Scene();
+ scene.background = new Color( 0x72645b );
+ scene.fog = new Fog( 0x72645b, 2, 15 );
+
+
+ // Ground
+
+ var plane = new Mesh(
+ new PlaneBufferGeometry( 40, 40 ),
+ new MeshPhongMaterial( { color: 0x999999, specular: 0x101010 } )
+ );
+ plane.rotation.x = - Math.PI / 2;
+ plane.position.y = - 0.5;
+ scene.add( plane );
+
+ plane.receiveShadow = true;
+
+
+ // ASCII file
+
+ var loader = new STLLoader();
+ loader.load( './models/stl/ascii/slotted_disk.stl', function ( geometry ) {
+
+ var material = new MeshPhongMaterial( { color: 0xff5533, specular: 0x111111, shininess: 200 } );
+ var mesh = new Mesh( geometry, material );
+
+ mesh.position.set( 0, - 0.25, 0.6 );
+ mesh.rotation.set( 0, - Math.PI / 2, 0 );
+ mesh.scale.set( 0.5, 0.5, 0.5 );
+
+ mesh.castShadow = true;
+ mesh.receiveShadow = true;
+
+ scene.add( mesh );
+
+ } );
+
+
+ // Binary files
+
+ var material = new MeshPhongMaterial( { color: 0xAAAAAA, specular: 0x111111, shininess: 200 } );
+
+ loader.load( './models/stl/binary/pr2_head_pan.stl', function ( geometry ) {
+
+ var mesh = new Mesh( geometry, material );
+
+ mesh.position.set( 0, - 0.37, - 0.6 );
+ mesh.rotation.set( - Math.PI / 2, 0, 0 );
+ mesh.scale.set( 2, 2, 2 );
+
+ mesh.castShadow = true;
+ mesh.receiveShadow = true;
+
+ scene.add( mesh );
+
+ } );
+
+ loader.load( './models/stl/binary/pr2_head_tilt.stl', function ( geometry ) {
+
+ var mesh = new Mesh( geometry, material );
+
+ mesh.position.set( 0.136, - 0.37, - 0.6 );
+ mesh.rotation.set( - Math.PI / 2, 0.3, 0 );
+ mesh.scale.set( 2, 2, 2 );
+
+ mesh.castShadow = true;
+ mesh.receiveShadow = true;
+
+ scene.add( mesh );
+
+ } );
+
+ // Colored binary STL
+ loader.load( './models/stl/binary/colored.stl', function ( geometry ) {
+
+ var meshMaterial = material;
+ if ( geometry.hasColors ) {
+
+ meshMaterial = new MeshPhongMaterial( { opacity: geometry.alpha, vertexColors: VertexColors } );
+
+ }
+
+ var mesh = new Mesh( geometry, meshMaterial );
+
+ mesh.position.set( 0.5, 0.2, 0 );
+ mesh.rotation.set( - Math.PI / 2, Math.PI / 2, 0 );
+ mesh.scale.set( 0.3, 0.3, 0.3 );
+
+ mesh.castShadow = true;
+ mesh.receiveShadow = true;
+
+ scene.add( mesh );
+
+ } );
+
+
+ // Lights
+
+ scene.add( new HemisphereLight( 0x443333, 0x111122 ) );
+
+ addShadowedLight( 1, 1, 1, 0xffffff, 1.35 );
+ addShadowedLight( 0.5, 1, - 1, 0xffaa00, 1 );
+ // renderer
+
+ renderer = new WebGLRenderer( { antialias: true } );
+ renderer.setPixelRatio( window.devicePixelRatio );
+ renderer.setSize( window.innerWidth, window.innerHeight );
+
+ renderer.gammaInput = true;
+ renderer.gammaOutput = true;
+
+ renderer.shadowMap.enabled = true;
+
+ container.appendChild( renderer.domElement );
+
+ // stats
+
+ stats = new Stats();
+ container.appendChild( stats.dom );
+
+ //
+
+ window.addEventListener( 'resize', onWindowResize, false );
+
+ }
+
+ function addShadowedLight( x, y, z, color, intensity ) {
+
+ var directionalLight = new DirectionalLight( color, intensity );
+ directionalLight.position.set( x, y, z );
+ scene.add( directionalLight );
+
+ directionalLight.castShadow = true;
+
+ var d = 1;
+ directionalLight.shadow.camera.left = - d;
+ directionalLight.shadow.camera.right = d;
+ directionalLight.shadow.camera.top = d;
+ directionalLight.shadow.camera.bottom = - d;
+
+ directionalLight.shadow.camera.near = 1;
+ directionalLight.shadow.camera.far = 4;
+
+ directionalLight.shadow.mapSize.width = 1024;
+ directionalLight.shadow.mapSize.height = 1024;
+
+ directionalLight.shadow.bias = - 0.002;
+
+ }
+
+ function onWindowResize() {
+
+ camera.aspect = window.innerWidth / window.innerHeight;
+ camera.updateProjectionMatrix();
+
+ renderer.setSize( window.innerWidth, window.innerHeight );
+
+ }
+
+ function animate() {
+
+ requestAnimationFrame( animate );
+
+ render();
+ stats.update();
+
+ }
+
+ function render() {
+
+ var timer = Date.now() * 0.0005;
+
+ camera.position.x = Math.cos( timer ) * 3;
+ camera.position.z = Math.sin( timer ) * 3;
+
+ camera.lookAt( cameraTarget );
+
+ renderer.render( scene, camera );
+
+ }
+
+ </script>
+ </body>
+</html> | false |
Other | mrdoob | three.js | 2267fe86c6a6ec6140e3775f323b1d9c21f8ccbc.json | Remove example per mrdoob request. | examples/webgl_loader_stl_module.html | @@ -1,272 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
- <head>
- <title>three.js webgl - STL</title>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
- <style>
- body {
- font-family: Monospace;
- background-color: #000000;
- margin: 0px;
- overflow: hidden;
- }
-
- #info {
- color: #fff;
- position: absolute;
- top: 10px;
- width: 100%;
- text-align: center;
- z-index: 100;
- display:block;
-
- }
-
- a { color: skyblue }
- .button { background:#999; color:#eee; padding:0.2em 0.5em; cursor:pointer }
- .highlight { background:orange; color:#fff; }
-
- span {
- display: inline-block;
- width: 60px;
- text-align: center;
- }
-
- </style>
- </head>
- <body>
- <div id="info">
- <a href="http://threejs.org" target="_blank" rel="noopener">three.js</a> -
- STL loader test by <a href="https://github.com/aleeper" target="_blank" rel="noopener">aleeper</a>. PR2 head from <a href="http://www.ros.org/wiki/pr2_description">www.ros.org</a>
- </div>
-
- <script src="js/WebGL.js"></script>
- <script src="js/libs/stats.min.js"></script>
-
- <script type='module'>
- import {
- PerspectiveCamera,
- Scene,
- WebGLRenderer,
- Mesh,
- HemisphereLight,
- DirectionalLight,
- Vector3,
- Color,
- VertexColors,
- Fog,
- PlaneBufferGeometry,
- MeshPhongMaterial
- } from '../build/three.module.js';
-
- import { STLLoader } from './jsm/loaders/STLLoader.js';
-
-
- if ( WEBGL.isWebGLAvailable() === false ) {
-
- document.body.appendChild( WEBGL.getWebGLErrorMessage() );
-
- }
-
- var container, stats;
-
- var camera, cameraTarget, scene, renderer;
-
- init();
- animate();
-
- function init() {
-
- container = document.createElement( 'div' );
- document.body.appendChild( container );
-
- camera = new PerspectiveCamera( 35, window.innerWidth / window.innerHeight, 1, 15 );
- camera.position.set( 3, 0.15, 3 );
-
- cameraTarget = new Vector3( 0, - 0.25, 0 );
-
- scene = new Scene();
- scene.background = new Color( 0x72645b );
- scene.fog = new Fog( 0x72645b, 2, 15 );
-
-
- // Ground
-
- var plane = new Mesh(
- new PlaneBufferGeometry( 40, 40 ),
- new MeshPhongMaterial( { color: 0x999999, specular: 0x101010 } )
- );
- plane.rotation.x = - Math.PI / 2;
- plane.position.y = - 0.5;
- scene.add( plane );
-
- plane.receiveShadow = true;
-
-
- // ASCII file
-
- var loader = new STLLoader();
- loader.load( './models/stl/ascii/slotted_disk.stl', function ( geometry ) {
-
- var material = new MeshPhongMaterial( { color: 0xff5533, specular: 0x111111, shininess: 200 } );
- var mesh = new Mesh( geometry, material );
-
- mesh.position.set( 0, - 0.25, 0.6 );
- mesh.rotation.set( 0, - Math.PI / 2, 0 );
- mesh.scale.set( 0.5, 0.5, 0.5 );
-
- mesh.castShadow = true;
- mesh.receiveShadow = true;
-
- scene.add( mesh );
-
- } );
-
-
- // Binary files
-
- var material = new MeshPhongMaterial( { color: 0xAAAAAA, specular: 0x111111, shininess: 200 } );
-
- loader.load( './models/stl/binary/pr2_head_pan.stl', function ( geometry ) {
-
- var mesh = new Mesh( geometry, material );
-
- mesh.position.set( 0, - 0.37, - 0.6 );
- mesh.rotation.set( - Math.PI / 2, 0, 0 );
- mesh.scale.set( 2, 2, 2 );
-
- mesh.castShadow = true;
- mesh.receiveShadow = true;
-
- scene.add( mesh );
-
- } );
-
- loader.load( './models/stl/binary/pr2_head_tilt.stl', function ( geometry ) {
-
- var mesh = new Mesh( geometry, material );
-
- mesh.position.set( 0.136, - 0.37, - 0.6 );
- mesh.rotation.set( - Math.PI / 2, 0.3, 0 );
- mesh.scale.set( 2, 2, 2 );
-
- mesh.castShadow = true;
- mesh.receiveShadow = true;
-
- scene.add( mesh );
-
- } );
-
- // Colored binary STL
- loader.load( './models/stl/binary/colored.stl', function ( geometry ) {
-
- var meshMaterial = material;
- if ( geometry.hasColors ) {
-
- meshMaterial = new MeshPhongMaterial( { opacity: geometry.alpha, vertexColors: VertexColors } );
-
- }
-
- var mesh = new Mesh( geometry, meshMaterial );
-
- mesh.position.set( 0.5, 0.2, 0 );
- mesh.rotation.set( - Math.PI / 2, Math.PI / 2, 0 );
- mesh.scale.set( 0.3, 0.3, 0.3 );
-
- mesh.castShadow = true;
- mesh.receiveShadow = true;
-
- scene.add( mesh );
-
- } );
-
-
- // Lights
-
- scene.add( new HemisphereLight( 0x443333, 0x111122 ) );
-
- addShadowedLight( 1, 1, 1, 0xffffff, 1.35 );
- addShadowedLight( 0.5, 1, - 1, 0xffaa00, 1 );
- // renderer
-
- renderer = new WebGLRenderer( { antialias: true } );
- renderer.setPixelRatio( window.devicePixelRatio );
- renderer.setSize( window.innerWidth, window.innerHeight );
-
- renderer.gammaInput = true;
- renderer.gammaOutput = true;
-
- renderer.shadowMap.enabled = true;
-
- container.appendChild( renderer.domElement );
-
- // stats
-
- stats = new Stats();
- container.appendChild( stats.dom );
-
- //
-
- window.addEventListener( 'resize', onWindowResize, false );
-
- }
-
- function addShadowedLight( x, y, z, color, intensity ) {
-
- var directionalLight = new DirectionalLight( color, intensity );
- directionalLight.position.set( x, y, z );
- scene.add( directionalLight );
-
- directionalLight.castShadow = true;
-
- var d = 1;
- directionalLight.shadow.camera.left = - d;
- directionalLight.shadow.camera.right = d;
- directionalLight.shadow.camera.top = d;
- directionalLight.shadow.camera.bottom = - d;
-
- directionalLight.shadow.camera.near = 1;
- directionalLight.shadow.camera.far = 4;
-
- directionalLight.shadow.mapSize.width = 1024;
- directionalLight.shadow.mapSize.height = 1024;
-
- directionalLight.shadow.bias = - 0.002;
-
- }
-
- function onWindowResize() {
-
- camera.aspect = window.innerWidth / window.innerHeight;
- camera.updateProjectionMatrix();
-
- renderer.setSize( window.innerWidth, window.innerHeight );
-
- }
-
- function animate() {
-
- requestAnimationFrame( animate );
-
- render();
- stats.update();
-
- }
-
- function render() {
-
- var timer = Date.now() * 0.0005;
-
- camera.position.x = Math.cos( timer ) * 3;
- camera.position.z = Math.sin( timer ) * 3;
-
- camera.lookAt( cameraTarget );
-
- renderer.render( scene, camera );
-
- }
-
- </script>
- </body>
-</html> | false |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.