Use world distance for CoC

Author: vanruesc

src/materials/CircleOfConfusionMaterial.ts

@@ -1,5 +1,4 @@
 import { Texture, Uniform } from "three";
-import { orthographicDepthToViewZ, viewZToOrthographicDepth } from "../utils/functions/camera.js";
 import { FullscreenMaterial } from "./FullscreenMaterial.js";
 
 import fragmentShader from "./shaders/circle-of-confusion.frag";
@@ -43,7 +42,7 @@ export class CircleOfConfusionMaterial extends FullscreenMaterial {
 	}
 
 	/**
-	 * The focus distance. Range: [0.0, 1.0].
+	 * The focus distance in world units.
 	 */
 
 	get focusDistance(): number {
@@ -59,23 +58,7 @@ export class CircleOfConfusionMaterial extends FullscreenMaterial {
 	}
 
 	/**
-	 * The focus distance in world units.
-	 */
-
-	get worldFocusDistance(): number {
-
-		return -orthographicDepthToViewZ(this.focusDistance, this.near, this.far);
-
-	}
-
-	set worldFocusDistance(value: number) {
-
-		this.focusDistance = viewZToOrthographicDepth(-value, this.near, this.far);
-
-	}
-
-	/**
-	 * The focus range. Range: [0.0, 1.0].
+	 * The focus range in world units.
 	 */
 
 	get focusRange(): number {
@@ -90,20 +73,4 @@ export class CircleOfConfusionMaterial extends FullscreenMaterial {
 
 	}
 
-	/**
-	 * The focus range in world units.
-	 */
-
-	get worldFocusRange(): number {
-
-		return -orthographicDepthToViewZ(this.focusRange, this.near, this.far);
-
-	}
-
-	set worldFocusRange(value: number) {
-
-		this.focusRange = viewZToOrthographicDepth(-value, this.near, this.far);
-
-	}
-
 }

src/materials/shaders/circle-of-confusion.frag

@@ -3,6 +3,7 @@
 #include <pp_default_output_pars_fragment>
 #include <pp_depth_buffer_pars_fragment>
 #include <pp_depth_utils_pars_fragment>
+#include <pp_world_utils_pars_fragment>
 
 uniform float focusDistance;
 uniform float focusRange;
@@ -12,15 +13,10 @@ in vec2 vUv;
 void main() {
 
 	float depth = readDepth(vUv);
+	vec3 viewPosition = getViewPosition(vUv, depth);
+	float distance = getDistance(viewPosition);
 
-	#ifdef PERSPECTIVE_CAMERA
-
-		float viewZ = perspectiveDepthToViewZ(depth, cameraParams.x, cameraParams.y);
-		depth = viewZToOrthographicDepth(viewZ, cameraParams.x, cameraParams.y);
-
-	#endif
-
-	float signedDistance = depth - focusDistance;
+	float signedDistance = distance - focusDistance;
 	float magnitude = smoothstep(0.0, focusRange, abs(signedDistance));
 
 	out_Color.rg = magnitude * vec2(