Merge e6c5fd4fde into 820dc5bf4c

packages-user/client-modules/src/render/components/icons.tsx

@@ -1,6 +1,14 @@
 import { DefaultProps, ElementLocator, GraphicPropsBase } from '@motajs/render';
 import { SetupComponentOptions } from '@motajs/system-ui';
-import { computed, defineComponent, onMounted, Ref, ref, watch } from 'vue';
+import {
+    computed,
+    defineComponent,
+    DefineSetupFnComponent,
+    onMounted,
+    Ref,
+    shallowRef,
+    watch
+} from 'vue';
 
 export interface IconsProps extends DefaultProps<GraphicPropsBase> {
     loc: ElementLocator;
@@ -11,14 +19,53 @@ const iconsProps = {
 } satisfies SetupComponentOptions<IconsProps>;
 
 type PathGenerator = (width: number, height: number) => Path2D;
-/**
+type PadFn = (
- * @param ox 横向偏移坐标
+    divisor: number
- * @param oy 纵向偏移坐标
+) => [left: number, right: number, top: number, bottom: number];
- * @param width 路径宽度
+type IconLoc = [
- * @param height 路径高度
+    x: number,
- */
+    y: number,
-type PathFn = (ox: number, oy: number, width: number, height: number) => Path2D;
+    w: number,
+    h: number,
+    cx: number,
+    cy: number
+];
 
+/**
+ * @param loc 图标位置信息
+ * @param pad 计算图标外围填充
+ */
+type PathFn = (loc: IconLoc, pad: PadFn) => Path2D;
+
+/**
+ * 适配填充
+ * @param x 左上角横坐标
+ * @param y 左上角纵坐标
+ * @param width 矩形宽度
+ * @param height 矩形高度
+ * @param divisor 填充除数，例如左边缘会变成 `x + width / divisor`
+ */
+function pad(
+    x: number,
+    y: number,
+    width: number,
+    height: number,
+    divisor: number
+): [left: number, right: number, top: number, bottom: number] {
+    return [
+        x + width / divisor, // left
+        x + width - width / divisor, // right
+        y + height / divisor, // top
+        y + height - height / divisor // bottom
+    ];
+}
+
+/**
+ * 适配图标路径生成
+ * @param aspect 宽高比
+ * @param ref 路径响应式对象
+ * @param fn 路径定义函数
+ */
 function adjustPath(
     aspect: number,
     ref: Ref<Path2D | undefined>,
@@ -49,19 +96,57 @@ function adjustPath(
             dw = height * aspect;
             ox = (width - dw) / 2;
         }
-        path = fn(ox, oy, dw, dh);
+        const cx = ox + dw / 2;
+        const cy = oy + dh / 2;
+        path = fn([ox, oy, dw, dh, cx, cy], divisor =>
+            pad(ox, oy, dw, dh, divisor)
+        );
         ref.value = path;
         return path;
     };
 }
 
-export const RollbackIcon = defineComponent<IconsProps>(props => {
+/**
-    const path = ref<Path2D>();
+ * 定义一个描边图标
+ * @param aspect 图标的宽高比
+ * @param pathDef 图标的路径定义函数
+ * @param props 图标组件定义的参数配置
+ */
+export function defineIcon<T extends IconsProps>(
+    aspect: number,
+    pathDef: PathFn,
+    props: SetupComponentOptions<T> = iconsProps
+): DefineSetupFnComponent<T> {
+    return defineComponent<T>(props => {
+        const path = shallowRef<Path2D>();
 
         const width = computed(() => props.loc[2] ?? 200);
         const height = computed(() => props.loc[3] ?? 200);
-    const generatePath = adjustPath(1, path, (ox, oy, width, height) => {
+        const generatePath = adjustPath(aspect, path, pathDef);
+
+        watch(props, () => {
+            generatePath(width.value, height.value);
+        });
+
+        onMounted(() => {
+            generatePath(width.value, height.value);
+        });
+
+        return () => (
+            <g-path
+                loc={props.loc}
+                path={path.value}
+                stroke
+                lineJoin="round"
+                lineCap="round"
+            ></g-path>
+        );
+    }, props);
+}
+
+export const RollbackIcon = defineIcon(1, loc => {
     const path = new Path2D();
+    const [ox, oy, width, height] = loc;
     const arc = width / 10;
     const arrow = width / 10;
     const left = ox + width / 10;
@@ -80,36 +165,11 @@ export const RollbackIcon = defineComponent<IconsProps>(props => {
     path.lineTo(end + arrow, top + arrow);
     path.moveTo(left, top);
     return path;
-    });
+});
 
-    watch(props, () => {
+export const RetweetIcon = defineIcon(1, loc => {
-        generatePath(width.value, height.value);
-    });
-
-    onMounted(() => {
-        generatePath(width.value, height.value);
-    });
-
-    return () => {
-        return (
-            <g-path
-                loc={props.loc}
-                path={path.value}
-                stroke
-                lineJoin="round"
-                lineCap="round"
-            ></g-path>
-        );
-    };
-}, iconsProps);
-
-export const RetweetIcon = defineComponent<IconsProps>(props => {
-    const path = ref<Path2D>();
-
-    const width = computed(() => props.loc[2] ?? 200);
-    const height = computed(() => props.loc[3] ?? 200);
-    const generatePath = adjustPath(1, path, (ox, oy, width, height) => {
     const path = new Path2D();
+    const [ox, oy, width, height] = loc;
     const arc = width / 10;
     const arrow = width / 10;
     const left = ox + width / 10;
@@ -128,83 +188,24 @@ export const RetweetIcon = defineComponent<IconsProps>(props => {
     path.lineTo(right - arrow, top + arrow);
     path.moveTo(left, top);
     return path;
-    });
+});
 
-    watch(props, () => {
+export const ViewMapIcon = defineIcon(1, (loc, pad) => {
-        generatePath(width.value, height.value);
-    });
-
-    onMounted(() => {
-        generatePath(width.value, height.value);
-    });
-
-    return () => {
-        return (
-            <g-path
-                loc={props.loc}
-                path={path.value}
-                stroke
-                lineJoin="round"
-                lineCap="round"
-            ></g-path>
-        );
-    };
-}, iconsProps);
-
-export const ViewMapIcon = defineComponent<IconsProps>(props => {
-    const path = ref<Path2D>();
-
-    const width = computed(() => props.loc[2] ?? 200);
-    const height = computed(() => props.loc[3] ?? 200);
-    const generatePath = adjustPath(1, path, (ox, oy, width, height) => {
     const path = new Path2D();
-        const left = ox + width / 5;
+    const [, , , , cx, cy] = loc;
-        const top = oy + height / 5;
+    const [left, right, top, bottom] = pad(5);
-        const right = ox + width - width / 5;
-        const bottom = oy + height - height / 5;
-        const cx = ox + width / 2;
-        const cy = oy + height / 2;
     path.rect(left, top, right - left, bottom - top);
     path.moveTo(cx, top);
     path.lineTo(cx, bottom);
     path.moveTo(left, cy);
     path.lineTo(right, cy);
-
     return path;
-    });
+});
 
-    watch(props, () => {
+export const DanmakuIcon = defineIcon(1, (loc, pad) => {
-        generatePath(width.value, height.value);
-    });
-
-    onMounted(() => {
-        generatePath(width.value, height.value);
-    });
-
-    return () => {
-        return (
-            <g-path
-                loc={props.loc}
-                path={path.value}
-                stroke
-                lineJoin="round"
-                lineCap="round"
-            ></g-path>
-        );
-    };
-}, iconsProps);
-
-export const DanmakuIcon = defineComponent<IconsProps>(props => {
-    const path = ref<Path2D>();
-
-    const width = computed(() => props.loc[2] ?? 200);
-    const height = computed(() => props.loc[3] ?? 200);
-    const generatePath = adjustPath(1, path, (ox, oy, width, height) => {
     const path = new Path2D();
-        const left = ox + width / 5;
+    const [, , width, height, cx, cy] = loc;
-        const bottom = oy + height - height / 5;
+    const [left, , , bottom] = pad(5);
-        const cx = ox + width / 2;
-        const cy = oy + height / 2;
     const rx = width / 3;
     const ry = height / 4;
     const start = (Math.PI * 16) / 18;
@@ -213,42 +214,13 @@ export const DanmakuIcon = defineComponent<IconsProps>(props => {
     path.lineTo(left - width / 24, bottom - height / 36);
     path.closePath();
     return path;
-    });
+});
 
-    watch(props, () => {
+export const ReplayIcon = defineIcon(1, (loc, pad) => {
-        generatePath(width.value, height.value);
-    });
-
-    onMounted(() => {
-        generatePath(width.value, height.value);
-    });
-
-    return () => {
-        return (
-            <g-path
-                loc={props.loc}
-                path={path.value}
-                stroke
-                lineJoin="round"
-                lineCap="round"
-            ></g-path>
-        );
-    };
-}, iconsProps);
-
-export const ReplayIcon = defineComponent<IconsProps>(props => {
-    const path = ref<Path2D>();
-
-    const width = computed(() => props.loc[2] ?? 200);
-    const height = computed(() => props.loc[3] ?? 200);
-    const generatePath = adjustPath(1, path, (ox, oy, width, height) => {
     const path = new Path2D();
+    const [, , width, height, , cy] = loc;
+    const [left, right, top, bottom] = pad(5);
     const arc = width / 10;
-        const left = ox + width / 5;
-        const top = oy + height / 5;
-        const right = ox + width - width / 5;
-        const bottom = oy + height - height / 5;
-        const cy = oy + height / 2;
     path.moveTo(right, cy - height / 8);
     path.lineTo(right, top + arc);
     path.arcTo(right, top, right - arc, top, arc);
@@ -268,162 +240,46 @@ export const ReplayIcon = defineComponent<IconsProps>(props => {
     path.lineTo(right, cy);
     path.lineTo(right + arc, cy + arc);
     return path;
-    });
+});
 
-    watch(props, () => {
+export const NumpadIcon = defineIcon(1, (loc, pad) => {
-        generatePath(width.value, height.value);
-    });
-
-    onMounted(() => {
-        generatePath(width.value, height.value);
-    });
-
-    return () => {
-        return (
-            <g-path
-                loc={props.loc}
-                path={path.value}
-                stroke
-                lineJoin="round"
-                lineCap="round"
-            ></g-path>
-        );
-    };
-}, iconsProps);
-
-export const NumpadIcon = defineComponent<IconsProps>(props => {
-    const path = ref<Path2D>();
-
-    const width = computed(() => props.loc[2] ?? 200);
-    const height = computed(() => props.loc[3] ?? 200);
-    const generatePath = adjustPath(1, path, (ox, oy, width, height) => {
     const path = new Path2D();
-        const left = ox + width / 5;
+    const [, , width, height, cx, cy] = loc;
-        const top = oy + height / 5;
+    const [left, right, top, bottom] = pad(5);
-        const right = ox + width - width / 5;
-        const bottom = oy + height - height / 5;
-        const cx = ox + width / 2;
-        const cy = oy + height / 2;
     path.rect(left, top, right - left, bottom - top);
     const path2 = new Path2D();
     path2.ellipse(cx, cy, width / 9, height / 6, 0, 0, Math.PI * 2);
     path.addPath(path2);
     return path;
-    });
+});
 
-    watch(props, () => {
+export const PlayIcon = defineIcon(1, (loc, pad) => {
-        generatePath(width.value, height.value);
-    });
-
-    onMounted(() => {
-        generatePath(width.value, height.value);
-    });
-
-    return () => {
-        return (
-            <g-path
-                loc={props.loc}
-                path={path.value}
-                stroke
-                lineJoin="round"
-                lineCap="round"
-            ></g-path>
-        );
-    };
-}, iconsProps);
-
-export const PlayIcon = defineComponent<IconsProps>(props => {
-    const path = ref<Path2D>();
-
-    const width = computed(() => props.loc[2] ?? 200);
-    const height = computed(() => props.loc[3] ?? 200);
-    const generatePath = adjustPath(1, path, (ox, oy, width, height) => {
     const path = new Path2D();
-        const left = ox + width / 5;
+    const [, oy, , height] = loc;
-        const top = oy + height / 5;
+    const [left, right, top, bottom] = pad(5);
-        const right = ox + width - width / 5;
-        const bottom = oy + height - height / 5;
     path.moveTo(left, top);
     path.lineTo(right, oy + height / 2);
     path.lineTo(left, bottom);
     path.closePath();
     return path;
-    });
+});
 
-    watch(props, () => {
+export const PauseIcon = defineIcon(1, (loc, pad) => {
-        generatePath(width.value, height.value);
-    });
-
-    onMounted(() => {
-        generatePath(width.value, height.value);
-    });
-
-    return () => {
-        return (
-            <g-path
-                loc={props.loc}
-                path={path.value}
-                fill
-                stroke
-                lineJoin="round"
-                lineCap="round"
-            ></g-path>
-        );
-    };
-}, iconsProps);
-
-export const PauseIcon = defineComponent<IconsProps>(props => {
-    const path = ref<Path2D>();
-
-    const width = computed(() => props.loc[2] ?? 200);
-    const height = computed(() => props.loc[3] ?? 200);
-    const generatePath = adjustPath(1, path, (ox, oy, width, height) => {
     const path = new Path2D();
-        const cx = ox + width / 2;
+    const [, , width, , cx] = loc;
-        const top = oy + height / 5;
+    const [, , top, bottom] = pad(5);
-        const bottom = oy + height - height / 5;
     path.moveTo(cx - width / 5, top);
     path.lineTo(cx - width / 5, bottom);
     path.moveTo(cx + width / 5, top);
     path.lineTo(cx + width / 5, bottom);
     return path;
-    });
+});
 
-    watch(props, () => {
+export const DoubleArrow = defineIcon(1, (loc, pad) => {
-        generatePath(width.value, height.value);
-    });
-
-    onMounted(() => {
-        generatePath(width.value, height.value);
-    });
-
-    return () => {
-        return (
-            <g-path
-                loc={props.loc}
-                path={path.value}
-                stroke
-                lineJoin="round"
-                lineCap="round"
-            ></g-path>
-        );
-    };
-}, iconsProps);
-
-export const DoubleArrow = defineComponent<IconsProps>(props => {
-    const path = ref<Path2D>();
-
-    const width = computed(() => props.loc[2] ?? 200);
-    const height = computed(() => props.loc[3] ?? 200);
-    const generatePath = adjustPath(1, path, (ox, oy, width, height) => {
     const path = new Path2D();
     const path2 = new Path2D();
-        const left = ox + width / 5;
+    const [, , width, height, cx, cy] = loc;
-        const top = oy + height / 5;
+    const [left, right, top, bottom] = pad(5);
-        const right = ox + width - width / 5;
-        const bottom = oy + height - height / 5;
-        const cx = ox + width / 2;
-        const cy = oy + height / 2;
     path.moveTo(left, top + height / 12);
     path.lineTo(cx + width / 8, cy);
     path.lineTo(left, bottom - height / 12);
@@ -434,42 +290,13 @@ export const DoubleArrow = defineComponent<IconsProps>(props => {
     path2.closePath();
     path.addPath(path2);
     return path;
-    });
+});
 
-    watch(props, () => {
+export const StepForward = defineIcon(1, (loc, pad) => {
-        generatePath(width.value, height.value);
-    });
-
-    onMounted(() => {
-        generatePath(width.value, height.value);
-    });
-
-    return () => {
-        return (
-            <g-path
-                loc={props.loc}
-                path={path.value}
-                stroke
-                fill
-                lineJoin="round"
-                lineCap="round"
-            ></g-path>
-        );
-    };
-}, iconsProps);
-
-export const StepForward = defineComponent<IconsProps>(props => {
-    const path = ref<Path2D>();
-
-    const width = computed(() => props.loc[2] ?? 200);
-    const height = computed(() => props.loc[3] ?? 200);
-    const generatePath = adjustPath(1, path, (ox, oy, width, height) => {
     const path = new Path2D();
     const path2 = new Path2D();
-        const left = ox + width / 5;
+    const [, oy, , height] = loc;
-        const top = oy + height / 5;
+    const [left, right, top, bottom] = pad(5);
-        const right = ox + width - width / 5;
-        const bottom = oy + height - height / 5;
     path.moveTo(left, top);
     path.lineTo(right, oy + height / 2);
     path.lineTo(left, bottom);
@@ -478,37 +305,11 @@ export const StepForward = defineComponent<IconsProps>(props => {
     path2.lineTo(right, bottom);
     path.addPath(path2);
     return path;
-    });
+});
 
-    watch(props, () => {
+export const SoundVolume = defineIcon(1, loc => {
-        generatePath(width.value, height.value);
-    });
-
-    onMounted(() => {
-        generatePath(width.value, height.value);
-    });
-
-    return () => {
-        return (
-            <g-path
-                loc={props.loc}
-                path={path.value}
-                stroke
-                fill
-                lineJoin="round"
-                lineCap="round"
-            ></g-path>
-        );
-    };
-}, iconsProps);
-
-export const SoundVolume = defineComponent<IconsProps>(props => {
-    const path = ref<Path2D>();
-
-    const width = computed(() => props.loc[2] ?? 200);
-    const height = computed(() => props.loc[3] ?? 200);
-    const generatePath = adjustPath(1, path, (ox, oy, width, height) => {
     const path = new Path2D();
+    const [ox, oy, width, height, cx, cy] = loc;
     const left = ox + width / 8;
     const top = oy + height / 5;
     const bottom = oy + height - height / 5;
@@ -519,8 +320,6 @@ export const SoundVolume = defineComponent<IconsProps>(props => {
     path.lineTo(width / 2, top);
     path.lineTo(left + width / 6, height / 2 - height / 10);
     path.closePath();
-        const cx = width / 2;
-        const cy = height / 2;
     const start = -Math.PI / 4;
     const end = Math.PI / 4;
     path.moveTo(
@@ -534,40 +333,12 @@ export const SoundVolume = defineComponent<IconsProps>(props => {
     );
     path.arc(cx, cy, width / 3, start, end);
     return path;
-    });
+});
 
-    watch(props, () => {
+export const Fullscreen = defineIcon(1, (loc, pad) => {
-        generatePath(width.value, height.value);
-    });
-
-    onMounted(() => {
-        generatePath(width.value, height.value);
-    });
-
-    return () => {
-        return (
-            <g-path
-                loc={props.loc}
-                path={path.value}
-                stroke
-                lineJoin="round"
-                lineCap="round"
-            ></g-path>
-        );
-    };
-}, iconsProps);
-
-export const Fullscreen = defineComponent<IconsProps>(props => {
-    const path = ref<Path2D>();
-
-    const width = computed(() => props.loc[2] ?? 200);
-    const height = computed(() => props.loc[3] ?? 200);
-    const generatePath = adjustPath(1, path, (ox, oy, width, height) => {
     const path = new Path2D();
-        const left = ox + width / 4;
+    const [, , width, height] = loc;
-        const right = ox + width - width / 4;
+    const [left, right, top, bottom] = pad(4);
-        const top = oy + height / 4;
-        const bottom = oy + height - height / 4;
 
     // 左上
     path.moveTo(left + width / 6, top + height / 6);
@@ -597,40 +368,12 @@ export const Fullscreen = defineComponent<IconsProps>(props => {
     path.lineTo(right, bottom);
     path.lineTo(right - width / 8, bottom);
     return path;
-    });
+});
 
-    watch(props, () => {
+export const ExitFullscreen = defineIcon(1, (loc, pad) => {
-        generatePath(width.value, height.value);
-    });
-
-    onMounted(() => {
-        generatePath(width.value, height.value);
-    });
-
-    return () => {
-        return (
-            <g-path
-                loc={props.loc}
-                path={path.value}
-                stroke
-                lineJoin="round"
-                lineCap="round"
-            ></g-path>
-        );
-    };
-}, iconsProps);
-
-export const ExitFullscreen = defineComponent<IconsProps>(props => {
-    const path = ref<Path2D>();
-
-    const width = computed(() => props.loc[2] ?? 200);
-    const height = computed(() => props.loc[3] ?? 200);
-    const generatePath = adjustPath(1, path, (ox, oy, width, height) => {
     const path = new Path2D();
-        const left = ox + width / 4;
+    const [, , width, height] = loc;
-        const right = ox + width - width / 4;
+    const [left, right, top, bottom] = pad(4);
-        const top = oy + height / 4;
-        const bottom = oy + height - height / 4;
 
     // 左上
     path.moveTo(left + width / 6, top + height / 6);
@@ -660,25 +403,48 @@ export const ExitFullscreen = defineComponent<IconsProps>(props => {
     path.lineTo(right - width / 6, bottom - height / 6);
     path.lineTo(right - width / 6, bottom - height / 24);
     return path;
-    });
+});
 
-    watch(props, () => {
+export const ArrowLeftTailless = defineIcon(1, (loc, pad) => {
-        generatePath(width.value, height.value);
+    const path = new Path2D();
-    });
+    const [, , width] = loc;
+    const [left, right, top, bottom] = pad(4);
 
-    onMounted(() => {
+    path.moveTo(right, top);
-        generatePath(width.value, height.value);
+    path.lineTo(left + width / 4, (top + right) / 2);
-    });
+    path.lineTo(right, bottom);
+    return path;
+});
 
-    return () => {
+export const ArrowRightTailless = defineIcon(1, (loc, pad) => {
-        return (
+    const path = new Path2D();
-            <g-path
+    const [, , width] = loc;
-                loc={props.loc}
+    const [left, right, top, bottom] = pad(4);
-                path={path.value}
+
-                stroke
+    path.moveTo(left, top);
-                lineJoin="round"
+    path.lineTo(right - width / 4, (top + right) / 2);
-                lineCap="round"
+    path.lineTo(left, bottom);
-            ></g-path>
+    return path;
-        );
+});
-    };
+
-}, iconsProps);
+export const ArrowUpTailless = defineIcon(1, (loc, pad) => {
+    const path = new Path2D();
+    const [, , , height] = loc;
+    const [left, right, top, bottom] = pad(4);
+
+    path.moveTo(left, bottom);
+    path.lineTo((left + right) / 2, top + height / 4);
+    path.lineTo(right, bottom);
+    return path;
+});
+
+export const ArrowDownTailless = defineIcon(1, (loc, pad) => {
+    const path = new Path2D();
+    const [, , , height] = loc;
+    const [left, right, top, bottom] = pad(4);
+
+    path.moveTo(left, top);
+    path.lineTo((left + right) / 2, bottom - height / 4);
+    path.lineTo(right, top);
+    return path;
+});

packages-user/client-modules/src/render/ui/title.tsx

@@ -26,6 +26,7 @@ import { ExitFullscreen, Fullscreen, SoundVolume } from '../components';
 import { mainSetting, triggerFullscreen } from '@motajs/legacy-ui';
 import { saveLoad } from './save';
 import { MainSceneUI } from './main';
+import { adjustCover } from '../utils';
 
 const enum TitleButton {
     StartGame,
@@ -59,19 +60,12 @@ export const GameTitle = defineComponent<GameTitleProps>(props => {
     const bg = core.material.images.images['bg.webp'];
 
     //#region 计算背景图
-    const aspect = bg.width / bg.height;
+    const [width, height] = adjustCover(
-    const canvasAspect = MAIN_WIDTH / MAIN_HEIGHT;
+        bg.width,
-    const [width, height] = (() => {
+        bg.height,
-        if (canvasAspect > aspect) {
+        MAIN_WIDTH,
-            const width = MAIN_WIDTH;
+        MAIN_HEIGHT
-            const height = width / aspect;
+    );
-            return [width, height];
-        } else {
-            const height = MAIN_HEIGHT;
-            const width = height * aspect;
-            return [width, height];
-        }
-    })();
 
     //#region 标题设置
 

packages-user/client-modules/src/render/utils/layout.ts

@@ -57,3 +57,30 @@ export function adjustGrid(
         locs
     };
 }
+
+/**
+ * 适配为覆盖模式，类似于 `object-fit: cover`
+ * @param itemWidth 元素宽度
+ * @param itemHeight 元素高度
+ * @param targetWidth 目标宽度
+ * @param targetHeight 目标高度
+ * @returns 适配为覆盖模式后元素的宽高
+ */
+export function adjustCover(
+    itemWidth: number,
+    itemHeight: number,
+    targetWidth: number,
+    targetHeight: number
+): Readonly<LocArr> {
+    const aspect = itemWidth / itemHeight;
+    const canvasAspect = targetWidth / targetHeight;
+    if (canvasAspect > aspect) {
+        const width = targetWidth;
+        const height = width / aspect;
+        return [width, height];
+    } else {
+        const height = targetHeight;
+        const width = height * aspect;
+        return [width, height];
+    }
+}