From c1722b1d53db660127f0ec5c24bdd30795c4e134 Mon Sep 17 00:00:00 2001 From: Atul Varma Date: Thu, 30 Dec 2021 16:03:24 -0500 Subject: [PATCH] Rename some things. --- lib/creature-animator.tsx | 16 ++++++++-------- lib/creature-symbol.tsx | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/creature-animator.tsx b/lib/creature-animator.tsx index f1f3534..d552a3b 100644 --- a/lib/creature-animator.tsx +++ b/lib/creature-animator.tsx @@ -7,13 +7,13 @@ import { svgTranslate, } from "./svg-transform"; -type AnimationTransformer = ( +type CreatureAnimate = ( animPct: number, symbol: SvgSymbolData ) => SvgTransform[]; export interface CreatureAnimator { - getSvgTransforms: AnimationTransformer; + animate: CreatureAnimate; getChildAnimator(): CreatureAnimator; } @@ -49,33 +49,33 @@ function pctToNegativeOneToOne(pct: number) { const Y_HOVER_AMPLITUDE = 25.0; -const hoverTransformer: AnimationTransformer = (animPct) => { +const animateHover: CreatureAnimate = (animPct) => { const yHover = pctToNegativeOneToOne(easeInOutQuadPingPong(animPct)) * Y_HOVER_AMPLITUDE; return [svgTranslate({ x: 0, y: yHover })]; }; -const spinTransformer: AnimationTransformer = (animPct, symbol) => { +const animateSpin: CreatureAnimate = (animPct, symbol) => { const origin = getBoundingBoxCenter(symbol.bbox); return [svgTransformOrigin(origin, [svgRotate(animPct * 360)])]; }; export const hoverAnimator: CreatureAnimator = { - getSvgTransforms: hoverTransformer, + animate: animateHover, getChildAnimator: () => hoverAnimator, }; const spinAnimator: CreatureAnimator = { - getSvgTransforms: spinTransformer, + animate: animateSpin, getChildAnimator: () => spinAnimator, }; export const hoverAndSpinAnimator: CreatureAnimator = { - getSvgTransforms: hoverTransformer, + animate: animateHover, getChildAnimator: () => spinAnimator, }; export const nullAnimator: CreatureAnimator = { - getSvgTransforms: () => [], + animate: () => [], getChildAnimator: () => nullAnimator, }; diff --git a/lib/creature-symbol.tsx b/lib/creature-symbol.tsx index 2751329..f595e09 100644 --- a/lib/creature-symbol.tsx +++ b/lib/creature-symbol.tsx @@ -221,7 +221,7 @@ export const CreatureSymbol: React.FC = (props) => { const animator = props.animator ?? nullAnimator; const animPct = props.animPct ?? 0; const svgTransforms = useMemo( - () => animator.getSvgTransforms(animPct, data), + () => animator.animate(animPct, data), [animator, animPct, data] ); const childAnimator = useMemo(() => animator.getChildAnimator(), [animator]);