Skip to content

update ShaderLib.js #7

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
kira924age merged 2 commits into from
Nov 28, 2025
Merged

update ShaderLib.js #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9274e86
update WebGLMaterials.js
kira924age Nov 28, 2025
00ec58a
update ShaderLib.js
kira924age Nov 28, 2025
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
15 changes: 2 additions & 13 deletions build/three.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14694,13 +14694,7 @@ const ShaderLib = {

uniforms: /*@__PURE__*/ mergeUniforms( [
UniformsLib.common,
( () => {

// TODO HACK don't include envMap uniform, it is currently handling directly in WebGLRenderer for ReflectionProbes support
const { envMap, ...rest } = UniformsLib.envmap; // eslint-disable-line no-unused-vars
return rest;

} )(),
UniformsLib.envmap,
UniformsLib.aomap,
UniformsLib.lightmap,
UniformsLib.emissivemap,
Expand Down Expand Up @@ -27820,12 +27814,7 @@ function WebGLMaterials( renderer, properties ) {

if ( envMap ) {

// TODO HACK currently handling directly in WebGLRenderer only for MeshStandardMaterial for ReflectionProbes
if ( ! material.isMeshStandardMaterial ) {

uniforms.envMap.value = envMap;

}
uniforms.envMap.value = envMap;

_e1.copy( envMapRotation );

Expand Down
15 changes: 2 additions & 13 deletions build/three.module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14692,13 +14692,7 @@ const ShaderLib = {

uniforms: /*@__PURE__*/ mergeUniforms( [
UniformsLib.common,
( () => {

// TODO HACK don't include envMap uniform, it is currently handling directly in WebGLRenderer for ReflectionProbes support
const { envMap, ...rest } = UniformsLib.envmap; // eslint-disable-line no-unused-vars
return rest;

} )(),
UniformsLib.envmap,
UniformsLib.aomap,
UniformsLib.lightmap,
UniformsLib.emissivemap,
Expand Down Expand Up @@ -27818,12 +27812,7 @@ function WebGLMaterials( renderer, properties ) {

if ( envMap ) {

// TODO HACK currently handling directly in WebGLRenderer only for MeshStandardMaterial for ReflectionProbes
if ( ! material.isMeshStandardMaterial ) {

uniforms.envMap.value = envMap;

}
uniforms.envMap.value = envMap;

_e1.copy( envMapRotation );

Expand Down
2 changes: 1 addition & 1 deletion build/three.module.min.js
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 1 addition & 7 deletions src/renderers/shaders/ShaderLib.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,7 @@ const ShaderLib = {

uniforms: /*@__PURE__*/ mergeUniforms( [
UniformsLib.common,
( () => {

// TODO HACK don't include envMap uniform, it is currently handling directly in WebGLRenderer for ReflectionProbes support
const { envMap, ...rest } = UniformsLib.envmap; // eslint-disable-line no-unused-vars
return rest;

} )(),
UniformsLib.envmap,
UniformsLib.aomap,
UniformsLib.lightmap,
UniformsLib.emissivemap,
Expand Down
7 changes: 1 addition & 6 deletions src/renderers/webgl/WebGLMaterials.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

function refreshTransformUniform( map, uniform ) {

if (!uniform) return;

Check failure on line 13 in src/renderers/webgl/WebGLMaterials.js

View workflow job for this annotation

GitHub Actions / Lint testing 

There must be a space before this paren

Check failure on line 13 in src/renderers/webgl/WebGLMaterials.js

View workflow job for this annotation

GitHub Actions / Lint testing 

Unary operator '!' must be followed by whitespace

Check failure on line 13 in src/renderers/webgl/WebGLMaterials.js

View workflow job for this annotation

GitHub Actions / Lint testing 

There must be a space after this paren

Check failure on line 13 in src/renderers/webgl/WebGLMaterials.js

View workflow job for this annotation

GitHub Actions / Lint testing 

Expected indentation of 2 tabs but found 4 spaces

if ( map.matrixAutoUpdate === true ) {

Expand Down Expand Up @@ -223,12 +223,7 @@

if ( envMap ) {

// TODO HACK currently handling directly in WebGLRenderer only for MeshStandardMaterial for ReflectionProbes
if ( ! material.isMeshStandardMaterial ) {

uniforms.envMap.value = envMap;

}
uniforms.envMap.value = envMap;

_e1.copy( envMapRotation );

Expand Down
Loading