lythreeframe 1.0.36 → 1.0.38

package/dist/bundle.cjs.js

@@ -709,7 +709,7 @@ class MeshComponent extends SceneComponent {
             if (mat)
                 mats.push(mat);
         });
-        return mats;
+        return mats.length > 1 ? mats : mats[0];
     }
     get materialPtr() {
         return this.materialPtr;
@@ -740,7 +740,8 @@ class MeshComponent extends SceneComponent {
             elem.addRef();
         });
         if (this.threeObject) {
-            this.threeObject.material = mats;
+            if (mats.length > 0)
+                this.threeObject.material = Array.isArray(newMat) ? mats[0] : mats;
         }
         this._materialPtr = matPtrs;
     }
@@ -752,7 +753,7 @@ class MeshComponent extends SceneComponent {
             if (ptr)
                 matPtrs.push(ptr);
         });
-        let newMesh = new webgpu.Mesh(geometry, mats);
+        let newMesh = new webgpu.Mesh(geometry, material);
         super(app, newMesh);
         this.obj = null;
         this._geometryPtr = app.assetManager.addGeometryAsset(geometry);
@@ -1751,10 +1752,10 @@ class Viewport {
         return new Promise((resolve, reject) => {
             try {
                 if (this.postProcessing) {
-                    this.postProcessing.render();
+                    this.postProcessing.renderAsync();
                 }
                 else {
-                    this.renderer.render(this.app.world.scene, this.app.camera);
+                    this.renderer.renderAsync(this.app.world.scene, this.app.camera);
                 }
                 const offscreenCanvas = document.createElement('canvas');
                 offscreenCanvas.width = width;
@@ -3109,6 +3110,7 @@ exports.BoxComponent = BoxComponent;
 exports.Controller = Controller;
 exports.DefaultAppParam = DefaultAppParam;
 exports.DefaultBloomParam = DefaultBloomParam;
+exports.DefaultCameraParam = DefaultCameraParam;
 exports.DefaultDOFParam = DefaultDOFParam;
 exports.DefaultDenoiseParam = DefaultDenoiseParam;
 exports.DefaultGTAOParam = DefaultGTAOParam;

package/dist/bundle.esm.js

@@ -707,7 +707,7 @@ class MeshComponent extends SceneComponent {
             if (mat)
                 mats.push(mat);
         });
-        return mats;
+        return mats.length > 1 ? mats : mats[0];
     }
     get materialPtr() {
         return this.materialPtr;
@@ -738,7 +738,8 @@ class MeshComponent extends SceneComponent {
             elem.addRef();
         });
         if (this.threeObject) {
-            this.threeObject.material = mats;
+            if (mats.length > 0)
+                this.threeObject.material = Array.isArray(newMat) ? mats[0] : mats;
         }
         this._materialPtr = matPtrs;
     }
@@ -750,7 +751,7 @@ class MeshComponent extends SceneComponent {
             if (ptr)
                 matPtrs.push(ptr);
         });
-        let newMesh = new Mesh(geometry, mats);
+        let newMesh = new Mesh(geometry, material);
         super(app, newMesh);
         this.obj = null;
         this._geometryPtr = app.assetManager.addGeometryAsset(geometry);
@@ -1749,10 +1750,10 @@ class Viewport {
         return new Promise((resolve, reject) => {
             try {
                 if (this.postProcessing) {
-                    this.postProcessing.render();
+                    this.postProcessing.renderAsync();
                 }
                 else {
-                    this.renderer.render(this.app.world.scene, this.app.camera);
+                    this.renderer.renderAsync(this.app.world.scene, this.app.camera);
                 }
                 const offscreenCanvas = document.createElement('canvas');
                 offscreenCanvas.width = width;
@@ -3100,4 +3101,4 @@ class TransformGizmo extends Pawn {
     }
 }
 
-export { Actor, AssetManager, AttachmentRules, BoxActor, BoxComponent, Controller, DefaultAppParam, DefaultBloomParam, DefaultDOFParam, DefaultDenoiseParam, DefaultGTAOParam, DefaultOutlineParams, DefaultPostProcessParam, DefaultRenderParam, DefaultSSRParam, DefaultSkyParam, DefaultToneMappingParams, Delegate, DirectionalLightActor, DirectionalLightComponent, FirstPerson, LabelComponent, MeshComponent, Orbital, PlaneActor, PlaneComponent, SceneComponent, SkyActor, SkyComponent, SphereComponent, TAssetPointer, TSmartPointer, ThreeJsApp, ThreeObjectLibrary, ToneMappingOptions, TransformGizmo, Viewport, WebGPUPostProcessFactory, World };
+export { Actor, AssetManager, AttachmentRules, BoxActor, BoxComponent, Controller, DefaultAppParam, DefaultBloomParam, DefaultCameraParam, DefaultDOFParam, DefaultDenoiseParam, DefaultGTAOParam, DefaultOutlineParams, DefaultPostProcessParam, DefaultRenderParam, DefaultSSRParam, DefaultSkyParam, DefaultToneMappingParams, Delegate, DirectionalLightActor, DirectionalLightComponent, FirstPerson, LabelComponent, MeshComponent, Orbital, PlaneActor, PlaneComponent, SceneComponent, SkyActor, SkyComponent, SphereComponent, TAssetPointer, TSmartPointer, ThreeJsApp, ThreeObjectLibrary, ToneMappingOptions, TransformGizmo, Viewport, WebGPUPostProcessFactory, World };

package/dist/index.d.ts

@@ -8,7 +8,7 @@ export { Controller } from "./lythreeframe/Frame/Controller";
 export { Viewport } from "./lythreeframe/Frame/Viewport";
 export { World } from "./lythreeframe/Frame/World";
 export type { CameraParam } from './lythreeframe/Frame/Parameters/CameraParameter';
-export type { DefaultCameraParam } from './lythreeframe/Frame/Parameters/CameraParameter';
+export { DefaultCameraParam } from './lythreeframe/Frame/Parameters/CameraParameter';
 export type { AppParam, AppClass } from "./lythreeframe/Frame/Parameters/AppParameter";
 export { DefaultRenderParam, DefaultAppParam } from "./lythreeframe/Frame/Parameters/AppParameter";
 export { Actor } from "./lythreeframe/Object/Actor";

package/dist/lythreeframe/Object/Components/Mesh/MeshComponent.d.ts

@@ -10,7 +10,7 @@ export declare class MeshComponent extends SceneComponent {
     set geometry(geo: BufferGeometry);
     get geometryPtr(): TAssetPointer<BufferGeometry>;
     set geometryPtr(geo: TAssetPointer<BufferGeometry>);
-    get material(): Material[];
+    get material(): Material | Material[];
     get materialPtr(): TAssetPointer<Material>[];
     set material(newMat: Material | Material[]);
     set materialPtr(newMat: TAssetPointer<Material> | TAssetPointer<Material>[]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lythreeframe",
-  "version": "1.0.36",
+  "version": "1.0.38",
   "description": "Three.js 封装",
   "main": "dist/bundle.cjs.js",
   "module": "dist/bundle.esm.js",

package/dist/lythreeframe/AssetManagement/Task/Task.d.ts

@@ -1,7 +0,0 @@
-export declare class LYLoadTask {
-    private readonly paths;
-    private readonly onLoaded;
-    constructor(paths: string[], onLoaded: (loaded: any) => void);
-    get Paths(): string[];
-    onLoadingFinished(loaded: any): void;
-}

package/dist/lythreeframe/Object/Actors/Camera/CameraActor.d.ts

@@ -1,4 +0,0 @@
-import { Actor } from "../../Actor";
-export declare class CameraActor extends Actor {
-    constructor();
-}

package/dist/lythreeframe/Object/Components/Camera/CameraComponent.d.ts

@@ -1,26 +0,0 @@
-import { SceneComponent } from "../SceneComponent";
-import { OrthographicCamera, PerspectiveCamera } from "three/webgpu";
-interface CameraParam {
-    near: number;
-    far: number;
-    param: PerspectiveCameraParam | OrthographicCameraParam;
-}
-interface PerspectiveCameraParam {
-    fov: number;
-    aspect: number;
-}
-interface OrthographicCameraParam {
-    left: number;
-    right: number;
-    top: number;
-    bottom: number;
-}
-export declare class CameraComponent extends SceneComponent {
-    get threeObject(): PerspectiveCamera | OrthographicCamera;
-    get camera(): PerspectiveCamera | OrthographicCamera;
-    private set threeObject(value);
-    protected obj: PerspectiveCamera | OrthographicCamera;
-    constructor(param?: CameraParam);
-    updateCamera(param: CameraParam): void;
-}
-export {};

package/dist/lythreeframe/Object/Components/Mesh/InstanceMesh/InstanceMeshComponent.d.ts

@@ -1,7 +0,0 @@
-import { BufferGeometry, Material, Matrix4 } from "three/webgpu";
-import { MeshComponent } from "../MeshComponent";
-export declare class LYInstanceMeshComponent extends MeshComponent {
-    constructor(geometry: BufferGeometry, material: Material | Material[], matrices: Matrix4[]);
-    update(matrices: Matrix4[]): void;
-    destroy(): void;
-}

package/dist/lythreeframe/Object/Components/Mesh/InstanceMesh/MultiInstanceMeshComponent.d.ts

@@ -1,13 +0,0 @@
-import { Matrix4, Object3D } from "three/webgpu";
-import { SceneComponent } from "../../SceneComponent";
-export declare class LYMultiInstanceMeshComponent extends SceneComponent {
-    get matrices(): Matrix4[];
-    private ins;
-    private count;
-    private object;
-    private _matrices;
-    constructor(object: Object3D, matrices: Matrix4[]);
-    private collectMeshes;
-    update(matrices: Matrix4[]): void;
-    destroy(): void;
-}