rayzee 10.0.0 → 11.1.0

package/src/Processor/PBRT/PBRTParser.js

@@ -111,6 +111,7 @@ export class PBRTParser {
 			instanceCount: 0,
 			skippedInstances: 0,
 			objects: new Map(),
+			media: new Map(),
 			transformTimes: { start: 0, end: 1 },
 			hasMotion: false,
 			warnings: []
@@ -122,14 +123,13 @@ export class PBRTParser {
 		this.activeTransform = BOTH;
 		this._ctmSource = null;
 		this._ctmValue = null;
-		this.state = { material: null, areaLight: null, reverseOrientation: false };
+		this.state = { material: null, areaLight: null, reverseOrientation: false, interior: null };
 		this.attributeStack = [];
 		this.transformStack = [];
 		this.coordSystems = new Map();
 
 		// Object capture (ObjectBegin/End)
 		this.currentObject = null; // name being captured, or null
-		this.objectBeginCTM = null; // CTM frame at ObjectBegin
 
 		// Directory stack for resolving nested Includes
 		this.dirStack = [ '' ];
@@ -275,7 +275,8 @@ export class PBRTParser {
 			activeTransform: this.activeTransform,
 			material: this.state.material,
 			areaLight: this.state.areaLight,
-			reverseOrientation: this.state.reverseOrientation
+			reverseOrientation: this.state.reverseOrientation,
+			interior: this.state.interior
 		} );
 
 	}
@@ -287,7 +288,7 @@ export class PBRTParser {
 		this.ctm = s.ctm;
 		this.ctmEnd = s.ctmEnd;
 		this.activeTransform = s.activeTransform;
-		this.state = { material: s.material, areaLight: s.areaLight, reverseOrientation: s.reverseOrientation };
+		this.state = { material: s.material, areaLight: s.areaLight, reverseOrientation: s.reverseOrientation, interior: s.interior };
 
 	}
 
@@ -602,15 +603,33 @@ export class PBRTParser {
 				this.ir.film = {
 					xresolution: this._num( params.xresolution, 1280 ),
 					yresolution: this._num( params.yresolution, 720 ),
+					resolutionGiven: Boolean( params.xresolution || params.yresolution ),
 					filename: this._str( params.filename, null )
 				};
 				break;
 
 			}
 
+			// What the scene asks the renderer for; reported, not applied (PBRTSceneBuilder renderRequest).
+			case 'Integrator': {
+
+				this._expectString( 'Integrator type' );
+				const params = this._parseParams();
+				if ( params.maxdepth ) this.ir.integrator = { maxdepth: this._num( params.maxdepth, 5 ) };
+				break;
+
+			}
+
+			case 'Sampler': {
+
+				this._expectString( 'Sampler type' );
+				const params = this._parseParams();
+				if ( params.pixelsamples ) this.ir.sampler = { pixelsamples: this._num( params.pixelsamples, 16 ) };
+				break;
+
+			}
+
 			// Consumed for completeness; not used by the engine.
-			case 'Integrator':
-			case 'Sampler':
 			case 'PixelFilter':
 			case 'Filter':
 			case 'Accelerator':
@@ -624,7 +643,7 @@ export class PBRTParser {
 				this.ctm = M.identity();
 				this.ctmEnd = null;
 				this.activeTransform = BOTH;
-				this.state = { material: null, areaLight: null, reverseOrientation: false };
+				this.state = { material: null, areaLight: null, reverseOrientation: false, interior: null };
 				break;
 			case 'WorldEnd': break; // legacy v3
 
@@ -673,14 +692,21 @@ export class PBRTParser {
 
 			case 'MediumInterface': {
 
-				// up to two strings (inside/outside)
-				if ( this._peek() && this._peek().type === TokenType.STRING ) this._next();
-				if ( this._peek() && this._peek().type === TokenType.STRING ) this._next();
+				// "interior" "exterior"; a single name is both. Only the interior colours a shape.
+				const interior = this._peek()?.type === TokenType.STRING ? this._next().value : '';
+				if ( this._peek()?.type === TokenType.STRING ) this._next();
+				this.state.interior = interior || null;
 				break;
 
 			}
 
-			case 'MakeNamedMedium': this._skipNamedAndParams(); break;
+			case 'MakeNamedMedium': {
+
+				const mediumName = this._expectString( 'MakeNamedMedium name' );
+				this.ir.media.set( mediumName, this._parseParams() );
+				break;
+
+			}
 
 			// ── materials ──
 			case 'Material': {
@@ -748,13 +774,17 @@ export class PBRTParser {
 
 				const type = this._expectString( 'Shape type' );
 				const params = this._parseParams();
+				// pbrt: a shape of alpha 0 is never hit, and an area light on it emits nothing.
+				const alpha = params.alpha;
+				if ( alpha?.type === 'float' && alpha.value[ 0 ] <= 0 ) break;
 				const shape = {
 					type,
 					params,
 					ctm: this._ctmSnapshot(),
 					material: this.state.material,
 					areaLight: this.state.areaLight,
-					reverseOrientation: this.state.reverseOrientation
+					reverseOrientation: this.state.reverseOrientation,
+					interior: this.state.interior
 				};
 				const end = this.currentObject === null ? this._ctmEndSnapshot() : null;
 				if ( end ) shape.ctmEnd = end;
@@ -776,7 +806,6 @@ export class PBRTParser {
 				// pbrt implicitly pushes graphics state.
 				this._pushGraphicsState();
 				this.currentObject = objName;
-				this.objectBeginCTM = this.ctm.slice();
 				if ( ! this.ir.objects.has( objName ) ) this.ir.objects.set( objName, [] );
 				break;
 
@@ -785,7 +814,6 @@ export class PBRTParser {
 			case 'ObjectEnd': {
 
 				this.currentObject = null;
-				this.objectBeginCTM = null;
 				this._popGraphicsState();
 				break;
 
@@ -824,8 +852,8 @@ export class PBRTParser {
 
 		if ( this.currentObject !== null ) {
 
-			// Store relative to the ObjectBegin frame so instances can re-place it.
-			shape.relativeCTM = M.multiply( M.invert( this.objectBeginCTM ), shape.ctm );
+			// pbrt keeps a template shape's whole transform and puts each placement's on top of it,
+			// whatever the transform was at ObjectBegin (kroken defines under one and places at Identity).
 			this.ir.objects.get( this.currentObject ).push( shape );
 
 		} else {
@@ -880,7 +908,7 @@ export class PBRTParser {
 
 		if ( ! this.instanceIncludes || this.currentObject !== null ) return null;
 		if ( this.ctmEnd !== null || this.activeTransform !== BOTH || this.state.areaLight ) return null;
-		return `${dir}\0${path}\0${this._stateId( this.state.material )}\0${this.state.reverseOrientation}`;
+		return `${dir}\0${path}\0${this._stateId( this.state.material )}\0${this.state.reverseOrientation}\0${this.state.interior}`;
 
 	}
 
@@ -902,7 +930,8 @@ export class PBRTParser {
 			attributes: this.attributeStack.length,
 			transforms: this.transformStack.length,
 			material: this.state.material,
-			reverseOrientation: this.state.reverseOrientation
+			reverseOrientation: this.state.reverseOrientation,
+			interior: this.state.interior
 		};
 
 	}
@@ -912,7 +941,8 @@ export class PBRTParser {
 		return this._effects === before.effects && this.ctmEnd === null && this.activeTransform === BOTH &&
 			sameMatrix( this.ctm, before.ctm ) && this.attributeStack.length === before.attributes &&
 			this.transformStack.length === before.transforms && this.state.material === before.material &&
-			this.state.areaLight === null && this.state.reverseOrientation === before.reverseOrientation;
+			this.state.areaLight === null && this.state.reverseOrientation === before.reverseOrientation &&
+			this.state.interior === before.interior;
 
 	}
 

package/src/Processor/PBRT/PBRTScattering.js

@@ -0,0 +1,93 @@
+/**
+ * Scattering coefficients for pbrt's `subsurface` material: its named media and the inversion from a diffuse
+ * reflectance to the albedo that produces it.
+ */
+
+// pbrt-v4's table (media.cpp): [ σ′s, σa ] in mm⁻¹, from Jensen et al. 2001 and Narasimhan et al. 2006.
+const MEASURED = {
+	'Apple': [[ 2.29, 2.39, 1.97 ], [ 0.0030, 0.0034, 0.046 ]],
+	'Chicken1': [[ 0.15, 0.21, 0.38 ], [ 0.015, 0.077, 0.19 ]],
+	'Chicken2': [[ 0.19, 0.25, 0.32 ], [ 0.018, 0.088, 0.20 ]],
+	'Cream': [[ 7.38, 5.47, 3.15 ], [ 0.0002, 0.0028, 0.0163 ]],
+	'Ketchup': [[ 0.18, 0.07, 0.03 ], [ 0.061, 0.97, 1.45 ]],
+	'Marble': [[ 2.19, 2.62, 3.00 ], [ 0.0021, 0.0041, 0.0071 ]],
+	'Potato': [[ 0.68, 0.70, 0.55 ], [ 0.0024, 0.0090, 0.12 ]],
+	'Skimmilk': [[ 0.70, 1.22, 1.90 ], [ 0.0014, 0.0025, 0.0142 ]],
+	'Skin1': [[ 0.74, 0.88, 1.01 ], [ 0.032, 0.17, 0.48 ]],
+	'Skin2': [[ 1.09, 1.59, 1.79 ], [ 0.013, 0.070, 0.145 ]],
+	'Spectralon': [[ 11.6, 20.4, 14.9 ], [ 0.00, 0.00, 0.00 ]],
+	'Wholemilk': [[ 2.55, 3.21, 3.77 ], [ 0.0011, 0.0024, 0.014 ]],
+	'Lowfat Milk': [[ 0.89187, 1.5136, 2.532 ], [ 0.002875, 0.00575, 0.0115 ]],
+	'Reduced Milk': [[ 2.4858, 3.1669, 4.5214 ], [ 0.0025556, 0.0051111, 0.012778 ]],
+	'Regular Milk': [[ 4.5513, 5.8294, 7.136 ], [ 0.0015333, 0.0046, 0.019933 ]],
+	'Espresso': [[ 0.72378, 0.84557, 1.0247 ], [ 4.7984, 6.5751, 8.8493 ]],
+	'Mint Mocha Coffee': [[ 0.31602, 0.38538, 0.48131 ], [ 3.772, 5.8228, 7.82 ]],
+	'Lowfat Soy Milk': [[ 0.30576, 0.34233, 0.61664 ], [ 0.0014375, 0.0071875, 0.035937 ]],
+	'Regular Soy Milk': [[ 0.59223, 0.73866, 1.4693 ], [ 0.0019167, 0.0095833, 0.065167 ]],
+	'Lowfat Chocolate Milk': [[ 0.64925, 0.83916, 1.1057 ], [ 0.0115, 0.0368, 0.1564 ]],
+	'Regular Chocolate Milk': [[ 1.4585, 2.1289, 2.9527 ], [ 0.010063, 0.043125, 0.14375 ]],
+	'Coke': [[ 8.9053e-05, 8.372e-05, 0 ], [ 0.10014, 0.16503, 0.2468 ]],
+	'Pepsi': [[ 6.1697e-05, 4.2564e-05, 0 ], [ 0.091641, 0.14158, 0.20729 ]],
+	'Sprite': [[ 6.0306e-06, 6.4139e-06, 6.5504e-06 ], [ 0.001886, 0.0018308, 0.0020025 ]],
+	'Gatorade': [[ 0.0024574, 0.003007, 0.0037325 ], [ 0.024794, 0.019289, 0.008878 ]],
+	'Chardonnay': [[ 1.7982e-05, 1.3758e-05, 1.2023e-05 ], [ 0.010782, 0.011855, 0.023997 ]],
+	'White Zinfandel': [[ 1.7501e-05, 1.9069e-05, 1.288e-05 ], [ 0.012072, 0.016184, 0.019843 ]],
+	'Merlot': [[ 2.1129e-05, 0, 0 ], [ 0.11632, 0.25191, 0.29434 ]],
+	'Budweiser Beer': [[ 2.4356e-05, 2.4079e-05, 1.0564e-05 ], [ 0.011492, 0.024911, 0.057786 ]],
+	'Coors Light Beer': [[ 5.0922e-05, 4.301e-05, 0 ], [ 0.006164, 0.013984, 0.034983 ]],
+	'Clorox': [[ 0.0024035, 0.0031373, 0.003991 ], [ 0.0033542, 0.014892, 0.026297 ]],
+	'Apple Juice': [[ 0.00013612, 0.00015836, 0.000227 ], [ 0.012957, 0.023741, 0.052184 ]],
+	'Cranberry Juice': [[ 0.00010402, 0.00011646, 7.8139e-05 ], [ 0.039437, 0.094223, 0.12426 ]],
+	'Grape Juice': [[ 5.382e-05, 0, 0 ], [ 0.10404, 0.23958, 0.29325 ]],
+	'Ruby Grapefruit Juice': [[ 0.011002, 0.010927, 0.011036 ], [ 0.085867, 0.18314, 0.25262 ]],
+	'White Grapefruit Juice': [[ 0.22826, 0.23998, 0.32748 ], [ 0.0138, 0.018831, 0.056781 ]],
+	'Shampoo': [[ 0.0007176, 0.0008303, 0.0009016 ], [ 0.014107, 0.045693, 0.061717 ]],
+	'Strawberry Shampoo': [[ 0.00015671, 0.00015947, 1.518e-05 ], [ 0.01449, 0.05796, 0.075823 ]],
+	'Head & Shoulders Shampoo': [[ 0.023805, 0.028804, 0.034306 ], [ 0.084621, 0.15688, 0.20365 ]],
+	'Lemon Tea Powder': [[ 0.040224, 0.045264, 0.051081 ], [ 2.4288, 4.5757, 7.2127 ]],
+	'Orange Powder': [[ 0.00015617, 0.00017482, 0.0001762 ], [ 0.001449, 0.003441, 0.007863 ]],
+	'Pink Lemonade Powder': [[ 0.00012103, 0.00013073, 0.00012528 ], [ 0.001165, 0.002366, 0.003195 ]],
+	'Cappuccino Powder': [[ 1.8436, 2.5851, 2.1662 ], [ 35.844, 49.547, 61.084 ]],
+	'Salt Powder': [[ 0.027333, 0.032451, 0.031979 ], [ 0.28415, 0.3257, 0.34148 ]],
+	'Sugar Powder': [[ 0.00022272, 0.00025513, 0.000271 ], [ 0.012638, 0.031051, 0.050124 ]],
+	'Suisse Mocha Powder': [[ 2.7979, 3.5452, 4.3365 ], [ 17.502, 27.004, 35.433 ]],
+	'Pacific Ocean Surface Water': [[ 0.0001764, 0.00032095, 0.00019617 ], [ 0.031845, 0.031324, 0.030147 ]],
+};
+
+/** A named medium's `{ sigmaS, sigmaA }` (σ′s with g = 0), or null. */
+export function namedScattering( name ) {
+
+	const entry = MEASURED[ name ];
+	return entry ? { sigmaS: entry[ 0 ].slice(), sigmaA: entry[ 1 ].slice() } : null;
+
+}
+
+/**
+ * Total diffuse reflectance of a half space of reduced albedo α′ and relative index η under the classical dipole
+ * (Jensen et al. 2001): (α′ / 2) (1 + e^(−4/3 A √(3(1 − α′)))) e^(−√(3(1 − α′))).
+ */
+export function dipoleReflectance( albedo, eta ) {
+
+	const fdr = - 1.440 / ( eta * eta ) + 0.710 / eta + 0.668 + 0.0636 * eta;
+	const A = ( 1 + fdr ) / ( 1 - fdr );
+	const s = Math.sqrt( 3 * ( 1 - albedo ) );
+	return albedo / 2 * ( 1 + Math.exp( - 4 / 3 * A * s ) ) * Math.exp( - s );
+
+}
+
+/** The reduced albedo whose dipole reflectance is `reflectance` (pbrt inverts its own table the same way). */
+export function albedoForReflectance( reflectance, eta ) {
+
+	const target = Math.min( Math.max( reflectance, 0 ), dipoleReflectance( 1, eta ) );
+	let lo = 0, hi = 1;
+	for ( let i = 0; i < 48; i ++ ) {
+
+		const mid = ( lo + hi ) / 2;
+		if ( dipoleReflectance( mid, eta ) < target ) lo = mid;
+		else hi = mid;
+
+	}
+
+	return ( lo + hi ) / 2;
+
+}