diff --git a/examples/jsm/objects/Water2Mesh.js b/examples/jsm/objects/Water2Mesh.js index f3c168cc228364..a198720795eda0 100644 --- a/examples/jsm/objects/Water2Mesh.js +++ b/examples/jsm/objects/Water2Mesh.js @@ -66,7 +66,7 @@ class WaterNode extends TempNode { this.normalMap0 = texture( options.normalMap0 ); this.normalMap1 = texture( options.normalMap1 ); - this.flowMap = texture( options.flowMap !== undefined ? options.flowMap : null ); + this.flowMap = texture( options.flowMap ); this.color = uniform( options.color !== undefined ? new Color( options.color ) : new Color( 0xffffff ) ); this.flowDirection = uniform( options.flowDirection !== undefined ? options.flowDirection : new Vector2( 1, 0 ) ); diff --git a/examples/screenshots/webgl_lines_fat.jpg b/examples/screenshots/webgl_lines_fat.jpg index 807590230dc0ea..0b9bdc12d9372a 100644 Binary files a/examples/screenshots/webgl_lines_fat.jpg and b/examples/screenshots/webgl_lines_fat.jpg differ diff --git a/examples/webgl_lines_fat.html b/examples/webgl_lines_fat.html index a55fa573c46c30..e859a8b53bf488 100644 --- a/examples/webgl_lines_fat.html +++ b/examples/webgl_lines_fat.html @@ -196,8 +196,8 @@ const param = { 'line type': 0, 'world units': false, - 'width': 5, - 'alphaToCoverage': true, + 'width': 10, + 'alphaToCoverage': false, 'dashed': false, 'dash scale': 1, 'dash / gap': 1 @@ -228,10 +228,20 @@ gui.add( param, 'world units' ).onChange( function ( val ) { matLine.worldUnits = val; + matLine.needsUpdate = true; + + if ( val ) { + + widthController.name( 'width (world units)' ).min( 0.1 ).max( 0.5 ).setValue( 0.5 ); + + } else { + + widthController.name( 'width (pixels)' ).min( 1 ).max( 10 ).setValue( 10 ); + } } ); - gui.add( param, 'width', 1, 10 ).onChange( function ( val ) { + const widthController = gui.add( param, 'width', 1, 10 ).name( 'width (pixels)' ).onChange( function ( val ) { matLine.linewidth = val; diff --git a/package-lock.json b/package-lock.json index 4353bfa6796fd4..470abdcd5ed03c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -591,9 +591,6 @@ "arm" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -608,9 +605,6 @@ "arm" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -625,9 +619,6 @@ "arm64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -642,9 +633,6 @@ "arm64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -659,9 +647,6 @@ "loong64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -676,9 +661,6 @@ "loong64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -693,9 +675,6 @@ "ppc64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -710,9 +689,6 @@ "ppc64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -727,9 +703,6 @@ "riscv64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -744,9 +717,6 @@ "riscv64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -761,9 +731,6 @@ "s390x" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -778,9 +745,6 @@ "x64" ], "dev": true, - "libc": [ - "glibc" - ], "license": "MIT", "optional": true, "os": [ @@ -795,9 +759,6 @@ "x64" ], "dev": true, - "libc": [ - "musl" - ], "license": "MIT", "optional": true, "os": [ @@ -2403,9 +2364,9 @@ } }, "node_modules/ip-address": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz", - "integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz", + "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==", "dev": true, "license": "MIT", "engines": {