Skip to content

Examples: Clean up. #21296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 17, 2021
Merged

Examples: Clean up. #21296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions examples/js/loaders/GLTFLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );

}

Expand Down Expand Up @@ -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;

}

Expand Down Expand Up @@ -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 );

}

Expand Down
10 changes: 5 additions & 5 deletions examples/jsm/loaders/GLTFLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );

}

Expand Down Expand Up @@ -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;

}

Expand Down Expand Up @@ -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 );

}

Expand Down
1 change: 0 additions & 1 deletion utils/modularize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: [] },
Expand Down