@galacean/effects-core 1.0.0 → 1.1.0-alpha.0

package/dist/camera.d.ts

@@ -1,10 +1,6 @@
-import type { vec3 } from '@galacean/effects-specification';
 import * as spec from '@galacean/effects-specification';
-import type { mat4 } from './math';
-/**
- *
- */
-export interface CameraOptions {
+import { Matrix4, Vector3, Euler, Quaternion } from '@galacean/effects-math/es/core/index';
+interface CameraOptionsBase {
     /**
      * 相机近平面
      */
@@ -25,6 +21,11 @@ export interface CameraOptions {
      * 相机的裁剪模式
      */
     clipMode: spec.CameraClipMode;
+}
+/**
+ *
+ */
+export interface CameraOptions extends CameraOptionsBase {
     /**
      * 相机的位置
      */
@@ -38,6 +39,20 @@ export interface CameraOptions {
      */
     quat?: spec.vec4;
 }
+export interface CameraOptionsEx extends CameraOptionsBase {
+    /**
+     * 相机的位置
+     */
+    position: Vector3;
+    /**
+     * 相机的旋转，欧拉角
+     */
+    rotation: Euler;
+    /**
+     * 相机的旋转，四元数
+     */
+    quat?: Quaternion;
+}
 /**
  * 合成的相机对象，采用透视投影
  */
@@ -91,69 +106,69 @@ export declare class Camera {
      * 设置相机的位置
      * @param value
      */
-    set position(value: spec.vec3);
-    get position(): spec.vec3;
+    set position(value: Vector3);
+    get position(): Vector3;
     /**
      * 设置相机的旋转角度
      * @param value
      */
-    set rotation(value: spec.vec3);
-    get rotation(): spec.vec3;
+    set rotation(value: Euler);
+    get rotation(): Euler;
     /**
      * 获取相机的视图变换矩阵
      * @return
      */
-    getViewMatrix(): mat4;
+    getViewMatrix(): Matrix4;
     /**
      * 获取视图变换的逆矩阵
      */
-    getInverseViewMatrix(): any;
+    getInverseViewMatrix(): Matrix4;
     /**
      * 获取相机的投影矩阵
      * @return
      */
-    getProjectionMatrix(): mat4;
+    getProjectionMatrix(): Matrix4;
     /**
      * 获取相机投影矩阵的逆矩阵
      * @return
      */
-    getInverseProjectionMatrix(): mat4;
+    getInverseProjectionMatrix(): Matrix4;
     /**
      * 获取相机的 VP 矩阵
      * @return
      */
-    getViewProjectionMatrix(): mat4;
+    getViewProjectionMatrix(): Matrix4;
     /**
      * 获取相机 VP 矩阵的逆矩阵
      * @return
      */
-    getInverseViewProjectionMatrix(): mat4;
+    getInverseViewProjectionMatrix(): Matrix4;
     /**
      * 根据相机的视图投影矩阵对指定模型矩阵做变换
      * @param out - 结果矩阵
      * @param model - 模型变换矩阵
      */
-    getModelViewProjection(out: mat4 | number[], model: mat4): mat4;
+    getModelViewProjection(out: Matrix4, model: Matrix4): Matrix4;
     /**
      * 获取归一化坐标和 3D 世界坐标的换算比例
      * @param z - 当前的位置 z
      */
-    getInverseVPRatio(z: number): vec3;
+    getInverseVPRatio(z: number): Vector3;
     /**
      * 设置相机的旋转四元数
      * @param value - 旋转四元数
      */
-    setQuat(value: spec.vec4): void;
+    setQuat(value: Quaternion): void;
     /**
      * 获取相机旋转对应的四元数
      * @returns
      */
-    getQuat(): spec.vec4;
+    getQuat(): Quaternion;
     /**
      * 获取相机内部的 options
      * @returns 相机 options
      */
-    getOptions(): CameraOptions;
+    getOptions(): CameraOptionsEx;
     /**
      * 复制指定相机元素的属性到当前相机
      * @param camera
@@ -165,3 +180,4 @@ export declare class Camera {
     updateMatrix(): void;
     private setRotationByQuat;
 }
+export {};

package/dist/comp-vfx-item.d.ts

@@ -1,4 +1,5 @@
 import * as spec from '@galacean/effects-specification';
+import { CalculateItem } from './plugins';
 import type { VFXItemContent, VFXItemProps } from './vfx-item';
 import { VFXItem } from './vfx-item';
 import type { Composition } from './composition';
@@ -8,7 +9,7 @@ export interface ItemNode {
     children: ItemNode[];
     parentId?: string;
 }
-export declare class CompVFXItem extends VFXItem<void> {
+export declare class CompVFXItem extends VFXItem<void | CalculateItem> {
     /**
      * 创建好的元素数组
      */
@@ -18,6 +19,7 @@ export declare class CompVFXItem extends VFXItem<void> {
      */
     itemTree: ItemNode[];
     startTime: number;
+    contentProps: any;
     timeInms: number;
     /**
      * id和元素的映射关系Map，方便查找
@@ -32,6 +34,7 @@ export declare class CompVFXItem extends VFXItem<void> {
     get type(): spec.ItemType;
     onConstructed(props: VFXItemProps): void;
     createContent(): void;
+    protected doCreateContent(): CalculateItem;
     onLifetimeBegin(): void;
     doStop(): void;
     onItemUpdate(dt: number, lifetime: number): void;
@@ -53,10 +56,12 @@ export declare class CompVFXItem extends VFXItem<void> {
      * @return 当父元素生命周期结束时，返回空
      */
     getItemCurrentParent(item: VFXItem<VFXItemContent>): VFXItem<VFXItemContent> | void;
+    getItemByName(name: string): VFXItem<VFXItemContent>[];
     protected isEnded(now: number): boolean;
     /**
      * 构建父子树，同时保存到 itemCacheMap 中便于查找
      */
     private buildItemTree;
     private getParentIdWithoutSuffix;
+    private restart;
 }

package/dist/composition-source-manager.d.ts

@@ -5,6 +5,7 @@ import type { Scene } from './scene';
 import type { PluginSystem } from './plugin-system';
 import type { Engine } from './engine';
 import type { GlobalVolume } from './render';
+import type { VFXItemProps } from './vfx-item';
 export interface ContentOptions {
     id: string;
     duration: number;
@@ -20,7 +21,9 @@ export interface ContentOptions {
  */
 export declare class CompositionSourceManager implements Disposable {
     composition?: spec.Composition;
+    refCompositions: Map<string, spec.Composition>;
     sourceContent?: ContentOptions;
+    refCompositionProps: Map<string, VFXItemProps>;
     renderLevel?: spec.RenderLevel;
     pluginSystem?: PluginSystem;
     totalTime: number;

package/dist/composition.d.ts

@@ -1,17 +1,17 @@
 import * as spec from '@galacean/effects-specification';
+import type { Ray } from '@galacean/effects-math/es/core/index';
 import type { JSONValue } from './downloader';
 import type { Scene } from './scene';
 import type { Disposable, LostHandler } from './utils';
 import { Transform } from './transform';
-import type { VFXItem, VFXItemContent } from './vfx-item';
+import type { VFXItem, VFXItemContent, VFXItemProps } from './vfx-item';
 import { CompVFXItem } from './comp-vfx-item';
-import type { InteractVFXItem, EventSystem } from './plugins';
+import type { InteractVFXItem, EventSystem, Region } from './plugins';
 import type { PluginSystem } from './plugin-system';
 import type { MeshRendererOptions, Renderer } from './render';
-import type { Texture } from './texture';
 import { RenderFrame } from './render';
+import type { Texture } from './texture';
 import { Camera } from './camera';
-import type { Region } from './plugins';
 import { CompositionSourceManager } from './composition-source-manager';
 export interface CompositionStatistic {
     loadTime: number;
@@ -109,6 +109,10 @@ export declare class Composition implements Disposable, LostHandler {
      * 插件系统，保存当前加载的插件对象，负责插件事件和创建插件的 Item 对象
      */
     readonly pluginSystem: PluginSystem;
+    /**
+     * 是否在合成结束时自动销毁引用的纹理，合成重播时不销毁
+     */
+    autoRefTex: boolean;
     /**
      * 当前合成名称
      */
@@ -133,6 +137,14 @@ export declare class Composition implements Disposable, LostHandler {
      * 合成对象
      */
     readonly content: CompVFXItem;
+    /**
+     * 预合成数组
+     */
+    readonly refContent: CompVFXItem[];
+    /**
+     * 预合成的合成属性，在 content 中会被其元素属性覆盖
+     */
+    refCompositionProps: Map<string, VFXItemProps>;
     /**
      * 合成的相机对象
      */
@@ -157,7 +169,6 @@ export declare class Composition implements Disposable, LostHandler {
      */
     private readonly globalVolume;
     private readonly texInfo;
-    private readonly autoRefTex;
     private readonly postLoaders;
     private readonly handleMessageItem?;
     /**
@@ -303,10 +314,7 @@ export declare class Composition implements Disposable, LostHandler {
      * @param y
      * @returns
      */
-    getHitTestRay(x: number, y: number): {
-        center: spec.vec3;
-        direction: spec.vec3;
-    };
+    getHitTestRay(x: number, y: number): Ray;
     /**
      * 获取 engine 对象
      * @returns

package/dist/constants.d.ts

@@ -1,13 +1,10 @@
-import type * as spec from '@galacean/effects-specification';
 export declare const SPRITE_VERTEX_STRIDE = 6;
-export declare const VFX_ITEM_TYPE_TREE: spec.ItemType;
 export declare const SEMANTIC_PRE_COLOR_ATTACHMENT_0 = "PRE_COLOR_0";
 export declare const SEMANTIC_PRE_COLOR_ATTACHMENT_SIZE_0 = "PRE_COLOR_SIZE_0";
 export declare const SEMANTIC_MAIN_PRE_COLOR_ATTACHMENT_0 = "PRE_MAIN_COLOR_0";
 export declare const SEMANTIC_MAIN_PRE_COLOR_ATTACHMENT_SIZE_0 = "PRE_MAIN_COLOR_SIZE_0";
 export declare const PLAYER_OPTIONS_ENV_EDITOR = "editor";
 export declare const FILTER_NAME_NONE = "none";
-export declare const DEG2RAD = 0.017453292519943295;
 export declare const HELP_LINK: {
     'Filter not imported': string;
     'Item duration can\'t be less than 0': string;

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import './polyfill';
 export * as spec from '@galacean/effects-specification';
 export { getStandardJSON, getStandardImage, getStandardComposition, getStandardItem, } from '@galacean/effects-specification/dist/fallback';
+export * as math from '@galacean/effects-math/es/core/index';
 export * from './gl';
 export * from './constants';
 export * from './config';