Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 10 additions & 16 deletions build/three.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -66100,6 +66100,7 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
const _customShaders = new WebGLShaderCache();
const _activeChannels = new Set();
const programs = [];
const programsMap = new Map();

const logarithmicDepthBuffer = capabilities.logarithmicDepthBuffer;

Expand Down Expand Up @@ -66676,29 +66677,19 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities

function acquireProgram( parameters, cacheKey ) {

let program;
let program = programsMap.get( cacheKey );

// Check if code has been already compiled
for ( let p = 0, pl = programs.length; p < pl; p ++ ) {
if ( program !== undefined ) {

const preexistingProgram = programs[ p ];
++ program.usedTimes;

if ( preexistingProgram.cacheKey === cacheKey ) {

program = preexistingProgram;
++ program.usedTimes;

break;

}

}

if ( program === undefined ) {
} else {

program = new WebGLProgram( renderer, cacheKey, parameters, bindingStates );
programs.push( program );

programsMap.set( cacheKey, program );

}

return program;
Expand All @@ -66714,6 +66705,9 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
programs[ i ] = programs[ programs.length - 1 ];
programs.pop();

// Remove from map
programsMap.delete( program.cacheKey );

// Free WebGL resources
program.destroy();

Expand Down
26 changes: 10 additions & 16 deletions build/three.module.js
Original file line number Diff line number Diff line change
Expand Up @@ -7004,6 +7004,7 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
const _customShaders = new WebGLShaderCache();
const _activeChannels = new Set();
const programs = [];
const programsMap = new Map();

const logarithmicDepthBuffer = capabilities.logarithmicDepthBuffer;

Expand Down Expand Up @@ -7580,29 +7581,19 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities

function acquireProgram( parameters, cacheKey ) {

let program;
let program = programsMap.get( cacheKey );

// Check if code has been already compiled
for ( let p = 0, pl = programs.length; p < pl; p ++ ) {
if ( program !== undefined ) {

const preexistingProgram = programs[ p ];
++ program.usedTimes;

if ( preexistingProgram.cacheKey === cacheKey ) {

program = preexistingProgram;
++ program.usedTimes;

break;

}

}

if ( program === undefined ) {
} else {

program = new WebGLProgram( renderer, cacheKey, parameters, bindingStates );
programs.push( program );

programsMap.set( cacheKey, program );

}

return program;
Expand All @@ -7618,6 +7609,9 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
programs[ i ] = programs[ programs.length - 1 ];
programs.pop();

// Remove from map
programsMap.delete( program.cacheKey );

// Free WebGL resources
program.destroy();

Expand Down
2 changes: 1 addition & 1 deletion build/three.module.min.js

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion editor/js/EditorControls.js
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,8 @@ class EditorControls extends THREE.EventDispatcher {

touches[ 0 ].set( event.pageX, event.pageY, 0 ).divideScalar( window.devicePixelRatio );
touches[ 1 ].set( position.x, position.y, 0 ).divideScalar( window.devicePixelRatio );
var distance = touches[ 0 ].distanceTo( touches[ 1 ] );
// Divide by 10 to offset inherent over-sensitivity (https://github.com/mrdoob/three.js/issues/32442)
var distance = touches[ 0 ].distanceTo( touches[ 1 ] ) / 10;
scope.zoom( delta.set( 0, 0, prevDistance - distance ) );
prevDistance = distance;

Expand Down
4 changes: 2 additions & 2 deletions examples/jsm/loaders/UltraHDRLoader.js
Original file line number Diff line number Diff line change
Expand Up @@ -542,11 +542,11 @@ class UltraHDRLoader extends Loader {

if ( this.type === HalfFloatType ) {

hdrBuffer = new Uint16Array( sdrImageData.data.length ).fill( 23544 );
hdrBuffer = new Uint16Array( sdrImageData.data.length ).fill( 15360 );

} else {

hdrBuffer = new Float32Array( sdrImageData.data.length ).fill( 255 );
hdrBuffer = new Float32Array( sdrImageData.data.length ).fill( 1.0 );

}

Expand Down
Binary file modified examples/screenshots/webgl_materials_physical_transmission.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading