@visactor/vrender-core 0.23.0-alpha.2 → 1.0.0-alpha.1

package/es/graphic/graphic.d.ts

@@ -3,7 +3,7 @@ import type { Dict, IPointLike, IAABBBounds, IOBBBounds } from '@visactor/vutils
 import { Matrix, Point } from '@visactor/vutils';
 import type { GraphicType, IAnimateConfig, IGraphicAttribute, IGraphic, IGraphicJson, ISetAttributeContext, ITransform, GraphicReleaseStatus } from '../interface/graphic';
 import { Node } from './node-tree';
-import type { IAnimate, IAnimateTarget, IGlyphGraphicAttribute, ILayer, IPickerService, IShadowRoot, IStage, IStep, ISubAnimate, ISymbolClass } from '../interface';
+import type { IAnimate, IAnimateTarget, IGlyphGraphicAttribute, ILayer, IPickerService, IShadowRoot, IStage, IStep, ISymbolClass } from '../interface';
 import { IContainPointMode } from '../common/enums';
 import { CustomSymbolClass } from './builtin-symbol';
 export declare const PURE_STYLE_KEY: string[];
@@ -83,9 +83,6 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     stateProxy?: (stateName: string, targetStates?: string[]) => T;
     animates: Map<string | number, IAnimate>;
     animate?: () => IAnimate;
-    nextAttrs?: T;
-    prevAttrs?: T;
-    finalAttrs?: T;
     pathProxy?: ICustomPath2D;
     attachedThemeGraphic?: IGraphic;
     protected updateAABBBoundsStamp: number;
@@ -97,7 +94,7 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     set3dMode(): void;
     set2dMode(): void;
     getOffsetXY(attr?: ITransform, includeScroll?: boolean): Point;
-    onAnimateBind(animate: IAnimate | ISubAnimate): void;
+    onAnimateBind(animate: IAnimate): void;
     protected tryUpdateAABBBounds(): IAABBBounds;
     protected tryUpdateOBBBounds(): IOBBBounds;
     protected combindShadowAABBBounds(bounds: IAABBBounds): void;
@@ -120,6 +117,7 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     shouldUpdateShape(): boolean;
     clearUpdateShapeTag(): void;
     containsPoint(x: number, y: number, mode: IContainPointMode, picker?: IPickerService): boolean;
+    setAttributesAndPreventAnimate(params: Partial<T>, forceUpdateTag?: boolean, context?: ISetAttributeContext): void;
     setAttributes(params: Partial<T>, forceUpdateTag?: boolean, context?: ISetAttributeContext): void;
     _setAttributes(params: Partial<T>, forceUpdateTag?: boolean, context?: ISetAttributeContext): void;
     setAttribute(key: string, value: any, forceUpdateTag?: boolean, context?: ISetAttributeContext): void;
@@ -170,10 +168,6 @@ export declare abstract class Graphic<T extends Partial<IGraphicAttribute> = Par
     setStageToShadowRoot(stage?: IStage, layer?: ILayer): void;
     onAddStep(step: IStep): void;
     onStop(props?: Partial<T>): void;
-    onStep(subAnimate: ISubAnimate, animate: IAnimate, step: IStep, ratio: number, end: boolean): void;
-    stepInterpolate(subAnimate: ISubAnimate, animate: IAnimate, nextAttributes: Record<string, any>, step: IStep, ratio: number, end: boolean, nextProps: Record<string, any>, lastProps?: Record<string, any>, nextParsedProps?: any, propKeys?: string[]): void;
-    defaultInterpolate(nextStepVal: any, lastStepVal: any, key: string, nextAttributes: Record<string, any>, nextParsedProps: any, ratio: number): boolean;
-    protected _interpolate(key: string, ratio: number, lastStepVal: any, nextStepVal: any, nextAttributes: any): void;
     getDefaultAttribute(name: string): any;
     getComputedAttribute(name: string): any;
     onSetStage(cb: (g: IGraphic, stage: IStage) => void, immediate?: boolean): void;

package/es/graphic/graphic.js

@@ -1,6 +1,6 @@
 import { isArray, max, OBBBounds } from "@visactor/vutils";
 
-import { AABBBounds, Matrix, normalTransform, Point, isNil, has, isString, isValidUrl, isBase64, isObject } from "@visactor/vutils";
+import { AABBBounds, Matrix, normalTransform, Point, isNil, isString, isValidUrl, isBase64, isObject } from "@visactor/vutils";
 
 import { Node } from "./node-tree";
 
@@ -10,8 +10,6 @@ import { DefaultTransform } from "./config";
 
 import { application } from "../application";
 
-import { interpolateColor } from "../color-string/interpolate";
-
 import { CustomPath2D } from "../common/custom-path2d";
 
 import { ResourceLoader } from "../resource-loader/loader";
@@ -259,6 +257,13 @@ export class Graphic extends Node {
             y: y
         });
     }
+    setAttributesAndPreventAnimate(params, forceUpdateTag = !1, context) {
+        this.setAttributes(params, forceUpdateTag, context), this.animates && this.animates.forEach((animate => {
+            Object.keys(params).forEach((key => {
+                animate.preventAttr(key);
+            }));
+        }));
+    }
     setAttributes(params, forceUpdateTag = !1, context) {
         (params = this.onBeforeAttributeUpdate && this.onBeforeAttributeUpdate(params, this.attribute, null, context) || params).background ? this.loadImage(params.background, !0) : params.shadowGraphic && this.setShadowGraphic(params.shadowGraphic), 
         this._setAttributes(params, forceUpdateTag, context);
@@ -429,10 +434,10 @@ export class Graphic extends Node {
                     duration: stateAnimateConfig.duration,
                     easing: stateAnimateConfig.easing
                 }
-            } ]), noAnimateAttrs && this.setAttributes(noAnimateAttrs, !1, {
+            } ]), noAnimateAttrs && this.setAttributesAndPreventAnimate(noAnimateAttrs, !1, {
                 type: AttributeUpdateType.STATE
             });
-        } else this.stopStateAnimates(), this.setAttributes(attrs, !1, {
+        } else this.stopStateAnimates(), this.setAttributesAndPreventAnimate(attrs, !1, {
             type: AttributeUpdateType.STATE
         });
     }
@@ -452,13 +457,9 @@ export class Graphic extends Node {
         }));
     }
     getNormalAttribute(key) {
-        let value = this.attribute[key];
-        return this.animates && this.animates.forEach((animate => {
-            if (animate.stateNames) {
-                const endProps = animate.getEndProps();
-                has(endProps, key) && (value = endProps[key]);
-            }
-        })), value;
+        var _a, _b;
+        const value = this.attribute[key];
+        return this.animates ? null === (_a = this.finalAttribute) || void 0 === _a ? void 0 : _a[key] : null != value ? value : null === (_b = this.finalAttribute) || void 0 === _b ? void 0 : _b[key];
     }
     clearStates(hasAnimation) {
         this.hasState() && this.normalAttrs ? (this.currentStates = [], this.applyStateAttrs(this.normalAttrs, this.currentStates, hasAnimation, !0)) : this.currentStates = [], 
@@ -603,76 +604,6 @@ export class Graphic extends Node {
             type: AttributeUpdateType.ANIMATE_END
         });
     }
-    onStep(subAnimate, animate, step, ratio, end) {
-        const nextAttributes = {};
-        if (step.customAnimate) step.customAnimate.update(end, ratio, nextAttributes); else {
-            const nextProps = step.props, nextParsedProps = step.parsedProps, propKeys = step.propKeys;
-            this.stepInterpolate(subAnimate, animate, nextAttributes, step, ratio, end, nextProps, void 0, nextParsedProps, propKeys);
-        }
-        this.setAttributes(nextAttributes, !1, {
-            type: AttributeUpdateType.ANIMATE_UPDATE,
-            animationState: {
-                ratio: ratio,
-                end: end,
-                step: step,
-                isFirstFrameOfStep: subAnimate.getLastStep() !== step
-            }
-        }), this.stage && this.stage.renderNextFrame();
-    }
-    stepInterpolate(subAnimate, animate, nextAttributes, step, ratio, end, nextProps, lastProps, nextParsedProps, propKeys) {
-        propKeys || (propKeys = Object.keys(nextProps), step.propKeys = propKeys), end ? step.propKeys.forEach((key => {
-            animate.validAttr(key) && (nextAttributes[key] = nextProps[key]);
-        })) : propKeys.forEach((key => {
-            var _a;
-            if (!animate.validAttr(key)) return;
-            const nextStepVal = nextProps[key], lastStepVal = null !== (_a = lastProps && lastProps[key]) && void 0 !== _a ? _a : subAnimate.getLastPropByName(key, step);
-            if (null == nextStepVal || null == lastStepVal || nextStepVal === lastStepVal) return void (nextAttributes[key] = nextStepVal);
-            let match;
-            match = animate.interpolateFunc && animate.interpolateFunc(key, ratio, lastStepVal, nextStepVal, nextAttributes), 
-            match || (match = animate.customInterpolate(key, ratio, lastStepVal, nextStepVal, this, nextAttributes), 
-            match || this.defaultInterpolate(nextStepVal, lastStepVal, key, nextAttributes, nextParsedProps, ratio) || this._interpolate(key, ratio, lastStepVal, nextStepVal, nextAttributes));
-        })), step.parsedProps = nextParsedProps;
-    }
-    defaultInterpolate(nextStepVal, lastStepVal, key, nextAttributes, nextParsedProps, ratio) {
-        if (Number.isFinite(nextStepVal) && Number.isFinite(lastStepVal)) return nextAttributes[key] = lastStepVal + (nextStepVal - lastStepVal) * ratio, 
-        !0;
-        if ("fill" === key) {
-            nextParsedProps || (nextParsedProps = {});
-            const fillColorArray = nextParsedProps.fillColorArray, color = interpolateColor(lastStepVal, null != fillColorArray ? fillColorArray : nextStepVal, ratio, !1, ((fArray, tArray) => {
-                nextParsedProps.fillColorArray = tArray;
-            }));
-            return color && (nextAttributes[key] = color), !0;
-        }
-        if ("stroke" === key) {
-            nextParsedProps || (nextParsedProps = {});
-            const strokeColorArray = nextParsedProps.strokeColorArray, color = interpolateColor(lastStepVal, null != strokeColorArray ? strokeColorArray : nextStepVal, ratio, !1, ((fArray, tArray) => {
-                nextParsedProps.strokeColorArray = tArray;
-            }));
-            return color && (nextAttributes[key] = color), !0;
-        }
-        if ("shadowColor" === key) {
-            nextParsedProps || (nextParsedProps = {});
-            const shadowColorArray = nextParsedProps.shadowColorArray, color = interpolateColor(lastStepVal, null != shadowColorArray ? shadowColorArray : nextStepVal, ratio, !0, ((fArray, tArray) => {
-                nextParsedProps.shadowColorArray = tArray;
-            }));
-            return color && (nextAttributes[key] = color), !0;
-        }
-        if (Array.isArray(nextStepVal) && nextStepVal.length === lastStepVal.length) {
-            const nextList = [];
-            let valid = !0;
-            for (let i = 0; i < nextStepVal.length; i++) {
-                const v = lastStepVal[i], val = v + (nextStepVal[i] - v) * ratio;
-                if (!Number.isFinite(val)) {
-                    valid = !1;
-                    break;
-                }
-                nextList.push(val);
-            }
-            valid && (nextAttributes[key] = nextList);
-        }
-        return !1;
-    }
-    _interpolate(key, ratio, lastStepVal, nextStepVal, nextAttributes) {}
     getDefaultAttribute(name) {
         return this.getGraphicTheme()[name];
     }