From 89d29e411251a3b39039ff2faef2b942fb0b8659 Mon Sep 17 00:00:00 2001 From: qiweicao Date: Thu, 13 Jun 2024 09:38:20 +0800 Subject: [PATCH] change specularIntensityMap uv & change version 0.137.15 (#152) --- package-lock.json | 4 ++-- package.json | 2 +- .../ShaderChunk/lights_physical_fragment.glsl.js | 10 +++++++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index f5b4723c0d4911..9fd8b3150d3bf4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,13 +1,13 @@ { "name": "@oppentech/three", - "version": "0.137.14", + "version": "0.137.15", "lockfileVersion": 2, "requires": true, "dev": true, "packages": { "": { "name": "@oppentech/three", - "version": "0.137.14", + "version": "0.137.15", "license": "MIT", "devDependencies": { "@babel/core": "^7.15.5", diff --git a/package.json b/package.json index f5e93625f11d7a..ee2af562414453 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@oppentech/three", - "version": "0.137.14", + "version": "0.137.15", "description": "JavaScript 3D library", "type": "module", "main": "./build/three.js", diff --git a/src/renderers/shaders/ShaderChunk/lights_physical_fragment.glsl.js b/src/renderers/shaders/ShaderChunk/lights_physical_fragment.glsl.js index 1b3dfe57103d73..38b7fabfc6ba08 100644 --- a/src/renderers/shaders/ShaderChunk/lights_physical_fragment.glsl.js +++ b/src/renderers/shaders/ShaderChunk/lights_physical_fragment.glsl.js @@ -18,7 +18,15 @@ material.roughness = min( material.roughness, 1.0 ); #ifdef USE_SPECULARINTENSITYMAP - specularIntensityFactor *= texture2D( specularIntensityMap, vUv ).a; + // use vUv2 if it exists, otherwise use vUv + // when use uv mapping, vUv will be wrong + specularIntensityFactor *= texture2D( specularIntensityMap, + #if defined( USE_LIGHTMAP ) || defined( USE_AOMAP ) + vUv2 + #else + vUv + #endif + ).a; #endif