lythreeframe 1.2.13 → 1.2.15

package/dist/bundle.cjs.js

@@ -1522,7 +1522,7 @@ class Viewport {
         }
         return this._app;
     }
-    constructor(app, viewportParam, rendererParam = { antialias: true }, postProcessParam = {}) {
+    constructor(app, viewportParam, rendererParam, postProcessParam = {}) {
         this._renderer = null;
         this.labelRenderer = null;
         this._app = null;
@@ -1554,10 +1554,22 @@ class Viewport {
         }
         let width = element ? element.clientWidth : 512;
         let height = element ? element.clientHeight : 512;
-        this._renderer = new webgpu.WebGPURenderer(rendererParam);
+        let renderP = {};
+        renderP.forceWebGL = rendererParam.forceWebGL;
+        renderP.antialias = rendererParam.antialias;
+        renderP.depth = rendererParam.depth;
+        renderP.stencil = rendererParam.stencil;
+        renderP.alpha = rendererParam.alpha;
+        renderP.logarithmicDepthBuffer = rendererParam.logarithmicDepthBuffer;
+        renderP.samples = rendererParam.samples;
+        renderP.colorBufferType = rendererParam.colorBufferType;
+        this._renderer = new webgpu.WebGPURenderer(renderP);
         this._renderer.setPixelRatio(window.devicePixelRatio);
         this._renderer.setSize(width, height);
-        this._renderer.shadowMap.enabled = true;
+        this._renderer.shadowMap.enabled = rendererParam.shadowMapEnabled;
+        this._renderer.shadowMap.type = rendererParam.shadowMapType;
+        this._renderer.toneMapping = rendererParam.toneMapping;
+        this._renderer.toneMappingExposure = rendererParam.toneMappingExposure;
         if (viewportParam.isLabelRendererNeeded) {
             this.labelRenderer = new Addons_js.CSS2DRenderer();
             this.labelRenderer.setSize(width, height);
@@ -2307,11 +2319,23 @@ const DefaultViewportParam = {
     isLabelRendererNeeded: false
 };
 
-const DefaultRenderParam = {
-    antialias: true,
+const DefaultRendererParameters = {
+    logarithmicDepthBuffer: false,
+    alpha: false,
+    depth: true,
+    stencil: false,
+    antialias: false,
+    samples: 4,
+    forceWebGL: false,
+    colorBufferType: undefined,
+    toneMapping: 0,
+    toneMappingExposure: 1,
+    shadowMapEnabled: true,
+    shadowMapType: 1,
 };
+
 const DefaultAppParam = {
-    renderParam: DefaultRenderParam,
+    renderParam: DefaultRendererParameters,
     cameraParam: DefaultCameraParam,
     postProcessParam: DefaultPostProcessParam,
     viewportParam: DefaultViewportParam,
@@ -2812,7 +2836,7 @@ class ThreeJsApp {
         this._appParam = { viewportParam: DefaultViewportParam };
         this._onCameraChangedDelegate = new Delegate();
         this._appParam.cameraParam = appParam.cameraParam ? appParam.cameraParam : DefaultCameraParam;
-        this._appParam.renderParam = appParam.renderParam ? appParam.renderParam : DefaultRenderParam;
+        this._appParam.renderParam = appParam.renderParam ? appParam.renderParam : DefaultRendererParameters;
         this._appParam.postProcessParam = appParam.postProcessParam ? appParam.postProcessParam : DefaultPostProcessParam;
         this._appParam.viewportParam = appParam.viewportParam ? appParam.viewportParam : DefaultViewportParam;
         this._appParam.classes = appParam.classes ? appParam.classes : {
@@ -2847,8 +2871,8 @@ class ThreeJsApp {
     }
     destroy() {
         this.onCameraChangedDelegate.clear();
-        this.world.destroy();
         this.controller.destroy();
+        this.world.destroy();
         this.viewport.destroy();
         this._assetManager.clearAssets();
     }
@@ -3378,7 +3402,7 @@ exports.DefaultDenoiseParam = DefaultDenoiseParam;
 exports.DefaultGTAOParam = DefaultGTAOParam;
 exports.DefaultOutlineParams = DefaultOutlineParams;
 exports.DefaultPostProcessParam = DefaultPostProcessParam;
-exports.DefaultRenderParam = DefaultRenderParam;
+exports.DefaultRendererParameters = DefaultRendererParameters;
 exports.DefaultSSRParam = DefaultSSRParam;
 exports.DefaultSkyParam = DefaultSkyParam;
 exports.DefaultToneMappingParams = DefaultToneMappingParams;

package/dist/bundle.esm.js

@@ -1520,7 +1520,7 @@ class Viewport {
         }
         return this._app;
     }
-    constructor(app, viewportParam, rendererParam = { antialias: true }, postProcessParam = {}) {
+    constructor(app, viewportParam, rendererParam, postProcessParam = {}) {
         this._renderer = null;
         this.labelRenderer = null;
         this._app = null;
@@ -1552,10 +1552,22 @@ class Viewport {
         }
         let width = element ? element.clientWidth : 512;
         let height = element ? element.clientHeight : 512;
-        this._renderer = new WebGPURenderer(rendererParam);
+        let renderP = {};
+        renderP.forceWebGL = rendererParam.forceWebGL;
+        renderP.antialias = rendererParam.antialias;
+        renderP.depth = rendererParam.depth;
+        renderP.stencil = rendererParam.stencil;
+        renderP.alpha = rendererParam.alpha;
+        renderP.logarithmicDepthBuffer = rendererParam.logarithmicDepthBuffer;
+        renderP.samples = rendererParam.samples;
+        renderP.colorBufferType = rendererParam.colorBufferType;
+        this._renderer = new WebGPURenderer(renderP);
         this._renderer.setPixelRatio(window.devicePixelRatio);
         this._renderer.setSize(width, height);
-        this._renderer.shadowMap.enabled = true;
+        this._renderer.shadowMap.enabled = rendererParam.shadowMapEnabled;
+        this._renderer.shadowMap.type = rendererParam.shadowMapType;
+        this._renderer.toneMapping = rendererParam.toneMapping;
+        this._renderer.toneMappingExposure = rendererParam.toneMappingExposure;
         if (viewportParam.isLabelRendererNeeded) {
             this.labelRenderer = new CSS2DRenderer();
             this.labelRenderer.setSize(width, height);
@@ -2305,11 +2317,23 @@ const DefaultViewportParam = {
     isLabelRendererNeeded: false
 };
 
-const DefaultRenderParam = {
-    antialias: true,
+const DefaultRendererParameters = {
+    logarithmicDepthBuffer: false,
+    alpha: false,
+    depth: true,
+    stencil: false,
+    antialias: false,
+    samples: 4,
+    forceWebGL: false,
+    colorBufferType: undefined,
+    toneMapping: 0,
+    toneMappingExposure: 1,
+    shadowMapEnabled: true,
+    shadowMapType: 1,
 };
+
 const DefaultAppParam = {
-    renderParam: DefaultRenderParam,
+    renderParam: DefaultRendererParameters,
     cameraParam: DefaultCameraParam,
     postProcessParam: DefaultPostProcessParam,
     viewportParam: DefaultViewportParam,
@@ -2810,7 +2834,7 @@ class ThreeJsApp {
         this._appParam = { viewportParam: DefaultViewportParam };
         this._onCameraChangedDelegate = new Delegate();
         this._appParam.cameraParam = appParam.cameraParam ? appParam.cameraParam : DefaultCameraParam;
-        this._appParam.renderParam = appParam.renderParam ? appParam.renderParam : DefaultRenderParam;
+        this._appParam.renderParam = appParam.renderParam ? appParam.renderParam : DefaultRendererParameters;
         this._appParam.postProcessParam = appParam.postProcessParam ? appParam.postProcessParam : DefaultPostProcessParam;
         this._appParam.viewportParam = appParam.viewportParam ? appParam.viewportParam : DefaultViewportParam;
         this._appParam.classes = appParam.classes ? appParam.classes : {
@@ -2845,8 +2869,8 @@ class ThreeJsApp {
     }
     destroy() {
         this.onCameraChangedDelegate.clear();
-        this.world.destroy();
         this.controller.destroy();
+        this.world.destroy();
         this.viewport.destroy();
         this._assetManager.clearAssets();
     }
@@ -3363,4 +3387,4 @@ class TransformGizmo extends Pawn {
     }
 }
 
-export { Actor, AssetManager, AttachmentRules, BoxActor, BoxComponent, Controller, DefaultAppParam, DefaultBloomParam, DefaultCameraParam, DefaultDOFParam, DefaultDenoiseParam, DefaultGTAOParam, DefaultOutlineParams, DefaultPostProcessParam, DefaultRenderParam, DefaultSSRParam, DefaultSkyParam, DefaultToneMappingParams, DefaultViewportParam, DefaultWorldParam, Delegate, DirectionalLightActor, DirectionalLightComponent, FirstPerson, GeometryAssetPointer, LabelComponent, LevelActor, LevelComponent, MaterialAssetPointer, MeshComponent, Orbital, PlaneActor, PlaneComponent, SceneComponent, SkyActor, SkyComponent, SphereComponent, TAssetPointer, TSmartPointer, TextureAssetPointer, ThreeJsApp, ThreeObjectLibrary, ToneMappingOptions, TransformGizmo, Viewport, WebGPUPostProcessFactory, World };
+export { Actor, AssetManager, AttachmentRules, BoxActor, BoxComponent, Controller, DefaultAppParam, DefaultBloomParam, DefaultCameraParam, DefaultDOFParam, DefaultDenoiseParam, DefaultGTAOParam, DefaultOutlineParams, DefaultPostProcessParam, DefaultRendererParameters, DefaultSSRParam, DefaultSkyParam, DefaultToneMappingParams, DefaultViewportParam, DefaultWorldParam, Delegate, DirectionalLightActor, DirectionalLightComponent, FirstPerson, GeometryAssetPointer, LabelComponent, LevelActor, LevelComponent, MaterialAssetPointer, MeshComponent, Orbital, PlaneActor, PlaneComponent, SceneComponent, SkyActor, SkyComponent, SphereComponent, TAssetPointer, TSmartPointer, TextureAssetPointer, ThreeJsApp, ThreeObjectLibrary, ToneMappingOptions, TransformGizmo, Viewport, WebGPUPostProcessFactory, World };

package/dist/index.d.ts

@@ -13,11 +13,13 @@ export { World } from "./lythreeframe/Frame/World";
 export type { CameraParam } 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 { DefaultAppParam } from "./lythreeframe/Frame/Parameters/AppParameter";
 export type { ViewportParam } from './lythreeframe/Frame/Parameters/ViewportParameters';
 export { DefaultViewportParam } from './lythreeframe/Frame/Parameters/ViewportParameters';
 export type { WorldParam } from "./lythreeframe/Frame/Parameters/WorldParameter";
 export { DefaultWorldParam } from "./lythreeframe/Frame/Parameters/WorldParameter";
+export type { RendererParameters } from './lythreeframe/Frame/Parameters/RendererParameters';
+export { DefaultRendererParameters } from './lythreeframe/Frame/Parameters/RendererParameters';
 export { Actor } from "./lythreeframe/Object/Actor";
 export { DirectionalLightActor } from "./lythreeframe/Object/Actors/Light/DirectionalLightActor";
 export { BoxActor } from "./lythreeframe/Object/Actors/Shape/BoxActor";

package/dist/lythreeframe/Frame/Parameters/AppParameter.d.ts

@@ -6,7 +6,7 @@ import { Viewport } from "../Viewport";
 import { ViewportParam } from "./ViewportParameters";
 import { AssetManager } from "../../AssetManagement/AssetManager";
 import { PostProcessParam } from "../../PostProcess/PostProcessParam";
-import { WebGPURendererParameters } from "three/src/renderers/webgpu/WebGPURenderer.js";
+import { RendererParameters } from "./RendererParameters";
 export interface AppClass {
     assetManagerClass: typeof AssetManager;
     controllerClass: typeof Controller;
@@ -14,12 +14,11 @@ export interface AppClass {
     viewportClass: typeof Viewport;
 }
 export interface AppParam {
-    renderParam?: WebGPURendererParameters;
+    renderParam?: RendererParameters;
     cameraParam?: CameraParam;
     postProcessParam?: PostProcessParam;
     worldParam?: WorldParam;
     viewportParam: ViewportParam;
     classes?: AppClass;
 }
-export declare const DefaultRenderParam: WebGPURendererParameters;
 export declare const DefaultAppParam: AppParam;

package/dist/lythreeframe/Frame/Parameters/RendererParameters.d.ts

@@ -0,0 +1,17 @@
+import { ShadowMapType, TextureDataType, ToneMapping } from "three/webgpu";
+export interface RendererParameters {
+    logarithmicDepthBuffer?: boolean | undefined;
+    alpha?: boolean | undefined;
+    depth?: boolean | undefined;
+    stencil?: boolean | undefined;
+    antialias?: boolean | undefined;
+    samples?: number | undefined;
+    forceWebGL?: boolean | undefined;
+    colorBufferType?: TextureDataType | undefined;
+    toneMapping: ToneMapping;
+    toneMappingExposure: number;
+    shadowMapEnabled: boolean;
+    shadowMapType: ShadowMapType | null;
+}
+export declare const DefaultRendererParameters: RendererParameters;
+export declare const RendererParametersNeedsRebuild: never[];

package/dist/lythreeframe/Frame/Viewport.d.ts

@@ -1,5 +1,4 @@
 import { PostProcessParam } from './../PostProcess/PostProcessParam';
-import { WebGPURendererParameters } from "three/src/renderers/webgpu/WebGPURenderer.js";
 import { WebGPURenderer } from "three/webgpu";
 import { BloomParam } from "../PostProcess/Param/Bloom";
 import { GTAOParam } from "../PostProcess/Param/GTAO";
@@ -10,6 +9,7 @@ import { OutlineParams } from '../PostProcess/Param/Outline';
 import { Object3D } from 'three/src/Three.WebGPU.Nodes.js';
 import { DOFParam } from '../PostProcess/Param/DOF';
 import { ViewportParam } from './Parameters/ViewportParameters';
+import { RendererParameters } from './Parameters/RendererParameters';
 export declare class Viewport {
     get canvas(): HTMLElement | null;
     get renderer(): WebGPURenderer;
@@ -32,7 +32,7 @@ export declare class Viewport {
     private fxaaPass;
     private smaaPass;
     private outlineObjects;
-    constructor(app: ThreeJsApp, viewportParam: ViewportParam, rendererParam?: WebGPURendererParameters, postProcessParam?: PostProcessParam);
+    constructor(app: ThreeJsApp, viewportParam: ViewportParam, rendererParam: RendererParameters, postProcessParam?: PostProcessParam);
     init(): void;
     setupPostProcess(): void;
     updateToneMappingParam(params: ToneMappingParams): void;

package/package.json

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