Skip to content

[pull] dev from mrdoob:dev #1170

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
pull merged 2 commits into from
Feb 25, 2026
Merged

[pull] dev from mrdoob:dev #1170

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
aa06320
Add support for packed normal maps in WebGL backend. (#33055)
castano Feb 25, 2026
3ca54b0
WebGLRenderer: Fix feedback loop regression. (#33063)
Mugen87 Feb 25, 2026
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
Binary file modified examples/screenshots/webgl_loader_texture_ktx.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion examples/webgl_loader_texture_ktx.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
scene.add( ambientLight );

const pointLight = new THREE.PointLight( 0xffffff, 2, 0, 0 );
pointLight.position.z = - 300;
pointLight.position.z = 300;
scene.add( pointLight );

const geometry = new THREE.BoxGeometry( 200, 200, 200 );
Expand Down
2 changes: 1 addition & 1 deletion src/renderers/WebGLRenderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1953,7 +1953,7 @@ class WebGLRenderer {
generateMipmaps: true,
type: hasHalfFloatSupport ? HalfFloatType : UnsignedByteType,
minFilter: LinearMipmapLinearFilter,
samples: capabilities.samples,
samples: Math.max( 4, capabilities.samples ), // to avoid feedback loops, the transmission render target requires a resolve, see #26177
stencilBuffer: stencil,
resolveDepthBuffer: false,
resolveStencilBuffer: false,
Expand Down
7 changes: 7 additions & 0 deletions src/renderers/shaders/ShaderChunk/normal_fragment_maps.glsl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ export default /* glsl */`
#elif defined( USE_NORMALMAP_TANGENTSPACE )

vec3 mapN = texture2D( normalMap, vNormalMapUv ).xyz * 2.0 - 1.0;

#if defined( USE_PACKED_NORMALMAP )

mapN = vec3( mapN.xy, sqrt( saturate( 1.0 - dot( mapN.xy, mapN.xy ) ) ) );

#endif

mapN.xy *= normalScale;

normal = normalize( tbn * mapN );
Expand Down
1 change: 1 addition & 0 deletions src/renderers/webgl/WebGLProgram.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,6 +696,7 @@ function WebGLProgram( renderer, cacheKey, parameters, bindingStates ) {
parameters.normalMap ? '#define USE_NORMALMAP' : '',
parameters.normalMapObjectSpace ? '#define USE_NORMALMAP_OBJECTSPACE' : '',
parameters.normalMapTangentSpace ? '#define USE_NORMALMAP_TANGENTSPACE' : '',
parameters.packedNormalMap ? '#define USE_PACKED_NORMALMAP' : '',
parameters.emissiveMap ? '#define USE_EMISSIVEMAP' : '',

parameters.anisotropy ? '#define USE_ANISOTROPY' : '',
Expand Down
11 changes: 10 additions & 1 deletion src/renderers/webgl/WebGLPrograms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BackSide, DoubleSide, CubeUVReflectionMapping, ObjectSpaceNormalMap, TangentSpaceNormalMap, NoToneMapping, NormalBlending, SRGBTransfer } from '../../constants.js';
import { BackSide, DoubleSide, CubeUVReflectionMapping, ObjectSpaceNormalMap, TangentSpaceNormalMap, NoToneMapping, NormalBlending, SRGBTransfer, RGFormat, RG11_EAC_Format, RED_GREEN_RGTC2_Format } from '../../constants.js';
import { Layers } from '../../core/Layers.js';
import { WebGLProgram } from './WebGLProgram.js';
import { WebGLShaderCache } from './WebGLShaderCache.js';
Expand All @@ -7,6 +7,12 @@ import { UniformsUtils } from '../shaders/UniformsUtils.js';
import { ColorManagement } from '../../math/ColorManagement.js';
import { warn } from '../../utils.js';

function isPackedRGFormat( format ) {

return format === RGFormat || format === RG11_EAC_Format || format === RED_GREEN_RGTC2_Format;

}

function WebGLPrograms( renderer, environments, extensions, capabilities, bindingStates, clipping ) {

const _programLayers = new Layers();
Expand Down Expand Up @@ -217,6 +223,7 @@ function WebGLPrograms( renderer, environments, extensions, capabilities, bindin

normalMapObjectSpace: HAS_NORMALMAP && material.normalMapType === ObjectSpaceNormalMap,
normalMapTangentSpace: HAS_NORMALMAP && material.normalMapType === TangentSpaceNormalMap,
packedNormalMap: HAS_NORMALMAP && material.normalMapType === TangentSpaceNormalMap && isPackedRGFormat( material.normalMap.format ),

metalnessMap: HAS_METALNESSMAP,
roughnessMap: HAS_ROUGHNESSMAP,
Expand Down Expand Up @@ -521,6 +528,8 @@ function WebGLPrograms( renderer, environments, extensions, capabilities, bindin
_programLayers.enable( 20 );
if ( parameters.gradientMap )
_programLayers.enable( 21 );
if ( parameters.packedNormalMap )
_programLayers.enable( 22 );

array.push( _programLayers.mask );
_programLayers.disableAll();
Expand Down
Loading