Skip to content

armgit / 67.js

Public Imported from GitHub
0

3D engine that AI agents drive

Merge main into feat/819-water-look

Nguyen Xuan An6ac9e2b30cd6
diff --cc src/agent-scene.js
index 8d243e78,a5aabd8d..f1779123
--- a/src/agent-scene.js
+++ b/src/agent-scene.js
@@@ -6,7 -6,8 +6,8 @@@ import { applyProjection, validateCamer
import { normalizeAgentLook, environmentPatchWithSetup, environmentLinksLights, agentEnvironmentMap, VOLUME_FOG_FIELDS } from './agent-look.js';
import { postStepSupport } from './shader-registry.js';
import { agentSceneModule, agentSceneModuleLoaded } from './agent-scene-modules.js';
-import { MESH_SMOOTH_ANGLE_DEFAULT, CURVE_TEXT_LIMITS, AGENT_SCENE_CAPABILITIES, AGENT_SCENE_DEFAULT_LIMITS, MAX_MATERIAL_PATTERNS, RECIPE_ALPHA_MODES } from './agent-scene-capabilities.js';
+import { CURVE_TEXT_LIMITS, AGENT_SCENE_CAPABILITIES, AGENT_SCENE_DEFAULT_LIMITS, MAX_MATERIAL_PATTERNS, RECIPE_ALPHA_MODES } from './agent-scene-capabilities.js';
+ import { normalizeMaterialWear, geometryWithSurfaceMasks } from './material-wear.js';
import { ALL_LIGHTS_MASK, MATERIAL_LAYER_FIELDS, validateMaterialLayers } from './material-layers.js';
import { recipeDiagnostics, closedRoomDiagnostic } from './agent-diagnostics.js';
import { closedRoomShare, CLOSED_ROOM_SHARE } from './closed-room.js';
@@@ -1485,9 -1487,9 +1487,10 @@@ export function createAgentScene(input
const usesVisibility = recipeUsesVisibility(recipe);
const nextParts = recipe.nodes.filter(node => node.geometry !== undefined).map(node => {
const binding = skinBindings.get(node.id);
- const sourceGeometry = binding?.geometry ?? geometries.get(node.geometry);
- const geometry = sourceGeometry.vertexGroups?.foam ? agentSceneModule('mesh').waterFoamGeometry(sourceGeometry, materialHandles.get(node.material).output) : sourceGeometry;
const material = materialHandles.get(node.material).output;
+ const sourceGeometry = binding?.geometry ?? geometries.get(node.geometry);
- const geometry = material.wear ? geometryWithSurfaceMasks(sourceGeometry, material.wear, node.id) : sourceGeometry;
++ const foamGeometry = sourceGeometry.vertexGroups?.foam ? agentSceneModule('mesh').waterFoamGeometry(sourceGeometry, material) : sourceGeometry;
++ const geometry = material.wear ? geometryWithSurfaceMasks(foamGeometry, material.wear, node.id) : foamGeometry;
const assetExtras = assetRuntime.partExtras.get(node.id);
// Shape keys of a recipe mesh are morph targets with their own weights per part; an imported asset brings its own pose.
const shapeKeyMorph = geometry.morphTargetValues && !assetExtras?.morph ? { weights: Float32Array.from(geometry.morphTargetValues) } : undefined;