From d8f43a46dd54d2eccfe6eb07da14fed0c8190ae4 Mon Sep 17 00:00:00 2001 From: Mugen87 Date: Wed, 17 Feb 2021 13:07:46 +0100 Subject: [PATCH] Examples: Clean up. --- examples/js/loaders/GLTFLoader.js | 10 +++++----- examples/jsm/loaders/GLTFLoader.js | 10 +++++----- utils/modularize.js | 1 - 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/examples/js/loaders/GLTFLoader.js b/examples/js/loaders/GLTFLoader.js index 44097b2e38f6bc..be9def02aa1878 100644 --- a/examples/js/loaders/GLTFLoader.js +++ b/examples/js/loaders/GLTFLoader.js @@ -600,7 +600,7 @@ THREE.GLTFLoader = ( function () { var scale = extension.clearcoatNormalTexture.scale; // https://github.com/mrdoob/three.js/issues/11438#issuecomment-507003995 - materialParams.clearcoatNormalScale = new THREE.Vector2( scale, -scale ); + materialParams.clearcoatNormalScale = new THREE.Vector2( scale, - scale ); } @@ -2617,8 +2617,8 @@ THREE.GLTFLoader = ( function () { cachedMaterial.vertexTangents = true; // https://github.com/mrdoob/three.js/issues/11438#issuecomment-507003995 - if ( cachedMaterial.normalScale ) cachedMaterial.normalScale.y *= -1; - if ( cachedMaterial.clearcoatNormalScale ) cachedMaterial.clearcoatNormalScale.y *= -1; + if ( cachedMaterial.normalScale ) cachedMaterial.normalScale.y *= - 1; + if ( cachedMaterial.clearcoatNormalScale ) cachedMaterial.clearcoatNormalScale.y *= - 1; } @@ -2761,11 +2761,11 @@ THREE.GLTFLoader = ( function () { pending.push( parser.assignTexture( materialParams, 'normalMap', materialDef.normalTexture ) ); // https://github.com/mrdoob/three.js/issues/11438#issuecomment-507003995 - materialParams.normalScale = new THREE.Vector2( 1, -1 ); + materialParams.normalScale = new THREE.Vector2( 1, - 1 ); if ( materialDef.normalTexture.scale !== undefined ) { - materialParams.normalScale.set( materialDef.normalTexture.scale, -materialDef.normalTexture.scale ); + materialParams.normalScale.set( materialDef.normalTexture.scale, - materialDef.normalTexture.scale ); } diff --git a/examples/jsm/loaders/GLTFLoader.js b/examples/jsm/loaders/GLTFLoader.js index 77eeb456eae9c0..802134e647a879 100644 --- a/examples/jsm/loaders/GLTFLoader.js +++ b/examples/jsm/loaders/GLTFLoader.js @@ -665,7 +665,7 @@ var GLTFLoader = ( function () { var scale = extension.clearcoatNormalTexture.scale; // https://github.com/mrdoob/three.js/issues/11438#issuecomment-507003995 - materialParams.clearcoatNormalScale = new Vector2( scale, -scale ); + materialParams.clearcoatNormalScale = new Vector2( scale, - scale ); } @@ -2682,8 +2682,8 @@ var GLTFLoader = ( function () { cachedMaterial.vertexTangents = true; // https://github.com/mrdoob/three.js/issues/11438#issuecomment-507003995 - if ( cachedMaterial.normalScale ) cachedMaterial.normalScale.y *= -1; - if ( cachedMaterial.clearcoatNormalScale ) cachedMaterial.clearcoatNormalScale.y *= -1; + if ( cachedMaterial.normalScale ) cachedMaterial.normalScale.y *= - 1; + if ( cachedMaterial.clearcoatNormalScale ) cachedMaterial.clearcoatNormalScale.y *= - 1; } @@ -2826,11 +2826,11 @@ var GLTFLoader = ( function () { pending.push( parser.assignTexture( materialParams, 'normalMap', materialDef.normalTexture ) ); // https://github.com/mrdoob/three.js/issues/11438#issuecomment-507003995 - materialParams.normalScale = new Vector2( 1, -1 ); + materialParams.normalScale = new Vector2( 1, - 1 ); if ( materialDef.normalTexture.scale !== undefined ) { - materialParams.normalScale.set( materialDef.normalTexture.scale, -materialDef.normalTexture.scale ); + materialParams.normalScale.set( materialDef.normalTexture.scale, - materialDef.normalTexture.scale ); } diff --git a/utils/modularize.js b/utils/modularize.js index 02c372e3470c1f..b965cb38b2c986 100644 --- a/utils/modularize.js +++ b/utils/modularize.js @@ -193,7 +193,6 @@ var files = [ { path: 'shaders/LuminosityShader.js', dependencies: [], ignoreList: [] }, { path: 'shaders/MirrorShader.js', dependencies: [], ignoreList: [] }, { path: 'shaders/NormalMapShader.js', dependencies: [], ignoreList: [] }, - { path: 'shaders/OceanShaders.js', dependencies: [], ignoreList: [] }, { path: 'shaders/ParallaxShader.js', dependencies: [], ignoreList: [] }, { path: 'shaders/PixelShader.js', dependencies: [], ignoreList: [] }, { path: 'shaders/RGBShiftShader.js', dependencies: [], ignoreList: [] },