@galacean/effects-specification 2.6.0 → 2.7.0-alpha.0

package/es/assets.d.ts

@@ -80,10 +80,7 @@ export interface TemplateImage extends Image {
  */
 export interface CompressedImage extends Image {
     /**
-     * 压缩贴图地址
+     * KTX2 地址
      */
-    compressed: {
-        astc?: string;
-        pvrtc?: string;
-    };
+    ktx2?: string;
 }

package/es/index.d.ts

@@ -41,4 +41,4 @@ export * from './material-data';
 export * from './geometry-data';
 export * from './shader-data';
 export * from './effects-package-data';
-export declare const LATEST_VERSION = JSONSceneVersion['3_5'];
+export declare const LATEST_VERSION = JSONSceneVersion['3_6'];

package/es/item/rich-text-item.d.ts

@@ -2,6 +2,7 @@ import type { BaseItem, EndBehavior, MaskOptions } from './base-item';
 import type { ItemType } from '../type';
 import type { BaseTextContentOptions, TextComponentData, TextContent } from './text-item';
 import type { vec2 } from '../number-expression';
+import type { TextSizeMode } from '../text';
 /**
  * 富文本元素
  */
@@ -24,6 +25,25 @@ export interface RichTextContentOptions extends BaseTextContentOptions {
      * 富文本元素大小
      */
     size?: vec2;
+    /**
+     * 文本框宽度，用来排版和控制文本溢出行为
+     */
+    maxTextWidth?: number;
+    /**
+     * 文本框高度，用来排版和控制文本溢出行为
+     * @default undefined
+     */
+    maxTextHeight?: number;
+    /**
+     * 是否开启自动换行
+     * @default false
+     */
+    wrapEnabled?: boolean;
+    /**
+     * 尺寸模式
+     * @default TextSizeMode.autoWidth
+     */
+    sizeMode?: TextSizeMode;
 }
 /**
  * 富文本元素渲染属性

package/es/item/text-item.d.ts

@@ -1,7 +1,7 @@
 import type { BaseItem, EndBehavior, MaskOptions } from './base-item';
 import type { SizeOverLifetime, RotationOverLifetime, PositionOverLifetime, ColorOverLifetime, ItemType, TextureSheetAnimation, RendererOptions, InteractBehavior } from '../type';
 import type { RGBAColorValue } from '../number-expression';
-import type { FontStyle, TextAlignment, TextBaseline, TextOverflow, TextWeight, TextSizeMode } from '../text';
+import type { FontStyle, TextAlignment, TextBaseline, TextOverflow, TextWeight, TextVerticalAlign } from '../text';
 import type { ComponentData } from '../components';
 /**
  * 文本元素
@@ -23,11 +23,6 @@ export interface TextContentOptions extends BaseTextContentOptions {
      * @default 31
      */
     textWidth?: number;
-    /**
-     * 文本行高
-     * @default 31
-     */
-    lineHeight?: number;
     /**
      * 文本高度
      * @default 31
@@ -39,25 +34,10 @@ export interface TextContentOptions extends BaseTextContentOptions {
      */
     autoWidth?: boolean;
     /**
-     * 尺寸模式
-     * @default TextSizeMode.autoWidth
-     */
-    sizeMode?: TextSizeMode;
-    /**
-     * 文本框宽度，用来排版和控制文本溢出行为
-     * @default undefined
-     */
-    maxTextWidth?: number;
-    /**
-     * 文本框高度，用来排版和控制文本溢出行为
-     * @default undefined
-     */
-    maxTextHeight?: number;
-    /**
-     * 是否开启自动换行
+     * 自适应宽高开关（和文本固定高度冲突）
      * @default false
      */
-    wrapEnabled?: boolean;
+    autoHeight?: boolean;
 }
 export interface BaseTextContentOptions {
     /**
@@ -70,6 +50,11 @@ export interface BaseTextContentOptions {
      * @default 0.571
      */
     lineGap?: number;
+    /**
+     * 文本行高
+     * @default 31
+     */
+    lineHeight?: number;
     /**
      * 文本内容
      */
@@ -94,6 +79,11 @@ export interface BaseTextContentOptions {
      * @default TextBaseline.middle
      */
     textBaseline?: TextBaseline;
+    /**
+     * 垂直对齐方式
+     * @default TextVerticalAlign.middle
+     */
+    textVerticalAlign?: TextVerticalAlign;
     /**
      * 左右对齐方式
      * @default TextAlignment.left

package/es/scene.d.ts

@@ -34,7 +34,8 @@ export declare enum JSONSceneVersion {
     '3_3' = "3.3",// 指向型蒙版、图片/文字蒙版
     '3_4' = "3.4",// 动画状态机
     '3_5' = "3.5",// 网格形状变化动画、矢量图形填充/描边渐变色
-    'LATEST' = "3.5"
+    '3_6' = "3.6",// KTX2 纹理支持、文本增强
+    'LATEST' = "3.6"
 }
 /**
  * runtime 2.0 之前的场景信息

package/es/scene.js

@@ -20,5 +20,6 @@ export var JSONSceneVersion;
     JSONSceneVersion["3_3"] = "3.3";
     JSONSceneVersion["3_4"] = "3.4";
     JSONSceneVersion["3_5"] = "3.5";
-    JSONSceneVersion["LATEST"] = "3.5";
+    JSONSceneVersion["3_6"] = "3.6";
+    JSONSceneVersion["LATEST"] = "3.6";
 })(JSONSceneVersion || (JSONSceneVersion = {}));

package/es/text.d.ts

@@ -113,6 +113,20 @@ export declare enum TextAlignment {
      */
     right = 2
 }
+export declare enum TextVerticalAlign {
+    /**
+     * 文本顶对齐。
+     */
+    top = 0,
+    /**
+     * 文本垂直居中对齐。
+     */
+    middle = 1,
+    /**
+     * 文本底对齐。
+     */
+    bottom = 2
+}
 /**
  * 文本字重
  */

package/es/text.js

@@ -65,6 +65,21 @@ export var TextAlignment;
      */
     TextAlignment[TextAlignment["right"] = 2] = "right";
 })(TextAlignment || (TextAlignment = {}));
+export var TextVerticalAlign;
+(function (TextVerticalAlign) {
+    /**
+     * 文本顶对齐。
+     */
+    TextVerticalAlign[TextVerticalAlign["top"] = 0] = "top";
+    /**
+     * 文本垂直居中对齐。
+     */
+    TextVerticalAlign[TextVerticalAlign["middle"] = 1] = "middle";
+    /**
+     * 文本底对齐。
+     */
+    TextVerticalAlign[TextVerticalAlign["bottom"] = 2] = "bottom";
+})(TextVerticalAlign || (TextVerticalAlign = {}));
 /**
  * 文本字重
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-specification",
-  "version": "2.6.0",
+  "version": "2.7.0-alpha.0",
   "description": "Galacean Effects JSON Specification",
   "module": "./es/index.js",
   "main": "./es/index.js",
@@ -15,6 +15,17 @@
       "types": "./es/index.d.ts"
     }
   },
+  "scripts": {
+    "prebuild": "pnpm clean",
+    "build": "pnpm build:lib",
+    "build:lib": "tsc -b tsconfig.build.json",
+    "lint": "eslint src --ext .ts,.mjs",
+    "lint:fix": "eslint src --fix --quiet --ext .ts,.mjs",
+    "check:ts": "tsc -b tsconfig.check.json",
+    "clean": "rimraf es/**",
+    "prepare": "husky install",
+    "prepublishOnly": "npm run build"
+  },
   "browserslist": [
     "iOS 9"
   ],
@@ -37,14 +48,5 @@
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
-  },
-  "scripts": {
-    "prebuild": "pnpm clean",
-    "build": "pnpm build:lib",
-    "build:lib": "tsc -b tsconfig.build.json",
-    "lint": "eslint src --ext .ts,.mjs",
-    "lint:fix": "eslint src --fix --quiet --ext .ts,.mjs",
-    "check:ts": "tsc -b tsconfig.check.json",
-    "clean": "rimraf es/**"
   }
-}
+}