Skip to content

armgit / 67.js

Public Imported from GitHub
0

3D engine that AI agents drive

Merge origin/main into feat/recipe-assets

Nguyen Xuan Anfc05847ff9d7
diff --cc src/agent-scene-modules.js
index c6f2948c,b2c4a89f..479a2d48
--- a/src/agent-scene-modules.js
+++ b/src/agent-scene-modules.js
@@@ -21,7 -21,9 +21,10 @@@ const MODULE_LOADERS =
navigation: () => import('./agent-navigation.js'),
lightLinking: () => import('./light-linking.js'),
cascades: () => import('./cascaded-shadows.js'),
+ assets: () => import('./agent-scene-assets.js'),
+ lineArt: () => import('./line-art.js'),
+ viewTransform: () => import('./view-transform-shader.js'),
+ coplanar: () => import('./coplanar-overlap.js'),
};
const loadedModules = {};
@@@ -50,7 -52,10 +53,11 @@@ const MODULE_MARKERS =
navigation: [],
lightLinking: ['"affects"', '"keyAffects"'],
cascades: ['"shadowCascades"'],
+ assets: ['"asset":{'],
+ lineArt: ['"lines":{', '"toon":'],
+ viewTransform: ['"viewTransform":"agx"', '"viewTransform":"neutral"', '"look":"'],
+ // The coplanar-overlap warning in scene_inspect appears only once this is loaded, which loadAllAgentSceneModules does; a recipe with resolveCoplanar needs it.
+ coplanar: ['"resolveCoplanar"'],
};
/** Whether a recipe, operation list or edit list contains a boolean edit, which needs loadMeshBooleans() first. */
diff --cc src/agent-scene.js
index c36b045b,d36ac0a3..1e81eda1
--- a/src/agent-scene.js
+++ b/src/agent-scene.js
@@@ -22,7 -23,7 +23,7 @@@ const MAX_MESH_REPORTS = 16
// Terrain meshes carry one more float for each vertex (sky visibility) than the 56 bytes the budget estimates.
const TERRAIN_SKY_VISIBILITY_BYTES = 4;
const CAMERA_DEFAULTS = Object.freeze({ eye: [4, 3, 5], target: [0, 0, 0], up: [0, 1, 0], fov: 45, near: 0.1, far: 1000 });
- const NODE_FIELDS = ['translation', 'rotation', 'scale', 'parent', 'label', 'geometry', 'material', 'skin', 'relations', 'asset'];
-const NODE_FIELDS = ['translation', 'rotation', 'scale', 'parent', 'label', 'geometry', 'material', 'skin', 'relations', 'decal', 'depthLayer'];
++const NODE_FIELDS = ['translation', 'rotation', 'scale', 'parent', 'label', 'geometry', 'material', 'skin', 'relations', 'asset', 'decal', 'depthLayer'];
const MATERIAL_FIELDS = ['color', 'metallic', 'roughness', 'emission', 'emissiveColor', 'opacity', 'alphaMode', 'doubleSided', 'pattern', ...MATERIAL_LAYER_FIELDS];
const PATTERN_TEXTURE_FIELDS = ['map', 'normalMap', 'metallicRoughnessMap', 'emissiveMap', 'boxMapScale', 'boxMapAxis'];
const CAMERA_FIELDS = Object.keys(CAMERA_DEFAULTS);
@@@ -283,12 -285,12 +285,18 @@@ function nodeFrom(value)
identifier(value.geometry);
identifier(value.material);
}
+ if (value.asset !== undefined) {
+ if (value.geometry !== undefined || value.skin !== undefined) {
+ throw new TypeError(`Node ${value.id}: a node that places an asset is a group; drop geometry, material and skin.`);
+ }
+ result.asset = agentSceneModule('assets').normalizeAssetPlacement(value.asset);
+ }
+ if (value.decal !== undefined && typeof value.decal !== 'boolean') {
+ throw new TypeError('decal must be boolean.');
+ }
+ if (value.depthLayer !== undefined) {
+ integer(value.depthLayer, 0, MAXIMUM_DEPTH_LAYER, 'depthLayer');
+ }
if (value.skin !== undefined) {
if (value.geometry === undefined) {
throw new TypeError('Only mesh nodes can have a skin.');
@@@ -1098,15 -1056,14 +1106,16 @@@ export function createAgentScene(input
const binding = skinBindings.get(node.id);
const geometry = binding?.geometry ?? geometries.get(node.geometry);
const material = materialHandles.get(node.material).output;
+ const assetExtras = assetRuntime.partExtras.get(node.id);
const activePart = removedNodes.has(node.id) ? null : activeParts.get(node.id);
const existing = [activePart, preferredParts.get(node.id)]
- .find(part => part?.geometry === geometry && part.material === material && part.skin === (assetExtras?.skin ?? binding?.skin) && part.morph === assetExtras?.morph);
- .find(part => part?.geometry === geometry && part.material === material && part.skin === binding?.skin && depthLayerOf(part) === depthLayerOf(node));
++ .find(part => part?.geometry === geometry && part.material === material && part.skin === (assetExtras?.skin ?? binding?.skin) && part.morph === assetExtras?.morph && depthLayerOf(part) === depthLayerOf(node));
return existing ?? Object.freeze({
name: node.id, geometry, material,
+ ...(depthLayerOf(node) ? { depthLayer: depthLayerOf(node) } : {}),
matrix: new Float32Array(graph.getNode(node.id).worldMatrix),
...(binding ? { skin: binding.skin } : {}),
+ ...assetExtras,
});
});
retainedMatrices(nextParts);
diff --cc tests/support/preview-harness.mjs
index 0dd031da,45c667c9..8f3abba3
--- a/tests/support/preview-harness.mjs
+++ b/tests/support/preview-harness.mjs
@@@ -74,8 -73,10 +74,10 @@@ export function previewHarness()
// The harness loads Manifold from node_modules directly, so the preview's served-file loader is ignored.
setManifoldModuleLoader: () => {},
needsPhysics, loadPhysicsEngine, physicsEngineLoaded, setPhysicsModuleLoader: () => {},
- parseGltf, Uint8Array, atob, sessionProblem,
+ parseGltf, Uint8Array, atob, sessionProblem, assetCopyKey, recipeAssetNeeds,
- applyProjection, mat4, resolveAgentShadow, agentEnvironmentMap, agentSceneModule, BRANCH_LIMITS, createBranchStore, printableLabel,
+ applyProjection, mat4, resolveAgentShadow, agentEnvironmentMap, BRANCH_LIMITS,
+ // Line art needs a real renderer with render passes, so the fault-injected one gets a no-op install.
+ agentSceneModule: name => (name === 'lineArt' ? { installLineArt: renderer => renderer } : agentSceneModule(name)), createBranchStore, printableLabel,
Renderer67: FaultInjectedRenderer, skyOpenness: () => 1, fogSkyVisibility: () => null,
// The fault-injected renderer has no floor part; the automatic floor is covered by agent-ground.test.js and the live smokes.
agentGroundPlacement: () => null, createAgentGround: () => null, placeAgentGround: () => {}, FLOOR_COLOR: [0.22, 0.22, 0.21], groundBounceEnvironment: (parts, environment) => environment,