@unikia/upe-renderer 0.186.110 → 0.187.11

package/examples/jsm/loaders/materialx/MaterialXInterfaceValidation.js

@@ -1,34 +1,13 @@
 import { MtlXLibrary } from './MaterialXNodeLibrary.js';
 import { MaterialXLogCodes } from './MaterialXLog.js';
-import registryData from './MaterialXNodeInterfaceRegistry.js';
 
 const SKIP_ELEMENTS = new Set( [ 'materialx', 'input', 'output' ] );
 const CONTAINER_ELEMENTS = new Set( [ 'nodegraph' ] );
 
-const LIBRARY_FALLBACK_OUTPUT = 'out';
-
-function formatInputElement( inputNodeX ) {
+function formatElement( nodeX, attrNames, tagName = nodeX.element ) {
 
 	const attrs = [];
-	for ( const name of [ 'name', 'type', 'nodename', 'nodegraph', 'interfacename', 'output', 'value' ] ) {
-
-		const value = inputNodeX.getAttribute( name );
-		if ( value !== null && value !== '' ) {
-
-			attrs.push( `${name}="${value}"` );
-
-		}
-
-	}
-
-	return `<input ${attrs.join( ' ' )}>`;
-
-}
-
-function formatNodeElement( nodeX ) {
-
-	const attrs = [];
-	for ( const name of [ 'name', 'type', 'nodedef' ] ) {
+	for ( const name of attrNames ) {
 
 		const value = nodeX.getAttribute( name );
 		if ( value !== null && value !== '' ) {
@@ -39,91 +18,29 @@ function formatNodeElement( nodeX ) {
 
 	}
 
-	return `<${nodeX.element} ${attrs.join( ' ' )}>`;
+	return `<${tagName} ${attrs.join( ' ' )}>`;
 
 }
 
-function scoreNodedefCandidate( candidateName, nodeX ) {
-
-	const candidate = registryData.resolved[ candidateName ];
-	if ( ! candidate ) return - 1;
-
-	let score = 0;
-	const nodeType = nodeX.type;
-	const outputType = candidate.outputs.out || Object.values( candidate.outputs )[ 0 ];
-	if ( nodeType && outputType === nodeType ) {
-
-		score += 4;
-
-	}
-
-	for ( const child of nodeX.children ) {
-
-		if ( child.element !== 'input' ) continue;
-		const expectedType = candidate.inputs[ child.name ];
-		if ( ! expectedType || ! child.type ) continue;
-		if ( expectedType === child.type ) {
-
-			score += 3;
-
-		} else if ( typesCompatible( expectedType, child.type ) ) {
-
-			score += 1;
-
-		} else {
+function formatInputElement( inputNodeX ) {
 
-			score -= 2;
+	return formatElement( inputNodeX, [ 'name', 'type', 'nodename', 'nodegraph', 'interfacename', 'output', 'value' ], 'input' );
 
-		}
+}
 
-	}
+function formatNodeElement( nodeX ) {
 
-	return score;
+	return formatElement( nodeX, [ 'name', 'type', 'nodedef' ] );
 
 }
 
 function resolveInterface( nodeX ) {
 
-	const nodedefName = nodeX.getAttribute( 'nodedef' );
-	if ( nodedefName && registryData.resolved[ nodedefName ] ) {
-
-		return { source: 'nodedef', name: nodedefName, ...registryData.resolved[ nodedefName ] };
-
-	}
-
-	const candidates = registryData.byNode[ nodeX.element ] || [];
-	if ( candidates.length > 0 ) {
-
-		let selected = candidates[ 0 ];
-		let bestScore = - Infinity;
-
-		for ( const candidateName of candidates ) {
-
-			const score = scoreNodedefCandidate( candidateName, nodeX );
-			if ( score > bestScore ) {
-
-				bestScore = score;
-				selected = candidateName;
-
-			}
-
-		}
-
-		const resolved = registryData.resolved[ selected ];
-		if ( resolved ) {
-
-			return { source: 'nodedef', name: selected, ...resolved };
-
-		}
-
-	}
-
-	const libraryEntry = MtlXLibrary[ nodeX.element ];
-	if ( libraryEntry ) {
+	const nodeDef = nodeX.nodeDef;
+	if ( nodeDef ) {
 
-		const inputs = Object.fromEntries( libraryEntry.params.map( ( param ) => [ param, null ] ) );
-		const outputs = nodeX.type ? { [ LIBRARY_FALLBACK_OUTPUT ]: nodeX.type } : {};
-		return { source: 'library', name: nodeX.element, node: nodeX.element, inputs, outputs };
+		const inputs = Object.fromEntries( Object.entries( nodeDef.inputs ).map( ( [ name, input ] ) => [ name, input.type ] ) );
+		return { name: nodeDef.name, node: nodeDef.node, inputs, outputs: nodeDef.outputs };
 
 	}
 

package/examples/jsm/loaders/materialx/MaterialXLog.js

@@ -19,6 +19,10 @@ const MaterialXLogCodes = {
 		label: 'invalid-value',
 		severity: 'error',
 	},
+	TEXTURE_LOAD_FAILED: {
+		label: 'texture-load-failed',
+		severity: 'warning',
+	},
 	UNKNOWN_INPUT: {
 		label: 'unknown-input',
 		severity: 'error',

package/examples/jsm/loaders/materialx/MaterialXNodeDefs.js

@@ -0,0 +1,99 @@
+import registryData from './MaterialXNodeInterfaceRegistry.js';
+
+// Nodedef names grouped by node category, in registry (alphabetical) order.
+const nodedefNamesByCategory = new Map();
+
+for ( const [ name, nodedef ] of Object.entries( registryData.nodedefs ) ) {
+
+	if ( nodedefNamesByCategory.has( nodedef.node ) === false ) nodedefNamesByCategory.set( nodedef.node, [] );
+	nodedefNamesByCategory.get( nodedef.node ).push( name );
+
+}
+
+/**
+ * Returns the names of the stdlib nodedefs that implement a node category.
+ *
+ * @param {string} category - The node category, e.g. `'multiply'`.
+ * @return {Array<string>} The nodedef names, empty when the category is unknown.
+ */
+function getNodeDefNames( category ) {
+
+	return nodedefNamesByCategory.get( category ) || [];
+
+}
+
+function getOutputType( nodedef ) {
+
+	const outputNames = Object.keys( nodedef.outputs );
+	if ( outputNames.length > 1 ) return 'multioutput';
+	return nodedef.outputs.out ?? nodedef.outputs[ outputNames[ 0 ] ] ?? null;
+
+}
+
+function hasExactInputMatch( nodedef, nodeX ) {
+
+	for ( const child of nodeX.children ) {
+
+		if ( child.element !== 'input' ) continue;
+
+		const declared = nodedef.inputs[ child.name ];
+		if ( ! declared ) return false;
+		if ( child.type && declared.type !== child.type ) return false;
+
+	}
+
+	return true;
+
+}
+
+// Mirrors `NodeDef::isVersionCompatible()`: an unversioned node takes the default version.
+function isVersionCompatible( nodedef, version ) {
+
+	if ( ( nodedef.version || '' ) === version ) return true;
+	return nodedef.isdefaultversion === true && version === '';
+
+}
+
+/**
+ * Resolves the nodedef of a node instance like `Node::getNodeDef()` in MaterialX.
+ *
+ * @param {MaterialXNode} nodeX - The node instance.
+ * @return {?{name: string, node: string, inputs: Object, outputs: Object}} The resolved nodedef or `null`.
+ */
+function resolveNodeDef( nodeX ) {
+
+	const documentNodeDefs = nodeX.materialX.getDocumentNodeDefs();
+
+	const explicitName = nodeX.getAttribute( 'nodedef' );
+	if ( explicitName ) {
+
+		const nodedef = registryData.nodedefs[ explicitName ] || documentNodeDefs[ explicitName ];
+		if ( nodedef ) return { name: explicitName, ...nodedef };
+
+	}
+
+	const version = nodeX.getAttribute( 'version' ) || '';
+	const candidates = [
+		...getNodeDefNames( nodeX.element ).map( ( name ) => [ name, registryData.nodedefs[ name ] ] ),
+		...Object.entries( documentNodeDefs ).filter( ( [ , nodedef ] ) => nodedef.node === nodeX.element ),
+	];
+
+	let roughMatch = null;
+
+	for ( const [ name, nodedef ] of candidates ) {
+
+		if ( isVersionCompatible( nodedef, version ) === false ) continue;
+
+		const outputType = getOutputType( nodedef );
+		// multioutput nodedefs are matched by their input types only
+		if ( nodeX.type && outputType !== 'multioutput' && outputType !== nodeX.type ) continue;
+		if ( hasExactInputMatch( nodedef, nodeX ) ) return { name, ...nodedef };
+		roughMatch ??= { name, ...nodedef };
+
+	}
+
+	return roughMatch;
+
+}
+
+export { resolveNodeDef, getNodeDefNames };