Skip to content

[pull] dev from mrdoob:dev #1192

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 5 commits into from
Mar 7, 2026
Merged

[pull] dev from mrdoob:dev #1192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
02c84b4
Texture: Remove default setter parameter. (#33129)
PoseidonEnergy Mar 7, 2026
d03d548
Fix typo in Texture.js (#33130)
PoseidonEnergy Mar 7, 2026
2014dd0
Source: Fix `getSize()` for `VideoFrame`. (#33131)
PoseidonEnergy Mar 7, 2026
c2adffe
WebGPURenderer: Fix WebXR sampling array-texture (#33132)
sunag Mar 7, 2026
8bc275b
Updated builds.
Mugen87 Mar 7, 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
6 changes: 3 additions & 3 deletions build/three.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7057,7 +7057,7 @@ class Source {

} else if ( ( typeof VideoFrame !== 'undefined' ) && ( data instanceof VideoFrame ) ) {

target.set( data.displayHeight, data.displayWidth, 0 );
target.set( data.displayWidth, data.displayHeight, 0 );

} else if ( data !== null ) {

Expand Down Expand Up @@ -7585,14 +7585,14 @@ class Texture extends EventDispatcher {

}

set image( value = null ) {
set image( value ) {

this.source.data = value;

}

/**
* Updates the texture transformation matrix from the from the properties {@link Texture#offset},
* Updates the texture transformation matrix from the properties {@link Texture#offset},
* {@link Texture#repeat}, {@link Texture#rotation}, and {@link Texture#center}.
*/
updateMatrix() {
Expand Down
6 changes: 3 additions & 3 deletions build/three.core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7077,7 +7077,7 @@ class Source {

} else if ( ( typeof VideoFrame !== 'undefined' ) && ( data instanceof VideoFrame ) ) {

target.set( data.displayHeight, data.displayWidth, 0 );
target.set( data.displayWidth, data.displayHeight, 0 );

} else if ( data !== null ) {

Expand Down Expand Up @@ -7605,14 +7605,14 @@ class Texture extends EventDispatcher {

}

set image( value = null ) {
set image( value ) {

this.source.data = value;

}

/**
* Updates the texture transformation matrix from the from the properties {@link Texture#offset},
* Updates the texture transformation matrix from the properties {@link Texture#offset},
* {@link Texture#repeat}, {@link Texture#rotation}, and {@link Texture#center}.
*/
updateMatrix() {
Expand Down
2 changes: 1 addition & 1 deletion build/three.core.min.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build/three.webgpu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12292,7 +12292,7 @@ class TextureNode extends UniformNode {

let finalDepthSnippet = depthSnippet;

if ( finalDepthSnippet === null && texture.isArrayTexture ) {
if ( finalDepthSnippet === null && texture.isArrayTexture && this.isTexture3DNode !== true ) {

finalDepthSnippet = '0';

Expand Down Expand Up @@ -54601,7 +54601,7 @@ class NodeManager extends DataMap {
const cacheKey = this.getOutputCacheKey();

const output = outputTarget.isArrayTexture ?
texture3D( outputTarget, vec3( screenUV, builtin( 'gl_ViewID_OVR' ) ) ).renderOutput( renderer.toneMapping, renderer.currentColorSpace ) :
texture( outputTarget, screenUV ).depth( builtin( 'gl_ViewID_OVR' ) ).renderOutput( renderer.toneMapping, renderer.currentColorSpace ) :
texture( outputTarget, screenUV ).renderOutput( renderer.toneMapping, renderer.currentColorSpace );

_outputNodeMap.set( outputTarget, cacheKey );
Expand Down
2 changes: 1 addition & 1 deletion build/three.webgpu.min.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions build/three.webgpu.nodes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12292,7 +12292,7 @@ class TextureNode extends UniformNode {

let finalDepthSnippet = depthSnippet;

if ( finalDepthSnippet === null && texture.isArrayTexture ) {
if ( finalDepthSnippet === null && texture.isArrayTexture && this.isTexture3DNode !== true ) {

finalDepthSnippet = '0';

Expand Down Expand Up @@ -54601,7 +54601,7 @@ class NodeManager extends DataMap {
const cacheKey = this.getOutputCacheKey();

const output = outputTarget.isArrayTexture ?
texture3D( outputTarget, vec3( screenUV, builtin( 'gl_ViewID_OVR' ) ) ).renderOutput( renderer.toneMapping, renderer.currentColorSpace ) :
texture( outputTarget, screenUV ).depth( builtin( 'gl_ViewID_OVR' ) ).renderOutput( renderer.toneMapping, renderer.currentColorSpace ) :
texture( outputTarget, screenUV ).renderOutput( renderer.toneMapping, renderer.currentColorSpace );

_outputNodeMap.set( outputTarget, cacheKey );
Expand Down
2 changes: 1 addition & 1 deletion build/three.webgpu.nodes.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/nodes/accessors/TextureNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ class TextureNode extends UniformNode {

let finalDepthSnippet = depthSnippet;

if ( finalDepthSnippet === null && texture.isArrayTexture ) {
if ( finalDepthSnippet === null && texture.isArrayTexture && this.isTexture3DNode !== true ) {

finalDepthSnippet = '0';

Expand Down
4 changes: 2 additions & 2 deletions src/renderers/common/nodes/NodeManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import NodeBuilderState from './NodeBuilderState.js';
import NodeMaterial from '../../../materials/nodes/NodeMaterial.js';
import { cubeMapNode } from '../../../nodes/utils/CubeMapNode.js';
import { NodeFrame, StackTrace } from '../../../nodes/Nodes.js';
import { renderGroup, cubeTexture, texture, texture3D, vec3, fog, rangeFogFactor, densityFogFactor, reference, pmremTexture, screenUV } from '../../../nodes/TSL.js';
import { renderGroup, cubeTexture, texture, fog, rangeFogFactor, densityFogFactor, reference, pmremTexture, screenUV } from '../../../nodes/TSL.js';
import { builtin } from '../../../nodes/accessors/BuiltinNode.js';

import { CubeUVReflectionMapping, EquirectangularReflectionMapping, EquirectangularRefractionMapping } from '../../../constants.js';
Expand Down Expand Up @@ -877,7 +877,7 @@ class NodeManager extends DataMap {
const cacheKey = this.getOutputCacheKey();

const output = outputTarget.isArrayTexture ?
texture3D( outputTarget, vec3( screenUV, builtin( 'gl_ViewID_OVR' ) ) ).renderOutput( renderer.toneMapping, renderer.currentColorSpace ) :
texture( outputTarget, screenUV ).depth( builtin( 'gl_ViewID_OVR' ) ).renderOutput( renderer.toneMapping, renderer.currentColorSpace ) :
texture( outputTarget, screenUV ).renderOutput( renderer.toneMapping, renderer.currentColorSpace );

_outputNodeMap.set( outputTarget, cacheKey );
Expand Down
2 changes: 1 addition & 1 deletion src/textures/Source.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class Source {

} else if ( ( typeof VideoFrame !== 'undefined' ) && ( data instanceof VideoFrame ) ) {

target.set( data.displayHeight, data.displayWidth, 0 );
target.set( data.displayWidth, data.displayHeight, 0 );

} else if ( data !== null ) {

Expand Down
4 changes: 2 additions & 2 deletions src/textures/Texture.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,14 +408,14 @@ class Texture extends EventDispatcher {

}

set image( value = null ) {
set image( value ) {

this.source.data = value;

}

/**
* Updates the texture transformation matrix from the from the properties {@link Texture#offset},
* Updates the texture transformation matrix from the properties {@link Texture#offset},
* {@link Texture#repeat}, {@link Texture#rotation}, and {@link Texture#center}.
*/
updateMatrix() {
Expand Down
Loading