@multiplekex/shallot 0.2.4 → 0.3.0

package/src/standard/render/surface/structs.ts

@@ -28,6 +28,15 @@ struct Scene {
     reflectionDepth: u32,
     refractionDepth: u32,
     instanceCount: u32,
+    time: f32,
+    _pad0: f32,
+    _pad1: f32,
+    _pad2: f32,
+    frustumPlanes: array<vec4<f32>, 6>,
+}`;
+
+export const SKY_STRUCT_WGSL = /* wgsl */ `
+struct Sky {
     hazeDensity: f32,
     _pad2: f32,
     _pad3: f32,
@@ -35,7 +44,6 @@ struct Scene {
     hazeColor: vec4<f32>,
     skyZenith: vec4<f32>,
     skyHorizon: vec4<f32>,
-    frustumPlanes: array<vec4<f32>, 6>,
     moonParams: vec4<f32>,
     moonDirection: vec4<f32>,
     starParams: vec4<f32>,
@@ -56,6 +64,16 @@ struct Data {
     _pad2: u32,
 }`;
 
+export const SHADOW_STRUCT_WGSL = /* wgsl */ `
+struct Shadow {
+    cascade0ViewProj: mat4x4<f32>,
+    cascade1ViewProj: mat4x4<f32>,
+    cascade2ViewProj: mat4x4<f32>,
+    cascade3ViewProj: mat4x4<f32>,
+    cascadeSplits: vec4<f32>,
+    cascadeTexelSizes: vec4<f32>,
+}`;
+
 export const WGSL_STRUCTS = /* wgsl */ `
 struct VertexInput {
     @location(0) position: vec3<f32>,
@@ -80,12 +98,11 @@ struct FragmentOutput {
 
 ${SCENE_STRUCT_WGSL}
 
+${DATA_STRUCT_WGSL}
+
 @group(0) @binding(0) var<uniform> scene: Scene;
 @group(0) @binding(1) var<storage, read> entityIds: array<u32>;
 @group(0) @binding(2) var<storage, read> matrices: array<mat4x4<f32>>;
-@group(0) @binding(3) var<storage, read> colors: array<vec4<f32>>;
-@group(0) @binding(4) var<storage, read> sizes: array<vec4<f32>>;
-@group(0) @binding(5) var<storage, read> pbr: array<vec4<f32>>;
-@group(0) @binding(6) var<storage, read> emission: array<vec4<f32>>;
-@group(0) @binding(7) var<storage, read> shapes: array<u32>;
+@group(0) @binding(3) var<storage, read> sizes: array<vec4<f32>>;
+@group(0) @binding(4) var<storage, read> data: array<Data>;
 `;

package/src/standard/tween/tween.ts

@@ -1,12 +1,4 @@
-import {
-    defineRelation,
-    registerPostLoadHook,
-    toCamelCase,
-    type State,
-    type System,
-    type Plugin,
-    type PostLoadContext,
-} from "../../core";
+import { defineRelation, toCamelCase, type State, type System, type Plugin } from "../../core";
 import {
     setTraits,
     getRegisteredComponent,
@@ -63,23 +55,17 @@ function bindFieldAccessor(
     return accessor;
 }
 
-function getFieldAccessor(bindingId: number): FieldAccessor | undefined {
-    return fieldAccessors.get(bindingId);
-}
+function getOrBindAccessor(tweenEid: number): FieldAccessor | undefined {
+    const existing = fieldAccessors.get(tweenEid);
+    if (existing) return existing;
 
-function parseTweenAttrs(attrs: Record<string, string>): Record<string, string> {
-    if (attrs._value) {
-        const parsed: Record<string, string> = {};
-        for (const part of attrs._value.split(";")) {
-            const colonIdx = part.indexOf(":");
-            if (colonIdx === -1) continue;
-            const key = part.slice(0, colonIdx).trim();
-            const value = part.slice(colonIdx + 1).trim();
-            if (key && value) parsed[key] = value;
-        }
-        return parsed;
-    }
-    return attrs;
+    const path = Tween.field[tweenEid];
+    if (!path) return undefined;
+
+    const parsed = resolveFieldPath(path);
+    if (!parsed) return undefined;
+
+    return bindFieldAccessor(tweenEid, parsed.component, parsed.field) ?? undefined;
 }
 
 export const TweenState = {
@@ -88,6 +74,29 @@ export const TweenState = {
     COMPLETE: 2,
 } as const;
 
+const fieldPaths = new Map<number, string>();
+
+function fieldProxy(): Record<number, string | undefined> {
+    return new Proxy({} as Record<number, string | undefined>, {
+        get(_, prop) {
+            const eid = Number(prop);
+            if (Number.isNaN(eid)) return undefined;
+            return fieldPaths.get(eid);
+        },
+        set(_, prop, value) {
+            const eid = Number(prop);
+            if (Number.isNaN(eid)) return false;
+            if (value === undefined || value === null) {
+                fieldPaths.delete(eid);
+            } else {
+                fieldPaths.set(eid, value as string);
+            }
+            fieldAccessors.delete(eid);
+            return true;
+        },
+    });
+}
+
 export const Tween = {
     state: [] as number[],
     from: [] as number[],
@@ -95,7 +104,8 @@ export const Tween = {
     duration: [] as number[],
     elapsed: [] as number[],
     delay: [] as number[],
-    easingIndex: [] as number[],
+    easing: [] as number[],
+    field: fieldProxy(),
 };
 
 setTraits(Tween, {
@@ -106,96 +116,18 @@ setTraits(Tween, {
         duration: 1,
         elapsed: 0,
         delay: 0,
-        easingIndex: 0,
+        easing: 0,
     }),
-    adapter: (attrs: Record<string, string>, eid: number) => {
-        const parsed = parseTweenAttrs(attrs);
-        const result: Record<string, number> = {};
-
-        if (parsed.duration) result.duration = parseFloat(parsed.duration);
-        if (parsed.delay) result.delay = parseFloat(parsed.delay);
-        if (parsed.easing) result.easingIndex = getEasingIndex(parsed.easing);
-
-        if (parsed.target) {
-            setupTweenFromXml(parsed, eid);
-        }
-
-        return result;
-    },
+    parse: { easing: getEasingIndex },
 });
 
-export const TweenTarget = defineRelation("tween-target", {
+export const TweenTarget = defineRelation("target", {
     exclusive: true,
 });
 
-interface ParsedTargetPath {
-    readonly entity: string;
-    readonly component: string;
-    readonly field: string;
-}
-
-function parseTargetPath(path: string): ParsedTargetPath | null {
-    if (!path.startsWith("@")) return null;
-
-    const rest = path.slice(1);
-    const firstDot = rest.indexOf(".");
-    if (firstDot === -1) return null;
-
-    const entity = rest.slice(0, firstDot);
-    const fieldPath = rest.slice(firstDot + 1);
-    const dotIndex = fieldPath.lastIndexOf(".");
-    if (dotIndex === -1) return null;
-
-    return {
-        entity,
-        component: fieldPath.slice(0, dotIndex),
-        field: fieldPath.slice(dotIndex + 1),
-    };
-}
-
-interface PendingTween {
-    readonly tweenEid: number;
-    readonly target: string;
-    readonly to: string;
-}
-
-let pendingXmlTweens: PendingTween[] = [];
-
-function setupTweenFromXml(attrs: Record<string, string>, tweenEid: number): void {
-    pendingXmlTweens.push({
-        tweenEid,
-        target: attrs.target,
-        to: attrs.to,
-    });
-}
-
-export function finalizePendingTweens(state: State, context: PostLoadContext): void {
-    for (const pending of pendingXmlTweens) {
-        const parsed = parseTargetPath(pending.target);
-        if (!parsed) continue;
-
-        const targetEid = context.getEntityByName(parsed.entity);
-        if (targetEid === null) continue;
-
-        const binding = bindFieldAccessor(pending.tweenEid, parsed.component, parsed.field);
-        if (!binding) continue;
-
-        state.addRelation(pending.tweenEid, TweenTarget, targetEid);
-        const toValue =
-            pending.to.startsWith("0x") || pending.to.startsWith("0X")
-                ? parseInt(pending.to, 16)
-                : parseFloat(pending.to);
-        if (!Number.isFinite(toValue)) {
-            throw new Error(`Tween has invalid 'to' value: "${pending.to}" (parsed as ${toValue})`);
-        }
-        Tween.to[pending.tweenEid] = toValue;
-    }
-    pendingXmlTweens = [];
-}
-
 export function captureFromValue(state: State, tweenEid: number): void {
     const targetEid = state.getFirstRelationTarget(tweenEid, TweenTarget);
-    const binding = getFieldAccessor(tweenEid);
+    const binding = getOrBindAccessor(tweenEid);
 
     if (binding && targetEid >= 0) {
         Tween.from[tweenEid] = binding.get(targetEid) ?? 0;
@@ -209,7 +141,7 @@ export function ensureResolved(state: State, tweenEid: number): void {
     if (duration > 0 && elapsed >= duration) return;
 
     const targetEid = state.getFirstRelationTarget(tweenEid, TweenTarget);
-    const binding = getFieldAccessor(tweenEid);
+    const binding = getOrBindAccessor(tweenEid);
 
     if (binding && targetEid >= 0) {
         const toValue = Tween.to[tweenEid];
@@ -235,7 +167,7 @@ function updateTweens(state: State, dt: number): void {
         if (tweenState !== TweenState.PLAYING) continue;
 
         const targetEid = state.getFirstRelationTarget(tweenEid, TweenTarget);
-        const binding = getFieldAccessor(tweenEid);
+        const binding = getOrBindAccessor(tweenEid);
 
         if (Tween.elapsed[tweenEid] === 0 && binding && targetEid >= 0) {
             Tween.from[tweenEid] = binding.get(targetEid) ?? 0;
@@ -253,7 +185,7 @@ function updateTweens(state: State, dt: number): void {
             );
         }
 
-        const easingFn = getEasing(Tween.easingIndex[tweenEid]);
+        const easingFn = getEasing(Tween.easing[tweenEid]);
         const easedProgress = easingFn(rawProgress);
 
         const from = Tween.from[tweenEid];
@@ -305,7 +237,7 @@ export function createTween(
     Tween.to[tweenEid] = options.to;
     Tween.duration[tweenEid] = options.duration ?? 1;
     Tween.elapsed[tweenEid] = 0;
-    Tween.easingIndex[tweenEid] = getEasingIndex(options.easing ?? "linear");
+    Tween.easing[tweenEid] = getEasingIndex(options.easing ?? "linear");
 
     return tweenEid;
 }
@@ -327,7 +259,4 @@ export const TweenPlugin: Plugin = {
     systems: [TweenSystem],
     components: { Tween, Sequence, Pause },
     relations: [TweenTarget],
-    initialize() {
-        registerPostLoadHook(finalizePendingTweens);
-    },
 };