3D engine that AI agents drive
Trim agent-scene: one liquid field list, no redundant type check
Nguyen Xuan Ane258c6266117
diff --git a/src/agent-look.js b/src/agent-look.jsindex 1ebb1ab3..0b07ef01 100644--- a/src/agent-look.js+++ b/src/agent-look.js@@ -2,7 +2,7 @@ import { mat4 } from 'gl-matrix';import { createLightingState, updateLightingState, MAX_POINT_LIGHTS, MAX_SPOT_LIGHTS, MAX_AREA_LIGHTS } from './lighting.js';import { resolveEffects } from './effects.js';import { resolveVolumeFog } from './volumetric.js';-import { resolveLiquidOptics } from './liquid-optics.js';+import { LIQUID_OPTICS, resolveLiquidOptics } from './liquid-optics.js';import { createLightingSetupMap, lightingSetupFields } from './lighting-setups.js';import { agentSceneModule } from './agent-scene-modules.js';import { VIEW_TRANSFORM_NAMES, LOOK_NAMES } from './view-transform-names.js';@@ -15,7 +15,6 @@ const ENVIRONMENT_FIELDS = ['world', 'ground', 'setup', 'environmentIntensity', 'environmentRotation', 'lightDirection', 'keyColor', 'keyIntensity', 'fillIntensity', 'ambientIntensity','daylight', 'pointLights', 'spotLights', 'areaLights', 'skyTop', 'skyBottom', 'fogColor', 'fogDensity', 'volumeFog', 'liquid', 'shadowCascades', 'keyAffects', 'objectReflections', 'lines', 'resolveCoplanar', 'viewTransform', 'look',];-const LIQUID_FIELDS = ['thickness', 'ior', 'refraction', 'scattering', 'foamOpacity', 'foamSoftness'];const EFFECT_FIELDS = ['exposure', 'saturation', 'contrast', 'temperature', 'vignette', 'grain', 'ambientOcclusion', 'ambientOcclusionRadius', 'bloom', 'depthOfField', 'motionBlur'];const SHADOW_FIELDS = ['target', 'extent', 'distance', 'near', 'far'];const POINT_LIGHT_FIELDS = ['position', 'color', 'intensity', 'radius', 'range', 'castShadow', 'affects'];@@ -308,7 +307,7 @@ function environmentFrom(input = {}) {environment.keyAffects = affectsFrom({ affects: input.keyAffects }, 'environment keyAffects').affects;}if (input.liquid !== undefined) {- knownKeys(input.liquid, LIQUID_FIELDS, 'liquid');+ knownKeys(input.liquid, Object.keys(LIQUID_OPTICS), 'liquid');environment.liquid = copiedJson(resolveLiquidOptics(copiedJson(input.liquid)));}updateLightingState(createLightingState(), environment, { world });diff --git a/src/liquid-optics.js b/src/liquid-optics.jsindex a2063826..d9041d94 100644--- a/src/liquid-optics.js+++ b/src/liquid-optics.js@@ -1,6 +1,6 @@// The liquid and foam optics a frame may set. Kept apart from the liquid pass so the recipe look can check them without the pass.// Each entry is [default, minimum, maximum].-const LIQUID_OPTICS = {+export const LIQUID_OPTICS = {thickness: [0.5, 0, 100],ior: [1.33, 1, 3],refraction: [1, 0, 4],@@ -18,7 +18,7 @@ export function resolveLiquidOptics(options = {}) {for (const name in LIQUID_OPTICS) {const [, minimum, maximum] = LIQUID_OPTICS[name];const value = optics[name];- if (typeof value !== 'number' || !Number.isFinite(value) || value < minimum || value > maximum) throw new RangeError(`liquid.${name} must be between ${minimum} and ${maximum}.`);+ if (!Number.isFinite(value) || value < minimum || value > maximum) throw new RangeError(`liquid.${name} must be between ${minimum} and ${maximum}.`);}return optics;}