@galacean/effects-specification 2.0.0-alpha.9 → 2.0.0

package/README.md

@@ -8,15 +8,7 @@
 
 ``` bash
 # 1. Install dependencies (first time)
-npm install
+pnpm install
 # 2. Build
-npm run build
+pnpm run build
 ```
-
-## Testing
-
-``` bash
-npm run test
-```
-
-> Open browser and open: http://localhost:9003/test/

package/es/animation-clip-data.d.ts

@@ -0,0 +1,26 @@
+import type { EffectsObjectData } from './components';
+import type { FixedNumberExpression, FixedVec3Expression, FixedQuatExpression } from './number-expression';
+export interface AnimationClipData extends EffectsObjectData {
+    positionCurves: PositionCurveData[];
+    rotationCurves: RotationCurveData[];
+    scaleCurves: ScaleCurveData[];
+    floatCurves: FloatCurveData[];
+}
+export interface PositionCurveData {
+    path: string;
+    keyFrames: FixedVec3Expression;
+}
+export interface RotationCurveData {
+    path: string;
+    keyFrames: FixedQuatExpression;
+}
+export interface ScaleCurveData {
+    path: string;
+    keyFrames: FixedVec3Expression;
+}
+export interface FloatCurveData {
+    path: string;
+    property: string;
+    className: string;
+    keyFrames: FixedNumberExpression;
+}

package/es/animation-clip-data.js

@@ -0,0 +1 @@
+export {};

package/{dist/src → es}/binary.d.ts

@@ -1,3 +1,4 @@
+import type { DataType, EffectsObjectData } from './components';
 import type { RenderLevel } from './type';
 import type { ValueType } from './number-expression';
 /**
@@ -19,12 +20,13 @@ import type { ValueType } from './number-expression';
  */
 export type BinaryPointerContent = [index: number, start?: number, byteLength?: number, type?: BinaryType];
 export type BinaryPointer = [ValueType.BINARY, BinaryPointerContent];
-export type BinaryType = 'u8' | 'i8' | 'i16' | 'u16' | 'f32' | 'u32' | 'i32' | 'f64' | string;
+export type BinaryType = 'u8' | 'i8' | 'i16' | 'u16' | 'f32' | 'u32' | 'i32' | 'f64' | '';
 /**
  * 线上二进制地址
  */
-export interface BinaryFile {
+export interface BinaryFile extends EffectsObjectData {
     url: string;
+    dataType: DataType.BinaryAsset;
     renderLevel?: RenderLevel;
 }
 export type BinaryEnv = 'studio' | 'runtime' | 'json';

package/es/binary.js

@@ -0,0 +1 @@
+export {};

package/es/buitin-object-guid.d.ts

@@ -0,0 +1,5 @@
+export declare const BuiltinObjectGUID: {
+    WhiteTexture: string;
+    PBRShader: string;
+    UnlitShader: string;
+};

package/es/buitin-object-guid.js

@@ -0,0 +1,5 @@
+export const BuiltinObjectGUID = {
+    WhiteTexture: 'whitetexture00000000000000000000',
+    PBRShader: 'pbr00000000000000000000000000000',
+    UnlitShader: 'unlit000000000000000000000000000',
+};

package/{dist/src → es}/components.d.ts

@@ -10,13 +10,29 @@ export declare enum DataType {
     CameraController = "CameraController",
     Geometry = "Geometry",
     Texture = "Texture",
+    AnimationClip = "AnimationClip",
     TextComponent = "TextComponent",
+    BinaryAsset = "BinaryAsset",
+    TrackAsset = "TrackAsset",
+    TimelineAsset = "TimelineAsset",
+    ObjectBindingTrack = "ObjectBindingTrack",
+    TransformTrack = "TransformTrack",
+    SpriteColorTrack = "SpriteColorTrack",
+    ActivationTrack = "ActivationTrack",
+    SubCompositionTrack = "SubCompositionTrack",
+    TransformPlayableAsset = "TransformPlayableAsset",
+    SpriteColorPlayableAsset = "SpriteColorPlayableAsset",
+    ActivationPlayableAsset = "ActivationPlayableAsset",
+    SubCompositionPlayableAsset = "SubCompositionPlayableAsset",
     MeshComponent = "MeshComponent",
     SkyboxComponent = "SkyboxComponent",
     LightComponent = "LightComponent",
     CameraComponent = "CameraComponent",
     ModelPluginComponent = "ModelPluginComponent",
-    TreeComponent = "TreeComponent"
+    TreeComponent = "TreeComponent",
+    AnimationComponent = "AnimationComponent",
+    SpineComponent = "SpineComponent",
+    TimelineClip = "TimelineClip"
 }
 export interface DataPath {
     id: string;
@@ -61,8 +77,9 @@ export interface MaterialData extends EffectsObjectData {
 }
 export interface GeometryData extends EffectsObjectData {
     vertexData: VertexData;
-    indexFormat: number;
+    indexFormat: IndexFormatType;
     indexOffset: number;
+    subMeshes: SubMesh[];
     /**
      * 模型绘制模式，默认为 GeometryType.TRIANGLES（三角形）
      * @default GeometryType.TRIANGLES
@@ -71,7 +88,22 @@ export interface GeometryData extends EffectsObjectData {
     /**
      * 存放 position, uv, normal, indices 的打包数据
      */
-    buffer: string;
+    buffer?: string;
+    /**
+     * 存放 position, uv, normal, indices 的二进制数据，用于序列化二进制数据
+     */
+    binaryData?: Uint8Array;
+    /**
+     * 所有的骨骼名称
+     */
+    boneNames?: string[];
+    rootBoneName?: string;
+    inverseBindMatrices?: number[];
+}
+export interface SubMesh {
+    offset: number;
+    indexCount?: number;
+    vertexCount: number;
 }
 export declare enum GeometryType {
     /**
@@ -107,10 +139,54 @@ export interface VertexData {
     vertexCount: number;
     channels: VertexChannel[];
 }
+export declare enum VertexFormatType {
+    Float16 = 0,
+    Float32 = 1,
+    Int8 = 2,
+    Int16 = 3,
+    Int32 = 4,
+    UInt8 = 5,
+    UInt16 = 6,
+    UInt32 = 7
+}
+export declare enum IndexFormatType {
+    None = -1,
+    UInt8 = 0,
+    UInt16 = 1,
+    UInt32 = 2
+}
 export interface VertexChannel {
+    semantic: string;
     offset: number;
-    format: number;
+    format: VertexFormatType;
     dimension: number;
+    normalize?: boolean;
+}
+export declare enum VertexBufferSemantic {
+    Position = "POSITION",
+    Uv = "TEXCOORD0",
+    Uv2 = "TEXCOORD1",
+    Normal = "NORMAL",
+    Tangent = "TANGENT",
+    Color = "COLOR",
+    Joints = "JOINTS",
+    Weights = "WEIGHTS",
+    PositionBS0 = "POSITION_BS0",
+    PositionBS1 = "POSITION_BS1",
+    PositionBS2 = "POSITION_BS2",
+    PositionBS3 = "POSITION_BS3",
+    PositionBS4 = "POSITION_BS4",
+    PositionBS5 = "POSITION_BS5",
+    PositionBS6 = "POSITION_BS6",
+    PositionBS7 = "POSITION_BS7",
+    NormalBS0 = "NORMAL_BS0",
+    NormalBS1 = "NORMAL_BS1",
+    NormalBS2 = "NORMAL_BS2",
+    NormalBS3 = "NORMAL_BS3",
+    TangentBS0 = "TANGENT_BS0",
+    TangentBS1 = "TANGENT_BS1",
+    TangentBS2 = "TANGENT_BS2",
+    TangentBS3 = "TANGENT_BS3"
 }
 export interface ShaderData extends EffectsObjectData {
     vertex: string;

package/es/components.js

@@ -0,0 +1,129 @@
+export var DataType;
+(function (DataType) {
+    DataType["VFXItemData"] = "VFXItemData";
+    DataType["EffectComponent"] = "EffectComponent";
+    DataType["Material"] = "Material";
+    DataType["Shader"] = "Shader";
+    DataType["SpriteComponent"] = "SpriteComponent";
+    DataType["ParticleSystem"] = "ParticleSystem";
+    DataType["InteractComponent"] = "InteractComponent";
+    DataType["CameraController"] = "CameraController";
+    DataType["Geometry"] = "Geometry";
+    DataType["Texture"] = "Texture";
+    DataType["AnimationClip"] = "AnimationClip";
+    DataType["TextComponent"] = "TextComponent";
+    DataType["BinaryAsset"] = "BinaryAsset";
+    // Timeline
+    DataType["TrackAsset"] = "TrackAsset";
+    DataType["TimelineAsset"] = "TimelineAsset";
+    DataType["ObjectBindingTrack"] = "ObjectBindingTrack";
+    DataType["TransformTrack"] = "TransformTrack";
+    DataType["SpriteColorTrack"] = "SpriteColorTrack";
+    DataType["ActivationTrack"] = "ActivationTrack";
+    DataType["SubCompositionTrack"] = "SubCompositionTrack";
+    DataType["TransformPlayableAsset"] = "TransformPlayableAsset";
+    DataType["SpriteColorPlayableAsset"] = "SpriteColorPlayableAsset";
+    DataType["ActivationPlayableAsset"] = "ActivationPlayableAsset";
+    DataType["SubCompositionPlayableAsset"] = "SubCompositionPlayableAsset";
+    // FIXME: 先完成ECS的场景转换，后面移到spec中
+    DataType["MeshComponent"] = "MeshComponent";
+    DataType["SkyboxComponent"] = "SkyboxComponent";
+    DataType["LightComponent"] = "LightComponent";
+    DataType["CameraComponent"] = "CameraComponent";
+    DataType["ModelPluginComponent"] = "ModelPluginComponent";
+    DataType["TreeComponent"] = "TreeComponent";
+    DataType["AnimationComponent"] = "AnimationComponent";
+    DataType["SpineComponent"] = "SpineComponent";
+    // Non-EffectObject
+    DataType["TimelineClip"] = "TimelineClip";
+})(DataType || (DataType = {}));
+export var GeometryType;
+(function (GeometryType) {
+    /**
+     * Draw single points.
+     */
+    GeometryType[GeometryType["POINTS"] = 0] = "POINTS";
+    /**
+     * Draw lines. Each vertex connects to the one after it.
+     */
+    GeometryType[GeometryType["LINES"] = 1] = "LINES";
+    /**
+     * Draw lines. Each set of two vertices is treated as a separate line segment.
+     */
+    GeometryType[GeometryType["LINE_LOOP"] = 2] = "LINE_LOOP";
+    /**
+     * Draw a connected group of line segments from the first vertex to the last.
+     */
+    GeometryType[GeometryType["LINE_STRIP"] = 3] = "LINE_STRIP";
+    /**
+     * Draw triangles. Each set of three vertices creates a separate triangle.
+     */
+    GeometryType[GeometryType["TRIANGLES"] = 4] = "TRIANGLES";
+    /**
+     * Draw a connected strip of triangles.
+     */
+    GeometryType[GeometryType["TRIANGLE_STRIP"] = 5] = "TRIANGLE_STRIP";
+    /**
+     * Draw a connected group of triangles. Each vertex connects to the previous and the first vertex in the fan.
+     */
+    GeometryType[GeometryType["TRIANGLE_FAN"] = 6] = "TRIANGLE_FAN";
+})(GeometryType || (GeometryType = {}));
+export var VertexFormatType;
+(function (VertexFormatType) {
+    VertexFormatType[VertexFormatType["Float16"] = 0] = "Float16";
+    VertexFormatType[VertexFormatType["Float32"] = 1] = "Float32";
+    VertexFormatType[VertexFormatType["Int8"] = 2] = "Int8";
+    VertexFormatType[VertexFormatType["Int16"] = 3] = "Int16";
+    VertexFormatType[VertexFormatType["Int32"] = 4] = "Int32";
+    VertexFormatType[VertexFormatType["UInt8"] = 5] = "UInt8";
+    VertexFormatType[VertexFormatType["UInt16"] = 6] = "UInt16";
+    VertexFormatType[VertexFormatType["UInt32"] = 7] = "UInt32";
+})(VertexFormatType || (VertexFormatType = {}));
+export var IndexFormatType;
+(function (IndexFormatType) {
+    IndexFormatType[IndexFormatType["None"] = -1] = "None";
+    IndexFormatType[IndexFormatType["UInt8"] = 0] = "UInt8";
+    IndexFormatType[IndexFormatType["UInt16"] = 1] = "UInt16";
+    IndexFormatType[IndexFormatType["UInt32"] = 2] = "UInt32";
+})(IndexFormatType || (IndexFormatType = {}));
+// BINORMAL[n]	Binormal	float4
+// BLENDINDICES[n]	混合索引	uint
+// BLENDWEIGHT[n]	混合权重	FLOAT
+// COLOR[n]	漫射和反射颜色	float4
+// NORMAL[n]	法向矢量	float4
+// POSITION[n]	对象空间中的顶点位置。	float4
+// POSITIONT	变换的顶点位置。	float4
+// PSIZE[n]	点大小	FLOAT
+// TANGENT[n]	正切	float4
+// TEXCOORD[n]	纹理坐标	float4
+// POSITION_BS[n]	Blend Shape 空间中的顶点位置	float4
+// NORMAL_BS[n]	Blend Shape 空间中的法向矢量	float4
+// TANGENT_BS[n]	Blend Shape 空间中的正切矢量	float4
+export var VertexBufferSemantic;
+(function (VertexBufferSemantic) {
+    VertexBufferSemantic["Position"] = "POSITION";
+    VertexBufferSemantic["Uv"] = "TEXCOORD0";
+    VertexBufferSemantic["Uv2"] = "TEXCOORD1";
+    VertexBufferSemantic["Normal"] = "NORMAL";
+    VertexBufferSemantic["Tangent"] = "TANGENT";
+    VertexBufferSemantic["Color"] = "COLOR";
+    VertexBufferSemantic["Joints"] = "JOINTS";
+    VertexBufferSemantic["Weights"] = "WEIGHTS";
+    //
+    VertexBufferSemantic["PositionBS0"] = "POSITION_BS0";
+    VertexBufferSemantic["PositionBS1"] = "POSITION_BS1";
+    VertexBufferSemantic["PositionBS2"] = "POSITION_BS2";
+    VertexBufferSemantic["PositionBS3"] = "POSITION_BS3";
+    VertexBufferSemantic["PositionBS4"] = "POSITION_BS4";
+    VertexBufferSemantic["PositionBS5"] = "POSITION_BS5";
+    VertexBufferSemantic["PositionBS6"] = "POSITION_BS6";
+    VertexBufferSemantic["PositionBS7"] = "POSITION_BS7";
+    VertexBufferSemantic["NormalBS0"] = "NORMAL_BS0";
+    VertexBufferSemantic["NormalBS1"] = "NORMAL_BS1";
+    VertexBufferSemantic["NormalBS2"] = "NORMAL_BS2";
+    VertexBufferSemantic["NormalBS3"] = "NORMAL_BS3";
+    VertexBufferSemantic["TangentBS0"] = "TANGENT_BS0";
+    VertexBufferSemantic["TangentBS1"] = "TANGENT_BS1";
+    VertexBufferSemantic["TangentBS2"] = "TANGENT_BS2";
+    VertexBufferSemantic["TangentBS3"] = "TANGENT_BS3";
+})(VertexBufferSemantic || (VertexBufferSemantic = {}));

package/{dist/src → es}/composition.d.ts

@@ -1,14 +1,15 @@
-import type { Item } from './item';
 import type { DataPath } from './components';
+import type { Item } from './item';
+import type { EndBehavior } from './item/base-item';
 export declare enum CameraClipMode {
     /**
      * 剪裁上下
      */
-    portrait,
+    portrait = 1,
     /**
      * 剪裁左右
      */
-    landscape
+    landscape = 0
 }
 /**
  * 相机属性
@@ -41,39 +42,7 @@ export interface CameraOptions {
      */
     clipMode: CameraClipMode;
 }
-/**
- * 结束行为
- */
-export declare enum CompositionEndBehavior {
-    /**
-     * 销毁
-     */
-    destroy,
-    /**
-     * 暂停
-     */
-    pause,
-    /**
-     * 重播
-     */
-    restart,
-    /**
-     * 无限播放
-     */
-    forward,
-    /**
-     * 销毁并保留最后一帧
-     */
-    pause_destroy,
-    /**
-     * 冻结
-     */
-    freeze
-}
-/**
- * 合成信息
- */
-export interface Composition {
+interface CompositionBase {
     /**
      * 合成ID
      */
@@ -94,15 +63,11 @@ export interface Composition {
     /**
      * 合成结束行为
      */
-    endBehavior: CompositionEndBehavior;
+    endBehavior: EndBehavior;
     /**
      * 合成相机信息
      */
     camera: CameraOptions;
-    /**
-     * 元素信息
-     */
-    items: Item[];
     /**
      * 合成视窗预览大小
      * 如果没有提供，默认为 player 的 container 大小
@@ -115,46 +80,39 @@ export interface Composition {
     fallbackImage?: string;
 }
 /**
- * 合成数据
+ * 合成信息
  */
-export interface CompositionData {
+export interface Composition extends CompositionBase {
     /**
-     * 合成ID
-     */
-    id: string;
-    /**
-     * 合成名称
-     */
-    name: string;
-    /**
-     * 合成持续时间
-     */
-    duration: number;
-    /**
-     * 合成开始播放的时间，单位妙
-     * @default 0
+     * 元素信息
      */
-    startTime?: number;
+    items: Item[];
+}
+/**
+ * 合成数据
+ */
+export interface CompositionData extends CompositionBase {
     /**
-     * 合成结束行为
+     * 元素信息
      */
-    endBehavior: CompositionEndBehavior;
+    items: DataPath[];
     /**
-     * 合成相机信息
+     * 时间轴资产（TimelineAssetData）
      */
-    camera: CameraOptions;
+    timelineAsset: DataPath;
     /**
-     * 元素信息
+     * 轨道的场景绑定
      */
-    items: DataPath[];
+    sceneBindings: SceneBindingData[];
+}
+export interface SceneBindingData {
     /**
-     * 合成视窗预览大小
-     * 如果没有提供，默认为 player 的 container 大小
-     * @default [0,0]
+     * 绑定的轨道资产（TrackAssetData）
      */
-    previewSize?: [width: number, height: number];
+    key: DataPath;
     /**
-     * 降级图
+     * 被绑定的场景对象（VFXItemData）
      */
-    fallbackImage?: string;
+    value: DataPath;
 }
+export {};

package/es/composition.js

@@ -0,0 +1,12 @@
+import { CAMERA_CLIP_MODE_NORMAL, CAMERA_CLIP_MODE_VERTICAL } from './constants';
+export var CameraClipMode;
+(function (CameraClipMode) {
+    /**
+     * 剪裁上下
+     */
+    CameraClipMode[CameraClipMode["portrait"] = 1] = "portrait";
+    /**
+     * 剪裁左右
+     */
+    CameraClipMode[CameraClipMode["landscape"] = 0] = "landscape";
+})(CameraClipMode || (CameraClipMode = {}));

package/{dist/src → es}/constants.d.ts

@@ -1,9 +1,32 @@
+/**
+ * 销毁
+ */
 export declare const END_BEHAVIOR_DESTROY = 0;
+/**
+ * 暂停
+ * @deprecated since 2.0 - use `END_BEHAVIOR_FREEZE` instead
+ */
 export declare const END_BEHAVIOR_PAUSE = 1;
+/**
+ * 无限播放
+ */
 export declare const END_BEHAVIOR_FORWARD = 2;
+/**
+ * 销毁并保留最后一帧
+ * @deprecated since 2.0
+ */
 export declare const END_BEHAVIOR_PAUSE_AND_DESTROY = 3;
+/**
+ * 冻结
+ */
 export declare const END_BEHAVIOR_FREEZE = 4;
+/**
+ * 重播
+ */
 export declare const END_BEHAVIOR_RESTART = 5;
+/**
+ *
+ */
 export declare const END_BEHAVIOR_DESTROY_CHILDREN = 6;
 export declare const CAMERA_CLIP_MODE_VERTICAL = 1;
 export declare const CAMERA_CLIP_MODE_NORMAL = 0;

package/es/constants.js

@@ -0,0 +1,34 @@
+/**
+ * 销毁
+ */
+export const END_BEHAVIOR_DESTROY = 0;
+/**
+ * 暂停
+ * @deprecated since 2.0 - use `END_BEHAVIOR_FREEZE` instead
+ */
+export const END_BEHAVIOR_PAUSE = 1;
+/**
+ * 无限播放
+ */
+export const END_BEHAVIOR_FORWARD = 2;
+/**
+ * 销毁并保留最后一帧
+ * @deprecated since 2.0
+ */
+export const END_BEHAVIOR_PAUSE_AND_DESTROY = 3;
+/**
+ * 冻结
+ */
+export const END_BEHAVIOR_FREEZE = 4;
+/**
+ * 重播
+ */
+export const END_BEHAVIOR_RESTART = 5;
+/**
+ *
+ */
+export const END_BEHAVIOR_DESTROY_CHILDREN = 6;
+export const CAMERA_CLIP_MODE_VERTICAL = 1;
+export const CAMERA_CLIP_MODE_NORMAL = 0;
+export const MESSAGE_ITEM_PHRASE_BEGIN = 2;
+export const MESSAGE_ITEM_PHRASE_END = 1;

package/{dist/src → es}/image.d.ts

@@ -53,7 +53,6 @@ export declare enum BackgroundType {
     image = "image"
 }
 export interface TemplateContent {
-    variables: Record<string, number | string>;
     /**
      * 当 template 宽高和 image 不相同时，会对 template 进行缩放，使其和 image 相同。
      */
@@ -62,22 +61,30 @@ export interface TemplateContent {
     background?: {
         type: BackgroundType;
         name: string;
-        url: string;
+        url: string | HTMLImageElement;
     };
 }
+export type TemplateVariables = Record<string, string | string[] | HTMLImageElement | HTMLImageElement[]>;
 /**
  * 纹理贴图属性
  */
 export interface Image {
+    id: string;
     /**
      * 纹理贴图地址
      */
     url: string;
     /**
-     * webp 地址
-     * 如果运行时支持 webp，则尽量使用 webp
+     * WebP 地址
+     * 如果运行时支持 WebP，则优先使用 WebP
      */
     webp?: string;
+    /**
+     * AVIF 地址
+     * 如果运行时支持 AVIF，则优先使用 AVIF
+     * @since 2.0.0
+     */
+    avif?: string;
     /**
      * 纹理贴图渲染等级
      * 如果没有设置，按照 B+ 处理
@@ -90,8 +97,8 @@ export interface Image {
      */
     mipmap?: boolean;
     /**
-     * 图片Y轴的方向，如果Y轴向上（与OpenGL相同）则为 1
-     * 如果Y轴向下（与OpenGL相反）则为 -1 ，图片再绘制数据模板的时候需要翻转绘制
+     * 图片 Y 轴的方向，如果 Y 轴向上（与 OpenGL 相同）则为 1
+     * 如果 Y 轴向下（与 OpenGL 相反）则为 -1，图片再绘制数据模板的时候需要翻转绘制
      * @default 1
      */
     oriY?: 1 | -1;

package/es/image.js

@@ -0,0 +1,9 @@
+/**
+ * 动态换图类型
+ * @since 1.1.0
+ */
+export var BackgroundType;
+(function (BackgroundType) {
+    BackgroundType["video"] = "video";
+    BackgroundType["image"] = "image";
+})(BackgroundType || (BackgroundType = {}));

package/{dist/src → es}/index.d.ts

@@ -1,4 +1,3 @@
-export * from 'uuid/dist/esm-browser/v4';
 export * from './type';
 export * from './composition';
 export * from './image';
@@ -20,8 +19,10 @@ export * from './item/effect-item';
 export * from './item/text-item';
 export * from './item/model';
 export * from './vfx-item-data';
+export * from './animation-clip-data';
 export * from './binary';
 export * from './text';
 export * from './components';
 export * from './vfx-item-data';
 export * from './buitin-object-guid';
+export * from './timeline';

package/es/index.js

@@ -0,0 +1,28 @@
+export * from './type';
+export * from './composition';
+export * from './image';
+export * from './constants';
+export * from './number-expression';
+export * from './scene';
+export * from './item';
+export * from './item/base-item';
+export * from './item/camera-item';
+export * from './item/composition-item';
+export * from './item/interact-item';
+export * from './item/null-item';
+export * from './item/particle-item';
+export * from './item/particle-shape';
+export * from './item/plugin-item';
+export * from './item/sprite-item';
+export * from './item/spine-item';
+export * from './item/effect-item';
+export * from './item/text-item';
+export * from './item/model';
+export * from './vfx-item-data';
+export * from './animation-clip-data';
+export * from './binary';
+export * from './text';
+export * from './components';
+export * from './vfx-item-data';
+export * from './buitin-object-guid';
+export * from './timeline';