@galacean/effects-core 2.0.0-alpha.16 → 2.0.0-alpha.18

package/dist/material/utils.d.ts

@@ -1,17 +1,17 @@
 import * as spec from '@galacean/effects-specification';
-import type { ShaderMarcos } from '../render';
+import type { ShaderMacros } from '../render';
 import type { Material } from './material';
 import { ShaderType } from './types';
 export declare function valIfUndefined<T>(val: any, def: T): T;
 export declare function getPreMultiAlpha(blending?: number): number;
 /**
  * 生成 shader，检测到 WebGL1 上下文会降级
- * @param marcos - 宏定义数组
+ * @param macros - 宏定义数组
  * @param shader - 原始 shader 文本
  * @param shaderType - shader 类型
  * @return 去除版本号的 shader 文本
  */
-export declare function createShaderWithMarcos(marcos: ShaderMarcos, shader: string, shaderType: ShaderType, level: number): string;
+export declare function createShaderWithMacros(macros: ShaderMacros, shader: string, shaderType: ShaderType, level: number): string;
 export declare function setBlendMode(material: Material, blendMode?: number): void;
 export declare function setSideMode(material: Material, side: spec.SideMode): void;
 export declare function setMaskMode(material: Material, maskMode: spec.MaskMode): void;

package/dist/plugins/cal/calculate-item.d.ts

@@ -1,5 +1,4 @@
 import type { Euler, Vector3 } from '@galacean/effects-math/es/core/index';
-import type * as spec from '@galacean/effects-specification';
 import type { ValueGetter } from '../../math';
 import { TrackAsset } from '../timeline/track';
 import type { TimelineAsset } from './timeline-asset';
@@ -24,7 +23,5 @@ export type ItemLinearVelOverLifetime = {
  * @internal
  */
 export declare class ObjectBindingTrack extends TrackAsset {
-    data: spec.EffectsObjectData;
     create(timelineAsset: TimelineAsset): void;
-    fromData(data: spec.EffectsObjectData): void;
 }

package/dist/plugins/index.d.ts

@@ -25,5 +25,4 @@ export * from './timeline/tracks/sprite-color-track';
 export * from './timeline/tracks/sub-composition-track';
 export * from './timeline/playables/sub-composition-playable-asset';
 export * from './cal/timeline-asset';
-export * from './text/text-item';
-export * from './text/text-loader';
+export * from './text';

package/dist/plugins/interact/interact-item.d.ts

@@ -24,5 +24,5 @@ export declare class InteractComponent extends RendererComponent {
     beginDragTarget(options: spec.DragInteractOption, eventSystem: EventSystem): void;
     getHitTestParams: (force?: boolean) => HitTestTriangleParams | void;
     getBoundingBox(): BoundingBoxTriangle | void;
-    fromData(data: any): void;
+    fromData(data: spec.InteractContent): void;
 }

package/dist/plugins/particle/particle-mesh.d.ts

@@ -151,7 +151,7 @@ export declare class ParticleMesh implements ParticleMeshData {
     removePoint(index: number): void;
     setPoint(index: number, point: Point): void;
 }
-export declare function getParticleMeshShader(item: spec.ParticleItem, env: string | undefined, gpuCapability: GPUCapability): {
+export declare function getParticleMeshShader(item: spec.ParticleItem, gpuCapability: GPUCapability, env?: string): {
     shader: SharedShaderWithSource;
     vertex: number;
     fragment: number;

package/dist/plugins/particle/particle-system.d.ts

@@ -192,6 +192,6 @@ export declare class ParticleSystem extends Component {
     resumeParticleEmission(): void;
     getBoundingBox(): void | BoundingBoxSphere;
     getHitTestParams: (force?: boolean) => void | HitTestCustomParams;
-    fromData(data: any): void;
+    fromData(data: unknown): void;
 }
 export {};

package/dist/plugins/particle/trail-mesh.d.ts

@@ -56,4 +56,4 @@ export declare class TrailMesh {
     setPointStartPos(index: number, pos: Vector3): void;
     onUpdate(escapeTime: number): any;
 }
-export declare function getTrailMeshShader(trails: spec.ParticleTrail, particleMaxCount: number, name: string, env: string | undefined, gpuCapability: GPUCapability): ShaderWithSource;
+export declare function getTrailMeshShader(trails: spec.ParticleTrail, particleMaxCount: number, name: string, gpuCapability: GPUCapability, env?: string): ShaderWithSource;

package/dist/plugins/sprite/sprite-mesh.d.ts

@@ -20,16 +20,12 @@ export type SpriteRegionData = {
     size: spec.vec2;
 };
 export declare let maxSpriteMeshItemCount: number;
-export declare let maxSpriteTextureCount: number;
 export declare function setSpriteMeshMaxItemCountByGPU(gpuCapability: GPUCapabilityDetail): 16 | 32 | undefined;
 export declare function getImageItemRenderInfo(item: SpriteComponent): SpriteItemRenderInfo;
 export declare function spriteMeshShaderFromFilter(level: number, options?: {
-    count?: number;
-    ignoreBlend?: boolean;
     wireframe?: boolean;
     env?: string;
 }): SharedShaderWithSource;
 export declare function spriteMeshShaderIdFromRenderInfo(renderInfo: SpriteItemRenderInfo, count: number): string;
 export declare function spriteMeshShaderFromRenderInfo(renderInfo: SpriteItemRenderInfo, count: number, level: number, env?: string): SharedShaderWithSource;
 export declare function setMaxSpriteMeshItemCount(count: number): void;
-export declare function setSpriteMeshMaxFragmentTextures(count: number): void;

package/dist/plugins/text/index.d.ts

@@ -0,0 +1,4 @@
+export * from './text-item';
+export * from './text-layout';
+export * from './text-style';
+export * from './text-loader';

package/dist/plugins/timeline/track.d.ts

@@ -2,6 +2,20 @@ import { ItemEndBehavior } from '@galacean/effects-specification';
 import type { Engine } from '../../engine';
 import type { PlayableGraph } from '../cal/playable-graph';
 import { Playable, PlayableAsset, PlayableOutput } from '../cal/playable-graph';
+/**
+ * @since 2.0.0
+ * @internal
+ */
+export declare class TimelineClip {
+    id: string;
+    name: string;
+    start: number;
+    duration: number;
+    asset: PlayableAsset;
+    endBehaviour: ItemEndBehavior;
+    constructor();
+    toLocalTime(time: number): number;
+}
 /**
  * @since 2.0.0
  * @internal
@@ -38,20 +52,6 @@ export declare enum TrackType {
     MasterTrack = 0,
     ObjectTrack = 1
 }
-/**
- * @since 2.0.0
- * @internal
- */
-export declare class TimelineClip {
-    id: string;
-    name: string;
-    start: number;
-    duration: number;
-    asset: PlayableAsset;
-    endBehaviour: ItemEndBehavior;
-    constructor();
-    toLocalTime(time: number): number;
-}
 export declare class RuntimeClip {
     clip: TimelineClip;
     playable: Playable;

package/dist/render/shader.d.ts

@@ -1,7 +1,7 @@
 import type * as spec from '@galacean/effects-specification';
 import { EffectsObject } from '../effects-object';
 import type { Engine } from '../engine';
-export type ShaderMarcos = [key: string, value: string | number | boolean][];
+export type ShaderMacros = [key: string, value: string | number | boolean][];
 export declare enum ShaderCompileResultStatus {
     noShader = 0,
     success = 1,
@@ -39,7 +39,7 @@ export interface InstancedShaderWithSource {
     /**
      * shader的宏定义
      */
-    marcos?: ShaderMarcos;
+    macros?: ShaderMacros;
     /**
      * shader是否共享
      */
@@ -65,7 +65,7 @@ export interface SharedShaderWithSource {
     /**
      * shader的宏定义
      */
-    marcos?: ShaderMarcos;
+    macros?: ShaderMacros;
     /**
      * 是否共用GLProgram
      * shared为true时，
@@ -94,7 +94,7 @@ export interface ShaderLibrary {
         [cacheId: string]: ShaderCompileResult;
     };
     addShader(shader: ShaderWithSource): void;
-    createShader(shaderSource: ShaderWithSource, macros?: ShaderMarcos): ShaderVariant;
+    createShader(shaderSource: ShaderWithSource, macros?: ShaderMacros): ShaderVariant;
     /**
      * @param cacheId
      */

package/dist/serialization-helper.d.ts

@@ -1,14 +1,15 @@
+import type * as spec from '@galacean/effects-specification';
 import { EffectsObject } from './effects-object';
 export declare class SerializationHelper {
     static collectSerializableObject(effectsObject: EffectsObject, res: Record<string, EffectsObject>): void;
     static serializeEffectObject(effectsObject: EffectsObject): Record<string, any>;
     static serializeTaggedProperties(effectsObject: EffectsObject, serializedData?: Record<string, any>): Record<string, any>;
-    static deserializeTaggedProperties(serializedData: Record<string, any>, effectsObject: EffectsObject): void;
-    static deserializeTaggedPropertiesAsync(serializedData: Record<string, any>, effectsObject: EffectsObject): Promise<void>;
-    static checkTypedArray(obj: any): boolean;
-    static checkDataPath(value: any): boolean;
+    static deserializeTaggedProperties(serializedData: spec.EffectsObjectData, effectsObject: EffectsObject): void;
+    static deserializeTaggedPropertiesAsync(serializedData: spec.EffectsObjectData, effectsObject: EffectsObject): Promise<void>;
+    static checkTypedArray(obj: unknown): boolean;
+    static checkDataPath(value: unknown): value is spec.DataPath;
     static checkGLTFNode(value: any): boolean;
-    static checkImageSource(value: any): boolean;
+    static checkImageSource(value: HTMLCanvasElement): boolean;
     private static deserializeProperty;
     private static deserializePropertyAsync;
     private static serializeObjectProperty;

package/dist/shape/shape.d.ts

@@ -18,4 +18,4 @@ export type ShapeGenerator = Shape & {
     alignSpeedDirection?: boolean;
     upDirection?: Vector3;
 };
-export declare function createShape(shapeOptions: spec.ParticleShape): Shape;
+export declare function createShape(shapeOptions?: spec.ParticleShape): Shape;

package/dist/texture/utils.d.ts

@@ -2,5 +2,5 @@ import type * as spec from '@galacean/effects-specification';
 import type { Texture2DSourceOptions, TextureCubeSourceOptions } from './types';
 import type { Engine } from '../engine';
 type TextureJSONOptions = spec.SerializedTextureSource & spec.TextureConfigOptionsBase & spec.TextureFormatOptions;
-export declare function deserializeMipmapTexture(texOpts: TextureJSONOptions, bins: ArrayBuffer[], files: spec.BinaryFile[] | undefined, engine: Engine): Promise<Texture2DSourceOptions | TextureCubeSourceOptions>;
+export declare function deserializeMipmapTexture(textureOptions: TextureJSONOptions, bins: ArrayBuffer[], engine: Engine, files?: spec.BinaryFile[]): Promise<Texture2DSourceOptions | TextureCubeSourceOptions>;
 export {};

package/dist/transform.d.ts

@@ -22,7 +22,7 @@ export declare class Transform implements Disposable {
     static getRotation(quat: Quaternion, out: Euler): Euler;
     engine: Engine;
     name: string;
-    taggedProperties: Record<string, any>;
+    taggedProperties: spec.TransformData;
     /**
      * 自身位移
      */
@@ -223,8 +223,8 @@ export declare class Transform implements Disposable {
      * 获取 Transform 是否生效
      */
     getValid(): boolean;
-    toData(): Record<string, any>;
-    fromData(data: any): void;
+    toData(): spec.TransformData;
+    fromData(data: spec.TransformData): void;
     dispose(): void;
     private updateTRSCache;
     private dispatchValueChange;

package/dist/utils/index.d.ts

@@ -35,17 +35,17 @@ export declare function noop(): void;
  *
  * @static
  * @function isString
- * @param {object} obj - 要判断的对象
- * @return {boolean}
+ * @param obj - 要判断的对象
+ * @return
  */
-export declare function isString(obj: any): obj is string;
+export declare function isString(obj: unknown): obj is string;
 /**
  * 判断对象是否是`Array`类型
  *
  * @static
  * @function isArray
- * @param {object} obj - 要判断的对象
- * @return {boolean}
+ * @param obj - 要判断的对象
+ * @return
  */
 export declare const isArray: (arg: any) => arg is any[];
 /**
@@ -53,22 +53,27 @@ export declare const isArray: (arg: any) => arg is any[];
  *
  * @static
  * @function isFunction
- * @param {object} obj - 要判断的对象
- * @return {boolean}
+ * @param obj - 要判断的对象
+ * @return
  */
-export declare function isFunction(obj: any): boolean;
+export declare function isFunction(obj: unknown): boolean;
 /**
  * 判断对象是否是`Object`类型
  *
  * @static
  * @function isObject
- * @param {object} obj - 要判断的对象
- * @return {boolean}
+ * @param obj - 要判断的对象
+ * @return
  */
-export declare function isObject(obj: any): boolean;
+export declare function isObject(obj: unknown): obj is Record<string | symbol, unknown>;
 export declare function isCanvas(canvas: HTMLCanvasElement): boolean;
-export declare function deepClone(obj: any): any;
-export declare function random(min: number, max: number): number;
+/**
+ * 生成一个位于 min 和 max 之间的随机数
+ * @param min
+ * @param max
+ * @returns
+ */
+export declare function randomInRange(min: number, max: number): number;
 export declare function throwDestroyedError(): void;
 export declare function generateGUID(): string;
 export declare function base64ToFile(base64: string, filename?: string, contentType?: string): File;

package/dist/vfx-item.d.ts

@@ -1,8 +1,7 @@
 import { Vector3 } from '@galacean/effects-math/es/core/vector3';
 import * as spec from '@galacean/effects-specification';
 import type { VFXItemData } from './asset-loader';
-import type { Component } from './components';
-import { RendererComponent, ItemBehaviour } from './components';
+import type { Component, RendererComponent, ItemBehaviour } from './components';
 import type { Composition } from './composition';
 import { EffectsObject } from './effects-object';
 import type { Engine } from './engine';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-core",
-  "version": "2.0.0-alpha.16",
+  "version": "2.0.0-alpha.18",
   "description": "Galacean Effects runtime core for the web",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",
@@ -42,7 +42,7 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@galacean/effects-specification": "2.0.0-alpha.17",
+    "@galacean/effects-specification": "2.0.0-alpha.19",
     "@galacean/effects-math": "1.1.0",
     "uuid": "9.0.1"
   },