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
2 changes: 2 additions & 0 deletions src/Three.TSL.js
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,8 @@ export const vibrance = TSL.vibrance;
export const viewZToLogarithmicDepth = TSL.viewZToLogarithmicDepth;
export const viewZToOrthographicDepth = TSL.viewZToOrthographicDepth;
export const viewZToPerspectiveDepth = TSL.viewZToPerspectiveDepth;
export const viewZToReversedOrthographicDepth = TSL.viewZToReversedOrthographicDepth;
export const viewZToReversedPerspectiveDepth = TSL.viewZToReversedPerspectiveDepth;
export const viewport = TSL.viewport;
export const viewportCoordinate = TSL.viewportCoordinate;
export const viewportDepthTexture = TSL.viewportDepthTexture;
Expand Down
13 changes: 12 additions & 1 deletion src/cameras/CubeCamera.js
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,18 @@ class CubeCamera extends Object3D {
renderTarget.texture.generateMipmaps = false;

// https://github.com/mrdoob/three.js/issues/31413#issuecomment-3095966812
const reversedDepthBuffer = !! ( renderer.isWebGLRenderer && renderer.state.buffers.depth.getReversed() );

let reversedDepthBuffer = false;

if ( renderer.isWebGLRenderer === true ) {

reversedDepthBuffer = renderer.state.buffers.depth.getReversed();

} else {

reversedDepthBuffer = renderer.reversedDepthBuffer;

}

renderer.setRenderTarget( renderTarget, 0, activeMipmapLevel );
if ( reversedDepthBuffer && renderer.autoClear === false ) renderer.clearDepth();
Expand Down
44 changes: 40 additions & 4 deletions src/nodes/display/ViewportDepthNode.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Node from '../core/Node.js';
import { float, log, log2, nodeImmutable, nodeProxy } from '../tsl/TSLBase.js';
import { float, Fn, log, log2, nodeImmutable, nodeProxy } from '../tsl/TSLBase.js';
import { cameraNear, cameraFar } from '../accessors/Camera.js';
import { positionView } from '../accessors/Position.js';
import { viewportDepthTexture } from './ViewportDepthTextureNode.js';
Expand Down Expand Up @@ -86,7 +86,7 @@ class ViewportDepthNode extends Node {

if ( value !== null ) {

node = depthBase().assign( value );
node = depthBase().assign( value );

}

Expand Down Expand Up @@ -152,6 +152,18 @@ export default ViewportDepthNode;
*/
export const viewZToOrthographicDepth = ( viewZ, near, far ) => viewZ.add( near ).div( near.sub( far ) );

/**
* TSL function for converting a viewZ value to a reversed orthographic depth value.
*
* @tsl
* @function
* @param {Node<float>} viewZ - The viewZ node.
* @param {Node<float>} near - The camera's near value.
* @param {Node<float>} far - The camera's far value.
* @returns {Node<float>}
*/
export const viewZToReversedOrthographicDepth = ( viewZ, near, far ) => viewZ.add( far ).div( far.sub( near ) );

/**
* TSL function for converting an orthographic depth value to a viewZ value.
*
Expand All @@ -162,7 +174,19 @@ export const viewZToOrthographicDepth = ( viewZ, near, far ) => viewZ.add( near
* @param {Node<float>} far - The camera's far value.
* @returns {Node<float>}
*/
export const orthographicDepthToViewZ = ( depth, near, far ) => near.sub( far ).mul( depth ).sub( near );
export const orthographicDepthToViewZ = /*@__PURE__*/ Fn( ( [ depth, near, far ], builder ) => {

if ( builder.renderer.reversedDepthBuffer === true ) {

return far.sub( near ).mul( depth ).sub( far );

} else {

return near.sub( far ).mul( depth ).sub( near );

}

} );

/**
* TSL function for converting a viewZ value to a perspective depth value.
Expand Down Expand Up @@ -200,7 +224,19 @@ export const viewZToReversedPerspectiveDepth = ( viewZ, near, far ) => near.mul(
* @param {Node<float>} far - The camera's far value.
* @returns {Node<float>}
*/
export const perspectiveDepthToViewZ = ( depth, near, far ) => near.mul( far ).div( far.sub( near ).mul( depth ).sub( far ) );
export const perspectiveDepthToViewZ = /*@__PURE__*/ Fn( ( [ depth, near, far ], builder ) => {

if ( builder.renderer.reversedDepthBuffer === true ) {

return near.mul( far ).div( near.sub( far ).mul( depth ).sub( near ) );

} else {

return near.mul( far ).div( far.sub( near ).mul( depth ).sub( far ) );

}

} );

/**
* TSL function for converting a viewZ value to a logarithmic depth value.
Expand Down
2 changes: 1 addition & 1 deletion src/renderers/webgpu/utils/WebGPUPipelineUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ class WebGPUPipelineUtils {

if ( material.depthTest === false ) {

depthCompare = ( this.backend.parameters.reversedDepthBuffer ) ? GPUCompareFunction.Never : GPUCompareFunction.Always;
depthCompare = GPUCompareFunction.Always;

} else {

Expand Down