diff --git a/examples/js/exporters/GLTFExporter.js b/examples/js/exporters/GLTFExporter.js index 7f4dae176a93f0e655063a165f553e9290f1bdf7..6777d63adef2a94de947eb41bacfbe1c3835c1f5 100644 --- a/examples/js/exporters/GLTFExporter.js +++ b/examples/js/exporters/GLTFExporter.js @@ -2224,8 +2224,6 @@ THREE.GLTFExporter.Utils = { } - var mergedKeyframeIndex = 0; - var sourceKeyframeIndex = 0; var sourceInterpolant = sourceTrack.createInterpolant( new sourceTrack.ValueBufferType( 1 ) ); mergedTrack = mergedTracks[ sourceTrackNode.uuid ]; diff --git a/examples/js/loaders/LDrawLoader.js b/examples/js/loaders/LDrawLoader.js index 63f873166e14cb950d54c63fa8175476c6231893..39c2672186c8ca432aed5ba75207be22d1923fc0 100644 --- a/examples/js/loaders/LDrawLoader.js +++ b/examples/js/loaders/LDrawLoader.js @@ -1045,8 +1045,6 @@ THREE.LDrawLoader = ( function () { // Retrieve data from the parent parse scope var parentParseScope = this.getParentParseScope(); - var isRoot = ! parentParseScope.isFromParse; - // Main colour codes passed to this subobject (or default codes 16 and 24 if it is the root object) var mainColourCode = parentParseScope.mainColourCode; var mainEdgeColourCode = parentParseScope.mainEdgeColourCode; diff --git a/examples/js/loaders/SVGLoader.js b/examples/js/loaders/SVGLoader.js index 22bab360e504aa1c05a5fa0a301005062cbcd503..a55f621e9a84f0e68f3a733f71945f37753b99fc 100644 --- a/examples/js/loaders/SVGLoader.js +++ b/examples/js/loaders/SVGLoader.js @@ -881,19 +881,15 @@ THREE.SVGLoader.prototype = { var transform = parseNodeTransform( node ); - if ( transform ) { - - if ( transformStack.length > 0 ) { + if ( transformStack.length > 0 ) { - transform.premultiply( transformStack[ transformStack.length - 1 ] ); - - } - - currentTransform.copy( transform ); - transformStack.push( transform ); + transform.premultiply( transformStack[ transformStack.length - 1 ] ); } + currentTransform.copy( transform ); + transformStack.push( transform ); + return transform; } @@ -1178,11 +1174,10 @@ THREE.SVGLoader.prototype = { }; -THREE.SVGLoader.getStrokeStyle = function ( width, color, opacity, lineJoin, lineCap, miterLimit ) { +THREE.SVGLoader.getStrokeStyle = function ( width, color, lineJoin, lineCap, miterLimit ) { // Param width: Stroke width // Param color: As returned by THREE.Color.getStyle() - // Param opacity: 0 (transparent) to 1 (opaque) // Param lineJoin: One of "round", "bevel", "miter" or "miter-limit" // Param lineCap: One of "round", "square" or "butt" // Param miterLimit: Maximum join length, in multiples of the "width" parameter (join is truncated if it exceeds that distance) @@ -1190,7 +1185,6 @@ THREE.SVGLoader.getStrokeStyle = function ( width, color, opacity, lineJoin, lin width = width !== undefined ? width : 1; color = color !== undefined ? color : '#000'; - opacity = opacity !== undefined ? opacity : 1; lineJoin = lineJoin !== undefined ? lineJoin : 'miter'; lineCap = lineCap !== undefined ? lineCap : 'butt'; miterLimit = miterLimit !== undefined ? miterLimit : 4; diff --git a/examples/jsm/exporters/GLTFExporter.js b/examples/jsm/exporters/GLTFExporter.js index 56ced501c67755d44293672b535d3f2f14e02924..cfaaabebc640ba76f91b28ed6a75e8c6f87811db 100644 --- a/examples/jsm/exporters/GLTFExporter.js +++ b/examples/jsm/exporters/GLTFExporter.js @@ -2248,8 +2248,6 @@ GLTFExporter.Utils = { } - var mergedKeyframeIndex = 0; - var sourceKeyframeIndex = 0; var sourceInterpolant = sourceTrack.createInterpolant( new sourceTrack.ValueBufferType( 1 ) ); mergedTrack = mergedTracks[ sourceTrackNode.uuid ]; diff --git a/examples/jsm/loaders/LDrawLoader.js b/examples/jsm/loaders/LDrawLoader.js index c995f6d23096eda2ee86fd860234c4a71584b4ce..cea13fec934eba1d085099388ec50741e631455e 100644 --- a/examples/jsm/loaders/LDrawLoader.js +++ b/examples/jsm/loaders/LDrawLoader.js @@ -1063,8 +1063,6 @@ var LDrawLoader = ( function () { // Retrieve data from the parent parse scope var parentParseScope = this.getParentParseScope(); - var isRoot = ! parentParseScope.isFromParse; - // Main colour codes passed to this subobject (or default codes 16 and 24 if it is the root object) var mainColourCode = parentParseScope.mainColourCode; var mainEdgeColourCode = parentParseScope.mainEdgeColourCode; diff --git a/examples/jsm/loaders/SVGLoader.d.ts b/examples/jsm/loaders/SVGLoader.d.ts index 09e2af598c6daf9e2418252fbfde43cd321ee24c..ab2450af11e79b36f52bfb3a30de4b3119f08be3 100644 --- a/examples/jsm/loaders/SVGLoader.d.ts +++ b/examples/jsm/loaders/SVGLoader.d.ts @@ -28,7 +28,7 @@ export class SVGLoader { parse(text: string) : SVGResult; - static getStrokeStyle(width: number, color: string, opacity: number, lineJoin: string, lineCap: string, miterLimit: number): StrokeStyle; + static getStrokeStyle(width: number, color: string, lineJoin: string, lineCap: string, miterLimit: number): StrokeStyle; static pointsToStroke(points: Vector3[], style: StrokeStyle, arcDivisions: number, minDistance: number ): BufferGeometry; static pointsToStrokeWithBuffers(points: Vector3[], style: StrokeStyle, arcDivisions: number, minDistance: number, vertices: number[], normals: number[], uvs: number[], vertexOffset: number): number; } diff --git a/examples/jsm/loaders/SVGLoader.js b/examples/jsm/loaders/SVGLoader.js index 39f0e5df459ef5f2a93bc3afe5112ff4183974ff..eb3e1e846898fbd6393ae79b5abe3580e00e2f0b 100644 --- a/examples/jsm/loaders/SVGLoader.js +++ b/examples/jsm/loaders/SVGLoader.js @@ -894,19 +894,15 @@ SVGLoader.prototype = { var transform = parseNodeTransform( node ); - if ( transform ) { - - if ( transformStack.length > 0 ) { + if ( transformStack.length > 0 ) { - transform.premultiply( transformStack[ transformStack.length - 1 ] ); - - } - - currentTransform.copy( transform ); - transformStack.push( transform ); + transform.premultiply( transformStack[ transformStack.length - 1 ] ); } + currentTransform.copy( transform ); + transformStack.push( transform ); + return transform; } @@ -1191,11 +1187,10 @@ SVGLoader.prototype = { }; -SVGLoader.getStrokeStyle = function ( width, color, opacity, lineJoin, lineCap, miterLimit ) { +SVGLoader.getStrokeStyle = function ( width, color, lineJoin, lineCap, miterLimit ) { // Param width: Stroke width // Param color: As returned by Color.getStyle() - // Param opacity: 0 (transparent) to 1 (opaque) // Param lineJoin: One of "round", "bevel", "miter" or "miter-limit" // Param lineCap: One of "round", "square" or "butt" // Param miterLimit: Maximum join length, in multiples of the "width" parameter (join is truncated if it exceeds that distance) @@ -1203,7 +1198,6 @@ SVGLoader.getStrokeStyle = function ( width, color, opacity, lineJoin, lineCap, width = width !== undefined ? width : 1; color = color !== undefined ? color : '#000'; - opacity = opacity !== undefined ? opacity : 1; lineJoin = lineJoin !== undefined ? lineJoin : 'miter'; lineCap = lineCap !== undefined ? lineCap : 'butt'; miterLimit = miterLimit !== undefined ? miterLimit : 4; diff --git a/examples/webgl_gpgpu_water.html b/examples/webgl_gpgpu_water.html index 4a20b58a7a3351ba235bfadf8e6119cfe08fa4e1..e4531b96655a61fafbca31f5f4ab0ed5294ea9b4 100644 --- a/examples/webgl_gpgpu_water.html +++ b/examples/webgl_gpgpu_water.html @@ -520,7 +520,7 @@ var x = i * 128 / WIDTH; var y = j * 128 / WIDTH; - pixels[ p + 0 ] = noise( x, y, 123.4 ); + pixels[ p + 0 ] = noise( x, y ); pixels[ p + 1 ] = pixels[ p + 0 ]; pixels[ p + 2 ] = 0; pixels[ p + 3 ] = 1; diff --git a/examples/webgl_shaders_vector.html b/examples/webgl_shaders_vector.html index 6ac74fd2619865722c568a4b7074308f3203c408..c26612313835c089c52a065306a1815761eab36c 100644 --- a/examples/webgl_shaders_vector.html +++ b/examples/webgl_shaders_vector.html @@ -204,7 +204,7 @@ hole = subshape.holes[ i ]; - process = processShape( hole.curves, true ); + process = processShape( hole.curves ); pts = process.pts; pts2 = process.pts2;