@zcomponent/core 0.0.22 → 0.0.23

package/lib/animation/clips/clip.d.ts

@@ -8,7 +8,7 @@ export declare class Clip {
     readonly scriptName?: string | undefined;
     readonly id?: string | undefined;
     influencedPathsDirty: Observable<boolean, never>;
-    defaultFadeParameters?: Data.FadeParameters;
+    defaultFadeParameters?: Partial<Data.FadeParameters>;
     private _influencedPaths;
     private _tracksByPath;
     private _tracksByPathDirty;
@@ -21,7 +21,7 @@ export declare class Clip {
     get tracksByPath(): Map<string, Track[]>;
     get influencedPaths(): string[];
     fadePropertiesByPath(props: {
-        [id: string]: Data.FadeParameters;
+        [id: string]: Partial<Data.FadeParameters>;
     }): void;
     resolveClipTime(t: number, t0: number, s0: number, rate: number, t1?: number): number;
     streamPlay(speed?: number): void;

package/lib/animation/clips/clip.js

@@ -76,16 +76,13 @@ export class Clip {
         if (this.defaultFadeParameters) {
             // Replace any existing fade properties with our defaults
             for (const id in props) {
-                props[id] = { ...this.defaultFadeParameters };
+                props[id] = { ...props[id], ...this.defaultFadeParameters };
             }
         }
         for (const track of this._tracks) {
             if (track instanceof PropertyTrack) {
                 if (track.fadeParameters || this.defaultFadeParameters) {
                     const params = {
-                        time: 0,
-                        easing: null,
-                        pin: 0,
                         ...this.defaultFadeParameters,
                         ...track.fadeParameters,
                     };

package/lib/animation/layer.d.ts

@@ -10,6 +10,7 @@ export declare class Layer {
     clips: {
         [id: string]: LayerClip;
     };
+    defaultFadeParameters?: Data.FadeParameters;
     influencedPathsDirty: Observable<boolean, never>;
     private _influencedPaths;
     private _active;
@@ -40,7 +41,7 @@ export interface QueueEntry {
     layerClip: LayerClip | null;
     playOptions?: LayerClipPlayOptions;
     fadeByPath: {
-        [id: string]: Data.FadeParameters;
+        [id: string]: Partial<Data.FadeParameters>;
     };
     fadeTime: number;
     startTime?: number;

package/lib/animation/layer.js

@@ -25,7 +25,7 @@ export class Layer {
                 if (ct >= entry.fadeTime)
                     fadeValue = clipValue;
                 else
-                    fadeValue = computeFade(entry.fadeByPath[p], entry.playOptions?.fade, ct, entry.fadeTime, fadeValue, clipValue);
+                    fadeValue = computeFade(this.defaultFadeParameters, entry.fadeByPath[p], entry.playOptions?.fade, ct, entry.fadeTime, fadeValue, clipValue);
             }
             else {
                 fadeValue = clipValue;
@@ -71,20 +71,15 @@ export class Layer {
         this.influencedPathsDirty.value = true;
     }
     queue(layerClip, playOptions) {
-        const previous = this._queue[this._queue.length - 1];
         const fadeByPath = {};
-        previous?.layerClip?.clip?.fadePropertiesByPath(fadeByPath);
-        for (const [path, params] of Object.entries(fadeByPath)) {
-            fadeByPath[path] = {
-                ...params,
-                reverse: !(params.reverse ?? false),
-            };
-        }
         layerClip?.clip?.fadePropertiesByPath(fadeByPath);
         let fadeTime = playOptions?.fade?.time ?? 0;
         for (const params of Object.values(fadeByPath)) {
-            fadeTime = Math.max(fadeTime, params.time);
+            if (params.time !== undefined)
+                fadeTime = Math.max(fadeTime, params.time);
         }
+        if (this.defaultFadeParameters)
+            fadeTime = Math.max(fadeTime, this.defaultFadeParameters.time);
         const ret = {
             layerClip,
             fadeTime,
@@ -197,11 +192,11 @@ export class Layer {
         return this._influencedPaths;
     }
 }
-function computeFade(params, override, t, fadeTime, before, after) {
+function computeFade(defaults, params, override, t, fadeTime, before, after) {
     // TODO further implementation
-    const paramTime = override?.time ?? params?.time ?? 0;
-    let paramPin = override?.pin ?? params?.pin ?? 0;
-    const reverse = override?.reverse ?? params?.reverse ?? false;
+    const paramTime = override?.time ?? params?.time ?? defaults?.time ?? 0;
+    let paramPin = override?.pin ?? params?.pin ?? defaults?.pin ?? 0;
+    const reverse = override?.reverse ?? params?.reverse ?? defaults?.reverse ?? false;
     if (reverse)
         paramPin = 1 - paramPin;
     const emptyTime = fadeTime - paramTime;
@@ -213,7 +208,7 @@ function computeFade(params, override, t, fadeTime, before, after) {
     let prop = (t - startTime) / paramTime;
     if (reverse)
         prop = 1 - prop;
-    prop = computeEasing(prop, override?.easing ?? params?.easing);
+    prop = computeEasing(prop, override?.easing ?? params?.easing ?? defaults?.easing);
     if (reverse)
         prop = 1 - prop;
     return interpolate(before, after, prop);

package/lib/data/animation.d.ts

@@ -51,7 +51,7 @@ export interface Clip {
     tracks: ByID<Track>;
     length: number;
     lengthType: ClipLengthType;
-    defaultFadeParameters?: FadeParameters;
+    defaultFadeParameters?: Partial<FadeParameters>;
     timeSourceTrack?: string;
     scriptName?: string;
 }
@@ -117,7 +117,7 @@ export interface StreamTrack extends BaseTrack {
     data: ByID<StreamTrackEntity>;
     weight: ByID<Keyframe>;
 }
-export interface StreamTrackEntity {
+export interface StreamTrackEntity extends BaseTrack {
     t0: number;
     t1: number;
     s0: number;

package/lib/data/change.d.ts

@@ -41,3 +41,4 @@ export interface NodeDataCombined extends EntityDataCombined {
 export interface BehaviorDataCombined extends EntityDataCombined {
     data: BehaviorData;
 }
+export declare function getUniqueLabel(zcomp: ZComponentData, label: string): string;

package/lib/data/change.js

@@ -350,6 +350,16 @@ export function deleteEntity(zcomp, id) {
             delete zcomp.entityPropOverrides[overrideID];
         }
     }
+    if (zcomp.animation) {
+        for (const clip of Object.values(zcomp.animation.clips)) {
+            if (!clip)
+                continue;
+            for (const track of Object.values(clip.tracks)) {
+                if (track?.entityID === id)
+                    delete clip.tracks[track.id];
+            }
+        }
+    }
 }
 export function forEachNodeAncestor(zcomp, id, fn) {
     const node = zcomp.nodes[id];
@@ -358,3 +368,14 @@ export function forEachNodeAncestor(zcomp, id, fn) {
     fn(node.parent.id);
     forEachNodeAncestor(zcomp, node.parent.id, fn);
 }
+export function getUniqueLabel(zcomp, label) {
+    const existingLabels = zcomp.entitiesByLabel ?? {};
+    for (let i = 1; i < 10000; i++) {
+        const testName = i === 1 ? label : `${label} ${i.toString()}`;
+        if (!Object.prototype.hasOwnProperty.call(existingLabels, testName)) {
+            label = testName;
+            break;
+        }
+    }
+    return label;
+}

package/lib/inflate.js

@@ -94,6 +94,7 @@ export function createLayerClipFromData(zcomp, layer, data) {
 export function createLayerFromData(zcomp, anim, data) {
     const ret = new Layer(anim, data.scriptName, data.id);
     ret.active = undefined;
+    ret.defaultFadeParameters = data.defaultFadeParameters;
     if (data.defaultClip === null)
         ret.active = null;
     for (const layerClip of Object.values(data.clips)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zcomponent/core",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "description": "",
   "main": "index.js",
   "types": "index.d.ts",