@galacean/effects-threejs 2.0.0-alpha.2 → 2.0.0-alpha.21

package/dist/material/three-material.d.ts

@@ -7,6 +7,7 @@ type Vector3 = math.Vector3;
 type Vector4 = math.Vector4;
 type Matrix3 = math.Matrix3;
 type Quaternion = math.Quaternion;
+type Color = math.Color;
 /**
  * THREE 抽象材质类
  */
@@ -149,6 +150,8 @@ export declare class ThreeMaterial extends Material {
     setVector3(name: string, value: Vector3): void;
     getVector4(name: string): Vector4 | null;
     setVector4(name: string, value: Vector4): void;
+    getColor(name: string): Color | null;
+    setColor(name: string, value: Color): void;
     getQuaternion(name: string): Quaternion | null;
     setQuaternion(name: string, value: Quaternion): void;
     getFloat(name: string): number | null;
@@ -159,12 +162,12 @@ export declare class ThreeMaterial extends Material {
     setInt(name: string, value: number): void;
     hasUniform(name: string): boolean;
     private setUniform;
-    enableKeyword(keyword: string): void;
-    disableKeyword(keyword: string): void;
-    isKeywordEnabled(keyword: string): boolean;
+    enableMacro(keyword: string): void;
+    disableMacro(keyword: string): void;
+    isMacroEnabled(keyword: string): boolean;
     clone(props?: MaterialProps): Material;
     cloneUniforms(sourceMaterial: Material): void;
-    fromData(data: any): void;
+    fromData(data: unknown): void;
     dispose(destroyOptions?: MaterialDestroyOptions): void;
 }
 export {};

package/dist/three-composition.d.ts

@@ -1,4 +1,4 @@
-import type { Scene, ShaderLibrary, Transform, MeshRendererOptions, EventSystem, VFXItemContent, VFXItem, MessageItem, CompositionProps, CompositionSourceManager } from '@galacean/effects-core';
+import type { Scene, ShaderLibrary, Transform, MeshRendererOptions, EventSystem, VFXItem, MessageItem, CompositionProps } from '@galacean/effects-core';
 import { Composition } from '@galacean/effects-core';
 import type THREE from 'three';
 /**
@@ -48,7 +48,7 @@ export interface CompositionBaseProps {
      * @param item
      * @returns
      */
-    onPlayerPause?: (item: VFXItem<VFXItemContent>) => void;
+    onPlayerPause?: (item: VFXItem) => void;
 }
 export interface ThreeCompositionProps extends CompositionProps {
     /**
@@ -68,7 +68,7 @@ export declare class ThreeComposition extends Composition {
      * 发射器形状缓存 map
      */
     static shape: Record<string, number>;
-    constructor(props: ThreeCompositionProps, scene: Scene, compositionSourceManager: CompositionSourceManager);
+    constructor(props: ThreeCompositionProps, scene: Scene);
     /**
      * 更新 video texture 数据
      */

package/dist/three-display-object.d.ts

@@ -1,4 +1,4 @@
-import type { EventSystem, SceneLoadOptions, Renderer, Composition, SceneLoadType, SceneWithOptionsType } from '@galacean/effects-core';
+import type { EventSystem, SceneLoadOptions, Renderer, Composition, SceneLoadType } from '@galacean/effects-core';
 import { AssetManager } from '@galacean/effects-core';
 import * as THREE from 'three';
 import { ThreeComposition } from './three-composition';
@@ -54,4 +54,3 @@ export declare class ThreeDisplayObject extends THREE.Group {
      */
     update(delta: number): void;
 }
-export declare function isSceneWithOptions(scene: any): scene is SceneWithOptionsType;

package/dist/three-geometry.d.ts

@@ -1,4 +1,4 @@
-import type { Engine, GeometryProps, spec } from '@galacean/effects-core';
+import type { Engine, GeometryProps, SkinProps, spec } from '@galacean/effects-core';
 import { Geometry } from '@galacean/effects-core';
 import * as THREE from 'three';
 /**
@@ -139,6 +139,12 @@ export declare class ThreeGeometry extends Geometry {
      * @returns 返回绘制数量
      */
     getDrawCount(): number;
+    /**
+     * 获取蒙皮数据
+     *
+     * @returns 返回蒙皮数据
+     */
+    getSkinProps(): SkinProps;
     /**
      * 销毁方法
      *

package/dist/three-texture.d.ts

@@ -1,5 +1,5 @@
 import type { Engine, TextureDataType, TextureSourceOptions } from '@galacean/effects-core';
-import { Texture, TextureSourceType } from '@galacean/effects-core';
+import { Texture } from '@galacean/effects-core';
 import * as THREE from 'three';
 /**
  * THREE 抽象纹理类
@@ -42,194 +42,15 @@ export declare class ThreeTexture extends Texture {
      * @param options - 纹理选项
      * @returns 组装后的纹理选项
      */
-    assembleOptions(options: TextureSourceOptions): {
-        minFilter: THREE.TextureFilter;
-        magFilter: THREE.TextureFilter;
-        wrapS: THREE.Wrapping;
-        wrapT: THREE.Wrapping;
-        sourceType?: TextureSourceType.image | undefined;
-        image: HTMLImageElement | HTMLCanvasElement;
-        target: number;
-        generateMipmap?: boolean | undefined;
-        sourceFrom?: import("@galacean/effects-core").TextureFactorySourceFrom | undefined;
-        name?: string | undefined;
-        anisotropic?: number | undefined;
-        flipY?: boolean | undefined;
-        /**
-         * THREE 纹理对象
-         */
-        premultiplyAlpha?: boolean | undefined;
-        keepImageSource?: boolean | undefined;
-        format: number | THREE.PixelFormat;
-        internalFormat?: number | undefined;
-        type: number | THREE.TextureDataType;
-    } | {
-        minFilter: THREE.TextureFilter;
-        magFilter: THREE.TextureFilter;
-        wrapS: THREE.Wrapping;
-        wrapT: THREE.Wrapping;
-        sourceType?: TextureSourceType.data | undefined;
-        data: TextureDataType;
-        target: number;
-        sourceFrom?: import("@galacean/effects-core").TextureFactorySourceFrom | undefined;
-        name?: string | undefined;
-        anisotropic?: number | undefined;
-        flipY?: boolean | undefined;
-        /**
-         * THREE 纹理对象
-         */
-        premultiplyAlpha?: boolean | undefined;
-        keepImageSource?: boolean | undefined;
-        format: number | THREE.PixelFormat;
-        internalFormat?: number | undefined;
-        type: number | THREE.TextureDataType;
-    } | {
-        minFilter: THREE.TextureFilter;
-        magFilter: THREE.TextureFilter;
-        wrapS: THREE.Wrapping;
-        wrapT: THREE.Wrapping;
-        sourceType?: TextureSourceType.video | undefined;
-        video: HTMLVideoElement;
-        target: number;
-        generateMipmap?: boolean | undefined;
-        sourceFrom?: import("@galacean/effects-core").TextureFactorySourceFrom | undefined;
-        name?: string | undefined;
-        anisotropic?: number | undefined;
-        flipY?: boolean | undefined;
-        /**
-         * THREE 纹理对象
-         */
-        premultiplyAlpha?: boolean | undefined;
-        keepImageSource?: boolean | undefined;
-        format: number | THREE.PixelFormat;
-        internalFormat?: number | undefined;
-        type: number | THREE.TextureDataType;
-    } | {
-        minFilter: THREE.TextureFilter;
-        magFilter: THREE.TextureFilter;
-        wrapS: THREE.Wrapping;
-        wrapT: THREE.Wrapping;
-        sourceType?: TextureSourceType.mipmaps | undefined;
-        mipmaps: ((HTMLImageElement | HTMLCanvasElement) | TextureDataType)[];
-        target: number;
-        sourceFrom?: import("@galacean/effects-core").TextureFactorySourceFrom | undefined;
-        name?: string | undefined;
-        anisotropic?: number | undefined;
-        flipY?: boolean | undefined;
-        /**
-         * THREE 纹理对象
-         */
-        premultiplyAlpha?: boolean | undefined;
-        keepImageSource?: boolean | undefined;
-        format: number | THREE.PixelFormat;
-        internalFormat?: number | undefined;
-        type: number | THREE.TextureDataType;
-    } | {
-        minFilter: THREE.TextureFilter;
-        magFilter: THREE.TextureFilter;
-        wrapS: THREE.Wrapping;
-        wrapT: THREE.Wrapping;
-        sourceType?: TextureSourceType.compressed | undefined;
-        mipmaps: TextureDataType[];
-        target: number;
-        sourceFrom?: import("@galacean/effects-core").TextureFactorySourceFrom | undefined;
-        name?: string | undefined;
-        anisotropic?: number | undefined;
-        flipY?: boolean | undefined;
-        /**
-         * THREE 纹理对象
-         */
-        premultiplyAlpha?: boolean | undefined;
-        keepImageSource?: boolean | undefined;
-        format: number | THREE.PixelFormat;
-        internalFormat?: number | undefined;
-        type: number | THREE.TextureDataType;
-    } | {
-        minFilter: THREE.TextureFilter;
-        magFilter: THREE.TextureFilter;
-        wrapS: THREE.Wrapping;
-        wrapT: THREE.Wrapping;
-        sourceType: TextureSourceType.framebuffer;
-        data?: {
-            width: number;
-            height: number;
-        } | undefined;
-        target: number;
-        sourceFrom?: import("@galacean/effects-core").TextureFactorySourceFrom | undefined;
-        name?: string | undefined;
-        anisotropic?: number | undefined;
-        flipY?: boolean | undefined;
-        /**
-         * THREE 纹理对象
-         */
-        premultiplyAlpha?: boolean | undefined;
-        keepImageSource?: boolean | undefined;
-        format: number | THREE.PixelFormat;
-        internalFormat?: number | undefined;
-        type: number | THREE.TextureDataType;
-    } | {
-        minFilter: THREE.TextureFilter;
-        magFilter: THREE.TextureFilter;
-        wrapS: THREE.Wrapping;
-        wrapT: THREE.Wrapping;
-        sourceType?: TextureSourceType.none | undefined;
-        target: number;
-        sourceFrom?: import("@galacean/effects-core").TextureFactorySourceFrom | undefined;
-        name?: string | undefined;
-        anisotropic?: number | undefined;
-        flipY?: boolean | undefined;
-        /**
-         * THREE 纹理对象
-         */
-        premultiplyAlpha?: boolean | undefined;
-        keepImageSource?: boolean | undefined;
-        format: number | THREE.PixelFormat;
-        internalFormat?: number | undefined;
-        type: number | THREE.TextureDataType;
-    } | {
-        minFilter: THREE.TextureFilter;
-        magFilter: THREE.TextureFilter;
-        wrapS: THREE.Wrapping;
-        wrapT: THREE.Wrapping;
-        sourceType: TextureSourceType.data | TextureSourceType.image;
-        target: 34067;
-        cube: import("@galacean/effects-core").TextureSourceCubeData;
-        sourceFrom?: import("@galacean/effects-core").TextureFactorySourceFrom | undefined;
-        name?: string | undefined;
-        anisotropic?: number | undefined;
-        flipY?: boolean | undefined;
-        /**
-         * THREE 纹理对象
-         */
-        premultiplyAlpha?: boolean | undefined;
-        keepImageSource?: boolean | undefined;
-        format: number | THREE.PixelFormat;
-        internalFormat?: number | undefined;
-        type: number | THREE.TextureDataType;
-    } | {
-        minFilter: THREE.TextureFilter;
-        magFilter: THREE.TextureFilter;
-        wrapS: THREE.Wrapping;
-        wrapT: THREE.Wrapping;
-        sourceType?: TextureSourceType.mipmaps | undefined;
-        mipmaps: import("@galacean/effects-core").TextureSourceCubeData[];
-        target: 34067;
-        sourceFrom?: import("@galacean/effects-core").TextureFactorySourceFrom | undefined;
-        name?: string | undefined;
-        anisotropic?: number | undefined;
-        flipY?: boolean | undefined;
-        /**
-         * THREE 纹理对象
-         */
-        premultiplyAlpha?: boolean | undefined;
-        keepImageSource?: boolean | undefined;
-        format: number | THREE.PixelFormat;
-        internalFormat?: number | undefined;
-        type: number | THREE.TextureDataType;
-    };
+    assembleOptions(options: TextureSourceOptions): TextureSourceOptions;
     /**
      * 释放纹理占用的内存
      */
     dispose(): void;
+    /**
+     * 通过图层设置创建贴图
+     * @param data - 图层设置
+     */
+    fromData(data: any): void;
     private createTextureByType;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galacean/effects-threejs",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0-alpha.21",
   "description": "Galacean Effects runtime threejs plugin for the web",
   "module": "./dist/index.mjs",
   "main": "./dist/index.js",
@@ -43,7 +43,7 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@galacean/effects-core": "2.0.0-alpha.2"
+    "@galacean/effects-core": "2.0.0-alpha.21"
   },
   "devDependencies": {
     "three": "^0.149.0",
@@ -53,7 +53,7 @@
     "prebuild": "pnpm clean",
     "build": "pnpm build:declaration && pnpm build:module",
     "build:module": "rollup -c",
-    "build:declaration": "tsc -d --declarationDir dist --emitDeclarationOnly",
-    "clean": "rimraf dist && rimraf '*+(.tsbuildinfo)'"
+    "build:declaration": "tsc -d --emitDeclarationOnly",
+    "clean": "rimraf dist && rimraf \"*+(.tsbuildinfo)\""
   }
 }