rayzee 11.7.0 → 11.9.0

package/src/TSL/LightsSampling.js

@@ -86,7 +86,9 @@ import {
 	offsetRayOrigin,
 	SHADOW_END,
 	REC709_LUMINANCE_COEFFICIENTS,
+	constructTBN,
 } from './Common.js';
+import { usesLightRadius } from './SceneResources.js';
 import { sampleEnvironment, sampleEnvironmentExact } from './Environment.js';
 import { shadowTerminatorOrigin } from './ShadowTerminator.js';
 import { sunRadianceToward, sampleSunDisc } from './Sun.js';
@@ -233,8 +235,30 @@ export const sampleRectAreaLight = Fn( ( [ light, rayOrigin, ruv, lightSelection
 
 } );
 
-// Enhanced spot light sampling with radius support
-export const sampleSpotLightWithRadius = Fn( ( [ light, rayOrigin, lightSelectionPdf ] ) => {
+/**
+ * A point or spot light with a radius is a disc of it facing the lit point, as Cycles' with Soft Falloff: uniform on the
+ * disc, so on its axis the light gives intensity / ( d² + r² ) where a point gives intensity / d². Moves `toLight` and
+ * `distSq` to the sampled point and returns the disc's tilt toward it. No BSDF ray hits these lights, so no MIS.
+ */
+const aimAtLightDisc = ( light, toLight, distSq, ruv ) => {
+
+	const facing = float( 1.0 ).toVar();
+	If( light.radius.greaterThan( 0.0 ), () => {
+
+		const axis = toLight.div( sqrt( distSq ) ).toVar();
+		const r = light.radius.mul( sqrt( ruv.x ) );
+		const phi = ruv.y.mul( 2 * Math.PI );
+		toLight.addAssign( constructTBN( { N: axis } ).mul( vec3( r.mul( cos( phi ) ), r.mul( sin( phi ) ), 0.0 ) ) );
+		distSq.assign( dot( toLight, toLight ) );
+		facing.assign( max( dot( toLight, axis ).div( sqrt( distSq ) ), 0.0 ) );
+
+	} );
+	return facing;
+
+};
+
+// Spot light sampling; a radius makes it a disc (aimAtLightDisc), its cone still read from the centre.
+export const sampleSpotLightWithRadius = Fn( ( [ light, rayOrigin, lightSelectionPdf, ruv ], builder ) => {
 
 	const ls_valid = tslBool( false ).toVar();
 	const ls_direction = vec3( 0.0, 1.0, 0.0 ).toVar();
@@ -250,11 +274,16 @@ export const sampleSpotLightWithRadius = Fn( ( [ light, rayOrigin, lightSelectio
 	// Guard against zero distance
 	If( lightDistSq.greaterThanEqual( 1e-20 ), () => {
 
+		// Compiled in only while some light has a radius (SceneResources lightRadius); otherwise the exact point code.
+		const sized = usesLightRadius( builder );
+		const centerDir = sized ? toLight.div( sqrt( lightDistSq ) ).toVar() : null;
+		const facing = sized ? aimAtLightDisc( light, toLight, lightDistSq, ruv ) : null;
 		const lightDist = sqrt( lightDistSq ).toVar();
 		const lightDir = toLight.div( lightDist ).toVar();
+		const coneDir = sized ? centerDir : lightDir;
 
 		// Check cone attenuation
-		const spotCosAngle = dot( lightDir.negate(), light.direction ).toVar();
+		const spotCosAngle = dot( coneDir.negate(), light.direction ).toVar();
 		const coneCosAngle = cos( light.angle ).toVar();
 
 		ls_direction.assign( lightDir );
@@ -268,10 +297,11 @@ export const sampleSpotLightWithRadius = Fn( ( [ light, rayOrigin, lightSelectio
 			const distanceAttenuation = getDistanceAttenuation( { lightDistance: lightDist, cutoffDistance: light.distance, decayExponent: light.decay } );
 
 			// Gobo projection mask + IES photometric profile — both 1.0 when not assigned.
-			const goboMask = sampleSpotGoboMask( light, lightDir );
-			const iesProfile = sampleIESProfile( light, lightDir );
+			const goboMask = sampleSpotGoboMask( light, coneDir );
+			const iesProfile = sampleIESProfile( light, coneDir );
 
-			ls_emission.assign( light.color.mul( light.intensity ).mul( distanceAttenuation ).mul( coneAttenuation ).mul( goboMask ).mul( iesProfile ) );
+			const emission = light.color.mul( light.intensity ).mul( distanceAttenuation ).mul( coneAttenuation ).mul( goboMask ).mul( iesProfile );
+			ls_emission.assign( sized ? emission.mul( facing ) : emission );
 
 		} );
 
@@ -290,7 +320,7 @@ export const sampleSpotLightWithRadius = Fn( ( [ light, rayOrigin, lightSelectio
 } );
 
 // Enhanced point light sampling with distance attenuation
-export const samplePointLightWithAttenuation = Fn( ( [ light, rayOrigin, lightSelectionPdf ] ) => {
+export const samplePointLightWithAttenuation = Fn( ( [ light, rayOrigin, lightSelectionPdf, ruv ], builder ) => {
 
 	const ls_valid = tslBool( false ).toVar();
 	const ls_direction = vec3( 0.0, 1.0, 0.0 ).toVar();
@@ -306,6 +336,8 @@ export const samplePointLightWithAttenuation = Fn( ( [ light, rayOrigin, lightSe
 	// Guard against zero distance
 	If( lightDistSq.greaterThanEqual( 1e-20 ), () => {
 
+		const sized = usesLightRadius( builder );
+		const facing = sized ? aimAtLightDisc( light, toLight, lightDistSq, ruv ) : null;
 		const lightDist = sqrt( lightDistSq ).toVar();
 		const lightDir = toLight.div( lightDist );
 
@@ -315,7 +347,8 @@ export const samplePointLightWithAttenuation = Fn( ( [ light, rayOrigin, lightSe
 		ls_lightType.assign( int( LIGHT_TYPE_POINT ) );
 		ls_direction.assign( lightDir );
 		ls_distance.assign( lightDist );
-		ls_emission.assign( light.color.mul( light.intensity ).mul( distanceAttenuation ) );
+		const emission = light.color.mul( light.intensity ).mul( distanceAttenuation );
+		ls_emission.assign( sized ? emission.mul( facing ) : emission );
 		ls_pdf.assign( lightSelectionPdf );
 		ls_valid.assign( tslBool( true ) );
 
@@ -614,7 +647,7 @@ export const sampleLightWithImportance = Fn( ( [
 
 					If( light.intensity.greaterThan( 0.0 ), () => {
 
-						const ptSample = LightSample.wrap( samplePointLightWithAttenuation( light, rayOrigin, lightSelectionPdf ) );
+						const ptSample = LightSample.wrap( samplePointLightWithAttenuation( light, rayOrigin, lightSelectionPdf, vec2( randomSeed.y, getRandomSample1D( pixelCoord, int( 0 ), dimBase.add( int( 15 ) ), rngState, resolution, frame ) ) ) );
 						r_valid.assign( ptSample.valid );
 						r_direction.assign( ptSample.direction );
 						r_emission.assign( ptSample.emission );
@@ -639,7 +672,7 @@ export const sampleLightWithImportance = Fn( ( [
 
 					If( light.intensity.greaterThan( 0.0 ), () => {
 
-						const spotSample = LightSample.wrap( sampleSpotLightWithRadius( light, rayOrigin, lightSelectionPdf ) );
+						const spotSample = LightSample.wrap( sampleSpotLightWithRadius( light, rayOrigin, lightSelectionPdf, vec2( randomSeed.y, getRandomSample1D( pixelCoord, int( 0 ), dimBase.add( int( 15 ) ), rngState, resolution, frame ) ) ) );
 						r_valid.assign( spotSample.valid );
 						r_direction.assign( spotSample.direction );
 						r_emission.assign( spotSample.emission );
@@ -702,7 +735,7 @@ export const sampleLightWithImportance = Fn( ( [
 			If( selectedType.equal( int( 2 ) ).and( selectedIdx.greaterThanEqual( int( 0 ) ) ), () => {
 
 				const light = PointLight.wrap( getPointLight( pointLightsBuffer, selectedIdx ) );
-				const ptSample = LightSample.wrap( samplePointLightWithAttenuation( light, rayOrigin, pdf ) );
+				const ptSample = LightSample.wrap( samplePointLightWithAttenuation( light, rayOrigin, pdf, vec2( randomSeed.y, getRandomSample1D( pixelCoord, int( 0 ), dimBase.add( int( 15 ) ), rngState, resolution, frame ) ) ) );
 				r_valid.assign( ptSample.valid );
 				r_direction.assign( ptSample.direction );
 				r_emission.assign( ptSample.emission );
@@ -716,7 +749,7 @@ export const sampleLightWithImportance = Fn( ( [
 			If( selectedType.equal( int( 3 ) ).and( selectedIdx.greaterThanEqual( int( 0 ) ) ), () => {
 
 				const light = SpotLight.wrap( getSpotLight( spotLightsBuffer, selectedIdx ) );
-				const spotSample = LightSample.wrap( sampleSpotLightWithRadius( light, rayOrigin, pdf ) );
+				const spotSample = LightSample.wrap( sampleSpotLightWithRadius( light, rayOrigin, pdf, vec2( randomSeed.y, getRandomSample1D( pixelCoord, int( 0 ), dimBase.add( int( 15 ) ), rngState, resolution, frame ) ) ) );
 				r_valid.assign( spotSample.valid );
 				r_direction.assign( spotSample.direction );
 				r_emission.assign( spotSample.emission );

package/src/TSL/SceneResources.js

@@ -12,6 +12,8 @@
  * @property {?Node} iesProfiles - IES profile texture array, or null
  * @property {?Node} alphaShadows - int uniform, 1 = shadow rays test texture alpha; null = never
  * @property {?Object<string, boolean>} materialLayers - the MATERIAL_LAYERS some material uses; null = all of them
+ * @property {boolean} [lightRadius] - some point or spot light has a radius (path tracing only); false = all are points
+ * @property {boolean} [transmissionMaps] - some material has a transmission map; false = shadow rays never sample one
  */
 
 import { context } from 'three/tsl';
@@ -49,3 +51,20 @@ export function materialLayers( builder ) {
 	return builder.context[ KEY ]?.materialLayers ?? ALL_MATERIAL_LAYERS;
 
 }
+
+/**
+ * Whether the kernel being built samples light radii. Off unless a point or spot light has a radius, and off for the
+ * bidirectional integrator, whose light paths leave a light's centre. Outside a scene kernel (a test) it is on.
+ */
+export function usesLightRadius( builder ) {
+
+	return builder.context[ KEY ]?.lightRadius ?? true;
+
+}
+
+/** Whether the kernel being built has shadow rays sample transmission maps. Outside a scene kernel (a test) it does. */
+export function usesTransmissionMaps( builder ) {
+
+	return builder.context[ KEY ]?.transmissionMaps ?? true;
+
+}

package/src/TSL/ShadeKernel.js

@@ -653,8 +653,7 @@ export function buildShadeKernel( params ) {
 			// surface that escapes to env keeps alpha 1 (HAS_HIT_OPAQUE set), so glass-in-front-of-an-
 			// object stays opaque while glass-in-front-of-sky exports see-through.
 			// Ungated (was transparentBackground-only) so the alpha lane always carries coverage: it is the
-			// only hit/miss signal valid at FinalWrite. The image is unchanged — FinalWrite forces alpha 1
-			// when transparent-bg is off.
+			// only hit/miss signal valid at FinalWrite, which accumulates it as is.
 			If( flags.bitAnd( uint( RAY_FLAG.HAS_HIT_OPAQUE ) ).equal( uint( 0 ) ), () => {
 
 				currentRadiance.w.assign( 0.0 );
@@ -918,7 +917,7 @@ export function buildShadeKernel( params ) {
 		const displacedNormal = N.toVar();
 		If(
 			material.displacementMapIndex.greaterThanEqual( int( 0 ) )
-				.and( material.displacementScale.greaterThan( 0.0 ) ),
+				.and( material.displacementScale.notEqual( 0.0 ) ),
 			() => {
 
 				const dispRay = Ray( { origin, direction } );
@@ -1004,7 +1003,7 @@ export function buildShadeKernel( params ) {
 		const albedo = matSamples.albedo.toVar();
 		If(
 			material.displacementMapIndex.greaterThanEqual( int( 0 ) )
-				.and( material.displacementScale.greaterThan( 0.0 ) ),
+				.and( material.displacementScale.notEqual( 0.0 ) ),
 			() => {
 
 				N.assign( normalize( displacedNormal.add( matSamples.normal.sub( normalize( hitNormal ) ) ) ) );

package/src/TSL/Struct.js

@@ -36,6 +36,7 @@ export const RayTracingMaterial = struct( {
 	bumpMapIndex: 'int',
 	bumpScale: 'float',
 	displacementScale: 'float',
+	displacementBias: 'float',
 	metalnessMapIndex: 'int',
 	roughnessMapIndex: 'int',
 	displacementMapIndex: 'int',

package/src/integrators/BidirectionalIntegrator.js

@@ -336,6 +336,7 @@ export class BidirectionalIntegrator {
 			strategyView: bd.strategyView,
 			cameraPosition: bd.cameraPosition,
 			cameraForward: bd.cameraForward,
+			cameraClipStart: this.pt.cameraClipStart,
 			cameraViewMatrix: this.pt.cameraViewMatrix,
 			cameraProjectionMatrix: this.pt.cameraProjectionMatrix,
 			pixelArea: bd.pixelArea,

package/src/managers/CameraManager.js

@@ -93,6 +93,7 @@ export class CameraManager extends EventDispatcher {
 
 		this.cameras = cameras;
 		this._userCameraCounter = 0;
+		this.camera.userData.clipStart = 0;
 		this.resetAutoFocus();
 
 	}
@@ -120,6 +121,7 @@ export class CameraManager extends EventDispatcher {
 		cam.userData.__rayzeeUserCamera = true;
 		cam.userData.__rayzeeEffects = this._captureEffects();
 		if ( this.controls ) cam.userData.__rayzeeOrbitTarget = this.controls.target.clone();
+		if ( src.userData.clipStart > 0 ) cam.userData.clipStart = src.userData.clipStart;
 
 		this._userCameraCounter += 1;
 		cam.name = name || `View Camera ${this._userCameraCounter}`;
@@ -310,6 +312,7 @@ export class CameraManager extends EventDispatcher {
 			this.camera.fov = s.fov;
 			this.camera.near = s.near;
 			this.camera.far = s.far;
+			this.camera.userData.clipStart = 0;
 			this.camera.updateProjectionMatrix();
 			this.camera.updateMatrixWorld( true );
 
@@ -380,6 +383,8 @@ export class CameraManager extends EventDispatcher {
 		if ( source.isPerspectiveCamera ) this.camera.fov = source.fov;
 		this.camera.near = source.near;
 		this.camera.far = source.far;
+		// Only an imported camera's clip start clips the render: see PathTracerStage._updateCameraUniforms.
+		this.camera.userData.clipStart = source.userData?.clipStart ?? 0;
 		this.camera.updateProjectionMatrix();
 		this.camera.updateMatrixWorld( true );
 
@@ -611,6 +616,7 @@ export class CameraManager extends EventDispatcher {
 				fov: camera.fov,
 				near: camera.near,
 				far: camera.far,
+				clipStart: camera.userData.clipStart ?? 0,
 				zoom: camera.zoom,
 				orthographic: !! camera.orthographic,
 				orthoHalfHeight: camera.orthoHalfHeight,
@@ -641,6 +647,7 @@ export class CameraManager extends EventDispatcher {
 					aspect: cam.aspect ?? null,
 					near: cam.near,
 					far: cam.far,
+					clipStart: cam.userData.clipStart ?? 0,
 					zoom: cam.zoom,
 					position: cam.position.toArray(),
 					quaternion: cam.quaternion.toArray(),
@@ -684,6 +691,7 @@ export class CameraManager extends EventDispatcher {
 				cam.updateMatrixWorld( true );
 				cam.userData.__rayzeeUserCamera = true;
 				cam.userData.__rayzeeEffects = fromPortable( entry.effects );
+				if ( entry.clipStart > 0 ) cam.userData.clipStart = entry.clipStart;
 				if ( entry.orbitTarget ) cam.userData.__rayzeeOrbitTarget = new Vector3().fromArray( entry.orbitTarget );
 				indexMap.set( entry.index, this.cameras.length );
 				this.cameras.push( cam );
@@ -730,6 +738,7 @@ export class CameraManager extends EventDispatcher {
 			camera.fov = v.fov;
 			camera.near = v.near;
 			camera.far = v.far;
+			camera.userData.clipStart = v.clipStart ?? 0;
 			this._setView( v.orthographic, v.orthoHalfHeight );
 			camera.zoom = v.zoom ?? 1;
 			camera.updateProjectionMatrix();

package/src/managers/DenoisingManager.js

@@ -426,6 +426,7 @@ export class DenoisingManager extends EventDispatcher {
 			getToneMapping: () => this._getToneMapping(),
 			getSaturation: () => this._getSaturation(),
 			getDisplayGain: () => this._getDisplayGain?.() ?? null,
+			getTransparentBackground: () => !! this._settings?.get( 'transparentBackground' ),
 		} );
 
 		this.upscaler.enabled = DENOISER_DEFAULTS.enableUpscaler || false;

package/src/managers/InteractionManager.js

@@ -704,6 +704,12 @@ export class InteractionManager extends EventDispatcher {
 	 */
 	_intersectScene() {
 
+		// Nothing in front of an imported camera's clip plane is rendered, so nothing there is picked. An orthographic
+		// ray already starts on the near plane, which a switch to such a camera set to its clip start.
+		const clipStart = this.camera.userData?.clipStart ?? 0;
+		this.raycaster.near = clipStart > 0 && ! this.camera.isOrthographicCamera
+			? clipStart / Math.max( this.raycaster.ray.direction.dot( this.camera.getWorldDirection( _viewAxis ) ), 1e-4 )
+			: 0;
 		return this.isGeometryOnDisk?.() ? [] : this.raycaster.intersectObjects( this.scene.children, true );
 
 	}

package/src/managers/MaterialDataManager.js

@@ -342,6 +342,16 @@ export class MaterialDataManager {
 
 	}
 
+	/** Whether some material has a transmission map: only then do shadow rays sample one. */
+	hasTransmissionMaps() {
+
+		const data = this.materialStorageAttr?.array;
+		if ( ! data ) return false;
+		for ( let i = 0; i < this.materialCount; i ++ ) if ( data[ i * M.FLOATS_PER_MATERIAL + M.TRANSMISSION_MAP_INDEX ] >= 0 ) return true;
+		return false;
+
+	}
+
 	/**
 	 * Where a material property's value came from, as a MATERIAL_VALUE_SOURCE. `default` means the
 	 * model never said and the engine filled it in.
@@ -503,6 +513,7 @@ export class MaterialDataManager {
 				break;
 			case 'bumpScale': data[ stride + M.BUMP_SCALE ] = value; break;
 			case 'displacementScale': data[ stride + M.DISPLACEMENT_SCALE ] = value; break;
+			case 'displacementBias': data[ stride + M.DISPLACEMENT_BIAS ] = value; break;
 			case 'subsurface': data[ stride + M.SUBSURFACE ] = value; break;
 			case 'subsurfaceRadiusScale': data[ stride + M.SUBSURFACE_RADIUS_SCALE ] = value; break;
 			case 'subsurfaceAnisotropy': data[ stride + M.SUBSURFACE_ANISOTROPY ] = value; break;

package/src/managers/UniformManager.js

@@ -23,7 +23,7 @@ const SHADER_NAMES = {
 export const LIGHT_FLOATS = Object.freeze( {
 	directional: 12, // 8 light fields + gobo { index, signed intensity, scale, pad }
 	area: 16, // 13 base + normalize, spread, shape
-	point: 9,
+	point: 10, // 9 light fields + radius
 	spot: 20, // 14 light fields + gobo { index, signed intensity } + IES { index, intensity } + 2 reserved
 } );
 
@@ -301,6 +301,8 @@ export class UniformManager {
 		u( 'cameraProjectionMatrixInverse', new Matrix4(), 'mat4' );
 		u( 'cameraViewMatrix', new Matrix4(), 'mat4' );
 		u( 'cameraProjectionMatrix', new Matrix4(), 'mat4' );
+		// An imported camera's near clipping plane: camera rays start this far in front of it (0 = at the camera).
+		u( 'cameraClipStart', 0, 'float' );
 
 		// Projection: CAMERA_PROJECTION_IDS. Ranges are radians (UI carries degrees).
 		const radRange = ( [ min, max ] ) => new Vector2( min, max ).multiplyScalar( MathUtils.DEG2RAD );

package/dist/SceneMetadata-D2Sh-0e-.js

@@ -1,110 +0,0 @@
-//#region src/Processor/archiveFormats.js
-var e = Object.freeze({
-	zip: {
-		type: "archive",
-		name: "ZIP Archive"
-	},
-	gz: {
-		type: "archive",
-		name: "Gzipped TAR Archive"
-	},
-	tgz: {
-		type: "archive",
-		name: "Gzipped TAR Archive"
-	},
-	tar: {
-		type: "archive",
-		name: "TAR Archive"
-	}
-}), t = (e) => typeof Blob < "u" && e instanceof Blob, n = (e) => !!e && typeof e == "object" && !t(e) && e.files != null, r = (e) => e.startsWith(".") || e === "__MACOSX";
-function i({ name: e = null, files: n }, { isModel: i = () => !1 } = {}) {
-	let a = /* @__PURE__ */ new Map();
-	for (let e of n) {
-		let n = t(e) ? e : e.file, i = t(e) ? e.webkitRelativePath || e.name : e.path, o = String(i ?? "").replace(/\\/g, "/").split("/").filter((e) => e && e !== ".").join("/");
-		!o || !n || o.split("/").some(r) || a.set(o, {
-			path: o,
-			file: n
-		});
-	}
-	let o = [...a.values()].sort((e, t) => e.path < t.path ? -1 : +(e.path > t.path)), s = o[0]?.path.split("/")[0], c = o.length > 0 && o.every((e) => e.path.startsWith(s + "/")) ? s : null;
-	return {
-		name: e ?? c ?? (o.find((e) => i(e.path)) ?? o[0])?.path.split("/").pop() ?? "Folder",
-		files: o,
-		flat: c === null && o.every((e) => !e.path.includes("/"))
-	};
-}
-//#endregion
-//#region src/Processor/SceneMetadata.js
-var a = [
-	"sourceFile",
-	"url",
-	"file"
-];
-function o(e) {
-	if (typeof e == "string") try {
-		let t = JSON.parse(e);
-		return t && typeof t == "object" ? t : null;
-	} catch {
-		return null;
-	}
-	return e && typeof e == "object" ? e : null;
-}
-function s(e) {
-	let t = typeof e == "string" ? parseFloat(e) : e;
-	return Number.isFinite(t) ? t : void 0;
-}
-function c(e) {
-	let t = o(e);
-	if (!t) return null;
-	let n = (e) => e && (e.environment !== void 0 || e.render !== void 0), r = o(t.rayzee);
-	return n(r) ? r : n(t) ? t : null;
-}
-function l(e) {
-	let t = o(e);
-	if (!t) return null;
-	let n = a.map((e) => t[e]).find((e) => typeof e == "string" && e.trim());
-	if (!n) return null;
-	let r = s(t.rotation), i = s(t.intensity), c = { sourceFile: n.trim() };
-	return r !== void 0 && (c.rotation = r), i !== void 0 && (c.intensity = Math.max(0, i)), c;
-}
-var u = [
-	"maxBounces",
-	"samples",
-	"width",
-	"height"
-];
-function d(e) {
-	let t = o(e);
-	if (!t) return null;
-	let n = {};
-	for (let e of u) {
-		let r = s(t[e]);
-		r !== void 0 && r > 0 && (n[e] = Math.round(r));
-	}
-	return Object.keys(n).length ? n : null;
-}
-function f(e) {
-	let t = c(e);
-	if (!t) return null;
-	let n = l(t.environment), r = d(t.render);
-	return !n && !r ? null : {
-		...n ? { environment: n } : {},
-		...r ? { render: r } : {}
-	};
-}
-function p(e) {
-	if (!e) return null;
-	let t = [
-		e.userData,
-		e.asset?.extras,
-		e.scene?.userData
-	];
-	Array.isArray(e.scenes) && t.push(...e.scenes.map((e) => e?.userData));
-	for (let e of t) {
-		let t = f(e);
-		if (t) return t;
-	}
-	return null;
-}
-//#endregion
-export { i as a, n as i, f as n, e as r, p as t };