lythreeframe 1.2.17 → 1.2.18

package/dist/bundle.cjs.js

@@ -1263,11 +1263,67 @@ class Delegate {
     }
 }
 
+const DefaultSSRParam = {
+    isEnabled: false,
+    maxDistance: 0.5,
+    opacity: 1,
+    thickness: 0.015,
+};
+
+const DefaultDenoiseParam = {
+    denoiseRadius: 5,
+    lumaPhi: 5,
+    depthPhi: 5,
+    normalPhi: 5
+};
+
+const DefaultGTAOParam = {
+    isEnabled: false,
+    distanceExponent: 1,
+    distanceFallOff: 1,
+    radius: 0.25,
+    scale: 1,
+    thickness: 1,
+    denoised: true,
+    denoiseParam: DefaultDenoiseParam,
+};
+
+const DefaultBloomParam = {
+    isEnabled: false,
+    threshold: 0,
+    strength: 1,
+    radius: 0,
+};
+
+const DefaultDOFParam = {
+    isEnabled: false,
+    focus: 500.0,
+    aperture: 5,
+    maxblur: 0.01
+};
+
+const DefaultOutlineParams = {
+    isEnabled: false,
+    edgeStrength: 3.0,
+    edgeGlow: 1.0,
+    edgeThickness: 1.0,
+    pulsePeriod: 0.0,
+    visibleEdgeColor: 0xffffff,
+    hiddenEdgeColor: 0xffffff,
+};
+
+const DefaultAAParams = {
+    isEnabled: false,
+    type: "fxaa",
+};
+
 const DefaultPostProcessParam = {
-    toneMapping: {
-        exposure: 1,
-        toneMapping: "AgX"
-    }
+    bloom: DefaultBloomParam,
+    dof: DefaultDOFParam,
+    ssr: DefaultSSRParam,
+    gtao: DefaultGTAOParam,
+    outline: DefaultOutlineParams,
+    aa: DefaultAAParams
 };
 
 class World {
@@ -1335,20 +1391,6 @@ class World {
     }
 }
 
-const DefaultToneMappingParams = {
-    exposure: 1.0,
-    toneMapping: 'AgX',
-};
-const ToneMappingOptions = new Map([
-    ["None", webgpu.NoToneMapping],
-    ["Linear", webgpu.LinearToneMapping],
-    ["Reinhard", webgpu.ReinhardToneMapping],
-    ["Cineon", webgpu.CineonToneMapping],
-    ["ACESFilmic", webgpu.ACESFilmicToneMapping],
-    ["AgX", webgpu.AgXToneMapping],
-    ["Neutral", webgpu.NeutralToneMapping]
-]);
-
 class WebGPUPostProcessFactory {
     // scene pass
     static constructScenePass(scene, camera) {
@@ -1497,15 +1539,6 @@ class WebGPUPostProcessFactory {
     }
 }
 
-const DefaultOutlineParams = {
-    edgeStrength: 3.0,
-    edgeGlow: 1.0,
-    edgeThickness: 1.0,
-    pulsePeriod: 0.0,
-    visibleEdgeColor: 0xffffff,
-    hiddenEdgeColor: 0xffffff,
-};
-
 class Viewport {
     get canvas() {
         return this._canvas;
@@ -1522,26 +1555,25 @@ class Viewport {
         }
         return this._app;
     }
-    constructor(app, viewportParam, rendererParam, postProcessParam = {}) {
+    constructor(app, viewportParam, rendererParam, postProcessParam) {
         this._renderer = null;
         this.labelRenderer = null;
         this._app = null;
         this.resizeObserver = null;
         this._canvas = null;
         this.isRenderStateDirty = true;
-        this.postProcessParam = {};
         this.postProcessing = null;
         this.scenePass = null;
         this.bloomPass = null;
         this.dofPass = null;
         this.GTAOPass = null;
         this.denoiseGTAOPass = null;
-        // private denoiseOutlinePass: ShaderNodeObject<DenoiseNode> | null = null;
         this.ssrPass = null;
         this.outlinePass = null;
-        // private motionBlurPass: ShaderNodeObject<Node> | null      = null;
         this.fxaaPass = null;
         this.smaaPass = null;
+        // private motionBlurPass: ShaderNodeObject<Node> | null      = null;
+        // private denoiseOutlinePass: ShaderNodeObject<DenoiseNode> | null = null;
         this.outlineObjects = [];
         this.postProcessParam = postProcessParam;
         this._app = app;
@@ -1603,14 +1635,14 @@ class Viewport {
         this.setupPostProcess();
     }
     setupPostProcess() {
-        if (this.postProcessParam.toneMapping) {
-            let toneMapping = ToneMappingOptions.get(this.postProcessParam.toneMapping.toneMapping);
-            if (toneMapping) {
-                this.renderer.toneMapping = toneMapping;
-            }
-            this.renderer.toneMappingExposure = this.postProcessParam.toneMapping.exposure;
-        }
-        if (!(Object.keys(this.postProcessParam).some(key => ['bloom', 'dof', 'gtao', 'ssr', "outline"].includes(key)))) {
+        // 检查各个效果是否启用
+        const isBloomEnabled = this.postProcessParam.bloom.isEnabled;
+        const isDOFEnabled = this.postProcessParam.dof.isEnabled;
+        const isSSREnabled = this.postProcessParam.ssr.isEnabled;
+        const isGTAOEnabled = this.postProcessParam.gtao.isEnabled;
+        const isOutlineEnabled = this.postProcessParam.outline.isEnabled;
+        const isAAEnabled = this.postProcessParam.aa.isEnabled;
+        if (!(isBloomEnabled) && !(isDOFEnabled) && !(isSSREnabled) && !(isGTAOEnabled) && !(isOutlineEnabled) && !(isAAEnabled)) {
             this.destroyPostProcess();
             return;
         }
@@ -1622,7 +1654,7 @@ class Viewport {
         }
         let finalNode = this.scenePass.getTextureNode('output');
         // bloom
-        if (this.postProcessParam.bloom) {
+        if (isBloomEnabled) {
             if (!this.bloomPass) {
                 this.bloomPass = WebGPUPostProcessFactory.constructBloomPass(this.scenePass, this.postProcessParam.bloom);
             }
@@ -1638,7 +1670,7 @@ class Viewport {
             }
         }
         // DOF
-        if (this.postProcessParam.dof) {
+        if (isDOFEnabled) {
             if (!this.dofPass) {
                 this.dofPass = WebGPUPostProcessFactory.constructDOFPass(this.scenePass, this.postProcessParam.dof);
             }
@@ -1672,7 +1704,7 @@ class Viewport {
         //     }
         // }
         // ssr
-        if (this.postProcessParam.ssr) {
+        if (isSSREnabled) {
             if (!this.ssrPass) {
                 this.ssrPass = WebGPUPostProcessFactory.constructSSRPass(this.scenePass, this.postProcessParam.ssr);
             }
@@ -1682,7 +1714,7 @@ class Viewport {
             finalNode = tsl.blendColor(finalNode, this.ssrPass);
         }
         // GTAO
-        if (this.postProcessParam.gtao) {
+        if (isGTAOEnabled) {
             if (!this.GTAOPass) {
                 this.GTAOPass = WebGPUPostProcessFactory.constructGTAOPass(this.scenePass, this.postProcessParam.gtao);
             }
@@ -1717,7 +1749,7 @@ class Viewport {
             }
         }
         // outline
-        if (this.postProcessParam.outline) {
+        if (isOutlineEnabled) {
             if (!this.outlinePass) {
                 this.outlinePass = WebGPUPostProcessFactory.constructOutlinePass(this.app.world.scene, this.scenePass.camera, this.outlineObjects, this.postProcessParam.outline);
             }
@@ -1745,12 +1777,12 @@ class Viewport {
                 this.outlinePass = null;
             }
         }
-        if (this.postProcessParam.aa) {
-            if (this.postProcessParam.aa === "fxaa") {
+        if (isAAEnabled) {
+            if (this.postProcessParam.aa.type === "fxaa") {
                 this.fxaaPass = WebGPUPostProcessFactory.constructFXAAPass(finalNode);
                 finalNode = this.fxaaPass;
             }
-            if (this.postProcessParam.aa === "smaa") {
+            if (this.postProcessParam.aa.type === "smaa") {
                 this.smaaPass = WebGPUPostProcessFactory.constructSMAAPass(finalNode);
                 finalNode = this.smaaPass;
             }
@@ -1768,11 +1800,6 @@ class Viewport {
         this.postProcessing.outputNode = finalNode;
         this.markRenderStateDirty();
     }
-    updateToneMappingParam(params) {
-        this.postProcessParam.toneMapping = params;
-        this.setupPostProcess();
-        this.markRenderStateDirty();
-    }
     updateBloomPass(params) {
         this.postProcessParam.bloom = params;
         this.setupPostProcess();
@@ -3197,41 +3224,6 @@ class LabelComponent extends SceneComponent {
 // labelStyle.style.fontSize        = "10px";
 // labelStyle.style.pointerEvents   = 'auto';
 
-const DefaultBloomParam = {
-    threshold: 0,
-    strength: 1,
-    radius: 0,
-};
-
-const DefaultDenoiseParam = {
-    denoiseRadius: 5,
-    lumaPhi: 5,
-    depthPhi: 5,
-    normalPhi: 5
-};
-
-const DefaultDOFParam = {
-    focus: 500.0,
-    aperture: 5,
-    maxblur: 0.01
-};
-
-const DefaultGTAOParam = {
-    distanceExponent: 1,
-    distanceFallOff: 1,
-    radius: 0.25,
-    scale: 1,
-    thickness: 1,
-    denoised: true,
-    denoiseParam: DefaultDenoiseParam,
-};
-
-const DefaultSSRParam = {
-    maxDistance: 0.5,
-    opacity: 1,
-    thickness: 0.015,
-};
-
 class FirstPerson extends Pawn {
     constructor(controller) {
         super(controller);
@@ -3453,7 +3445,6 @@ exports.DefaultPostProcessParam = DefaultPostProcessParam;
 exports.DefaultRendererParameters = DefaultRendererParameters;
 exports.DefaultSSRParam = DefaultSSRParam;
 exports.DefaultSkyParam = DefaultSkyParam;
-exports.DefaultToneMappingParams = DefaultToneMappingParams;
 exports.DefaultViewportParam = DefaultViewportParam;
 exports.DefaultWorldParam = DefaultWorldParam;
 exports.Delegate = Delegate;
@@ -3478,7 +3469,6 @@ exports.TSmartPointer = TSmartPointer;
 exports.TextureAssetPointer = TextureAssetPointer;
 exports.ThreeJsApp = ThreeJsApp;
 exports.ThreeObjectLibrary = ThreeObjectLibrary;
-exports.ToneMappingOptions = ToneMappingOptions;
 exports.TransformGizmo = TransformGizmo;
 exports.Viewport = Viewport;
 exports.WebGPUPostProcessFactory = WebGPUPostProcessFactory;

package/dist/bundle.esm.js

@@ -1,4 +1,4 @@
-import { MathUtils, Object3D, Vector3, Box3, Quaternion, Euler, Matrix4, Mesh, LoadingManager, BufferGeometry, Texture, FileLoader, Material, NoToneMapping, LinearToneMapping, ReinhardToneMapping, CineonToneMapping, ACESFilmicToneMapping, AgXToneMapping, NeutralToneMapping, WebGPURenderer, PostProcessing, Color, Vector2, Raycaster, PerspectiveCamera, OrthographicCamera, Clock, DirectionalLight, MeshStandardMaterial, BoxGeometry, MeshBasicMaterial, PlaneGeometry, SphereGeometry } from 'three/webgpu';
+import { MathUtils, Object3D, Vector3, Box3, Quaternion, Euler, Matrix4, Mesh, LoadingManager, BufferGeometry, Texture, FileLoader, Material, WebGPURenderer, PostProcessing, Color, Vector2, Raycaster, PerspectiveCamera, OrthographicCamera, Clock, DirectionalLight, MeshStandardMaterial, BoxGeometry, MeshBasicMaterial, PlaneGeometry, SphereGeometry } from 'three/webgpu';
 import { GLTFLoader, DRACOLoader, CSS2DRenderer, OrbitControls } from 'three/examples/jsm/Addons.js';
 import { pass, mrt, output, uniform, velocity, metalness, transformedNormalView, blendColor, time, oscSine } from 'three/tsl';
 import { bloom } from 'three/examples/jsm/tsl/display/BloomNode.js';
@@ -1261,11 +1261,67 @@ class Delegate {
     }
 }
 
+const DefaultSSRParam = {
+    isEnabled: false,
+    maxDistance: 0.5,
+    opacity: 1,
+    thickness: 0.015,
+};
+
+const DefaultDenoiseParam = {
+    denoiseRadius: 5,
+    lumaPhi: 5,
+    depthPhi: 5,
+    normalPhi: 5
+};
+
+const DefaultGTAOParam = {
+    isEnabled: false,
+    distanceExponent: 1,
+    distanceFallOff: 1,
+    radius: 0.25,
+    scale: 1,
+    thickness: 1,
+    denoised: true,
+    denoiseParam: DefaultDenoiseParam,
+};
+
+const DefaultBloomParam = {
+    isEnabled: false,
+    threshold: 0,
+    strength: 1,
+    radius: 0,
+};
+
+const DefaultDOFParam = {
+    isEnabled: false,
+    focus: 500.0,
+    aperture: 5,
+    maxblur: 0.01
+};
+
+const DefaultOutlineParams = {
+    isEnabled: false,
+    edgeStrength: 3.0,
+    edgeGlow: 1.0,
+    edgeThickness: 1.0,
+    pulsePeriod: 0.0,
+    visibleEdgeColor: 0xffffff,
+    hiddenEdgeColor: 0xffffff,
+};
+
+const DefaultAAParams = {
+    isEnabled: false,
+    type: "fxaa",
+};
+
 const DefaultPostProcessParam = {
-    toneMapping: {
-        exposure: 1,
-        toneMapping: "AgX"
-    }
+    bloom: DefaultBloomParam,
+    dof: DefaultDOFParam,
+    ssr: DefaultSSRParam,
+    gtao: DefaultGTAOParam,
+    outline: DefaultOutlineParams,
+    aa: DefaultAAParams
 };
 
 class World {
@@ -1333,20 +1389,6 @@ class World {
     }
 }
 
-const DefaultToneMappingParams = {
-    exposure: 1.0,
-    toneMapping: 'AgX',
-};
-const ToneMappingOptions = new Map([
-    ["None", NoToneMapping],
-    ["Linear", LinearToneMapping],
-    ["Reinhard", ReinhardToneMapping],
-    ["Cineon", CineonToneMapping],
-    ["ACESFilmic", ACESFilmicToneMapping],
-    ["AgX", AgXToneMapping],
-    ["Neutral", NeutralToneMapping]
-]);
-
 class WebGPUPostProcessFactory {
     // scene pass
     static constructScenePass(scene, camera) {
@@ -1495,15 +1537,6 @@ class WebGPUPostProcessFactory {
     }
 }
 
-const DefaultOutlineParams = {
-    edgeStrength: 3.0,
-    edgeGlow: 1.0,
-    edgeThickness: 1.0,
-    pulsePeriod: 0.0,
-    visibleEdgeColor: 0xffffff,
-    hiddenEdgeColor: 0xffffff,
-};
-
 class Viewport {
     get canvas() {
         return this._canvas;
@@ -1520,26 +1553,25 @@ class Viewport {
         }
         return this._app;
     }
-    constructor(app, viewportParam, rendererParam, postProcessParam = {}) {
+    constructor(app, viewportParam, rendererParam, postProcessParam) {
         this._renderer = null;
         this.labelRenderer = null;
         this._app = null;
         this.resizeObserver = null;
         this._canvas = null;
         this.isRenderStateDirty = true;
-        this.postProcessParam = {};
         this.postProcessing = null;
         this.scenePass = null;
         this.bloomPass = null;
         this.dofPass = null;
         this.GTAOPass = null;
         this.denoiseGTAOPass = null;
-        // private denoiseOutlinePass: ShaderNodeObject<DenoiseNode> | null = null;
         this.ssrPass = null;
         this.outlinePass = null;
-        // private motionBlurPass: ShaderNodeObject<Node> | null      = null;
         this.fxaaPass = null;
         this.smaaPass = null;
+        // private motionBlurPass: ShaderNodeObject<Node> | null      = null;
+        // private denoiseOutlinePass: ShaderNodeObject<DenoiseNode> | null = null;
         this.outlineObjects = [];
         this.postProcessParam = postProcessParam;
         this._app = app;
@@ -1601,14 +1633,14 @@ class Viewport {
         this.setupPostProcess();
     }
     setupPostProcess() {
-        if (this.postProcessParam.toneMapping) {
-            let toneMapping = ToneMappingOptions.get(this.postProcessParam.toneMapping.toneMapping);
-            if (toneMapping) {
-                this.renderer.toneMapping = toneMapping;
-            }
-            this.renderer.toneMappingExposure = this.postProcessParam.toneMapping.exposure;
-        }
-        if (!(Object.keys(this.postProcessParam).some(key => ['bloom', 'dof', 'gtao', 'ssr', "outline"].includes(key)))) {
+        // 检查各个效果是否启用
+        const isBloomEnabled = this.postProcessParam.bloom.isEnabled;
+        const isDOFEnabled = this.postProcessParam.dof.isEnabled;
+        const isSSREnabled = this.postProcessParam.ssr.isEnabled;
+        const isGTAOEnabled = this.postProcessParam.gtao.isEnabled;
+        const isOutlineEnabled = this.postProcessParam.outline.isEnabled;
+        const isAAEnabled = this.postProcessParam.aa.isEnabled;
+        if (!(isBloomEnabled) && !(isDOFEnabled) && !(isSSREnabled) && !(isGTAOEnabled) && !(isOutlineEnabled) && !(isAAEnabled)) {
             this.destroyPostProcess();
             return;
         }
@@ -1620,7 +1652,7 @@ class Viewport {
         }
         let finalNode = this.scenePass.getTextureNode('output');
         // bloom
-        if (this.postProcessParam.bloom) {
+        if (isBloomEnabled) {
             if (!this.bloomPass) {
                 this.bloomPass = WebGPUPostProcessFactory.constructBloomPass(this.scenePass, this.postProcessParam.bloom);
             }
@@ -1636,7 +1668,7 @@ class Viewport {
             }
         }
         // DOF
-        if (this.postProcessParam.dof) {
+        if (isDOFEnabled) {
             if (!this.dofPass) {
                 this.dofPass = WebGPUPostProcessFactory.constructDOFPass(this.scenePass, this.postProcessParam.dof);
             }
@@ -1670,7 +1702,7 @@ class Viewport {
         //     }
         // }
         // ssr
-        if (this.postProcessParam.ssr) {
+        if (isSSREnabled) {
             if (!this.ssrPass) {
                 this.ssrPass = WebGPUPostProcessFactory.constructSSRPass(this.scenePass, this.postProcessParam.ssr);
             }
@@ -1680,7 +1712,7 @@ class Viewport {
             finalNode = blendColor(finalNode, this.ssrPass);
         }
         // GTAO
-        if (this.postProcessParam.gtao) {
+        if (isGTAOEnabled) {
             if (!this.GTAOPass) {
                 this.GTAOPass = WebGPUPostProcessFactory.constructGTAOPass(this.scenePass, this.postProcessParam.gtao);
             }
@@ -1715,7 +1747,7 @@ class Viewport {
             }
         }
         // outline
-        if (this.postProcessParam.outline) {
+        if (isOutlineEnabled) {
             if (!this.outlinePass) {
                 this.outlinePass = WebGPUPostProcessFactory.constructOutlinePass(this.app.world.scene, this.scenePass.camera, this.outlineObjects, this.postProcessParam.outline);
             }
@@ -1743,12 +1775,12 @@ class Viewport {
                 this.outlinePass = null;
             }
         }
-        if (this.postProcessParam.aa) {
-            if (this.postProcessParam.aa === "fxaa") {
+        if (isAAEnabled) {
+            if (this.postProcessParam.aa.type === "fxaa") {
                 this.fxaaPass = WebGPUPostProcessFactory.constructFXAAPass(finalNode);
                 finalNode = this.fxaaPass;
             }
-            if (this.postProcessParam.aa === "smaa") {
+            if (this.postProcessParam.aa.type === "smaa") {
                 this.smaaPass = WebGPUPostProcessFactory.constructSMAAPass(finalNode);
                 finalNode = this.smaaPass;
             }
@@ -1766,11 +1798,6 @@ class Viewport {
         this.postProcessing.outputNode = finalNode;
         this.markRenderStateDirty();
     }
-    updateToneMappingParam(params) {
-        this.postProcessParam.toneMapping = params;
-        this.setupPostProcess();
-        this.markRenderStateDirty();
-    }
     updateBloomPass(params) {
         this.postProcessParam.bloom = params;
         this.setupPostProcess();
@@ -3195,41 +3222,6 @@ class LabelComponent extends SceneComponent {
 // labelStyle.style.fontSize        = "10px";
 // labelStyle.style.pointerEvents   = 'auto';
 
-const DefaultBloomParam = {
-    threshold: 0,
-    strength: 1,
-    radius: 0,
-};
-
-const DefaultDenoiseParam = {
-    denoiseRadius: 5,
-    lumaPhi: 5,
-    depthPhi: 5,
-    normalPhi: 5
-};
-
-const DefaultDOFParam = {
-    focus: 500.0,
-    aperture: 5,
-    maxblur: 0.01
-};
-
-const DefaultGTAOParam = {
-    distanceExponent: 1,
-    distanceFallOff: 1,
-    radius: 0.25,
-    scale: 1,
-    thickness: 1,
-    denoised: true,
-    denoiseParam: DefaultDenoiseParam,
-};
-
-const DefaultSSRParam = {
-    maxDistance: 0.5,
-    opacity: 1,
-    thickness: 0.015,
-};
-
 class FirstPerson extends Pawn {
     constructor(controller) {
         super(controller);
@@ -3435,4 +3427,4 @@ class TransformGizmo extends Pawn {
     }
 }
 
-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 };
+export { Actor, AssetManager, AttachmentRules, BoxActor, BoxComponent, Controller, DefaultAppParam, DefaultBloomParam, DefaultCameraParam, DefaultDOFParam, DefaultDenoiseParam, DefaultGTAOParam, DefaultOutlineParams, DefaultPostProcessParam, DefaultRendererParameters, DefaultSSRParam, DefaultSkyParam, DefaultViewportParam, DefaultWorldParam, Delegate, DirectionalLightActor, DirectionalLightComponent, FirstPerson, GeometryAssetPointer, LabelComponent, LevelActor, LevelComponent, MaterialAssetPointer, MeshComponent, Orbital, PlaneActor, PlaneComponent, SceneComponent, SkyActor, SkyComponent, SphereComponent, TAssetPointer, TSmartPointer, TextureAssetPointer, ThreeJsApp, ThreeObjectLibrary, TransformGizmo, Viewport, WebGPUPostProcessFactory, World };

package/dist/index.d.ts

@@ -52,8 +52,8 @@ export { DefaultOutlineParams } from "./lythreeframe/PostProcess/Param/Outline";
 export type { OutlineParams } from "./lythreeframe/PostProcess/Param/Outline";
 export { DefaultSSRParam } from "./lythreeframe/PostProcess/Param/SSR";
 export type { SSRParam } from "./lythreeframe/PostProcess/Param/SSR";
-export { DefaultToneMappingParams, ToneMappingOptions } from "./lythreeframe/PostProcess/Param/ToneMapping";
-export type { ToneMappingParams } from "./lythreeframe/PostProcess/Param/ToneMapping";
+export { AAParams } from "./lythreeframe/PostProcess/Param/AAParam";
+export type { DefaultAAParams } from "./lythreeframe/PostProcess/Param/AAParam";
 export { Orbital } from "./lythreeframe/Object/PawnV2/Oribital";
 export { FirstPerson } from "./lythreeframe/Object/PawnV2/FirstPerson";
 export type { ITransforming } from "./lythreeframe/Object/PawnV2/TransformControl";

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

@@ -1,15 +1,14 @@
-import { PostProcessParam } from './../PostProcess/PostProcessParam';
-import { WebGPURenderer, ShadowMapType, ToneMapping } from "three/webgpu";
+import { Object3D } from 'three/src/Three.WebGPU.Nodes.js';
+import { ShadowMapType, ToneMapping, WebGPURenderer } from "three/webgpu";
 import { BloomParam } from "../PostProcess/Param/Bloom";
+import { DOFParam } from '../PostProcess/Param/DOF';
 import { GTAOParam } from "../PostProcess/Param/GTAO";
-import { ToneMappingParams } from "../PostProcess/Param/ToneMapping";
-import { ThreeJsApp } from "../ThreeJsApp";
-import { SSRParam } from "../PostProcess/Param/SSR";
 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 { SSRParam } from "../PostProcess/Param/SSR";
+import { ThreeJsApp } from "../ThreeJsApp";
+import { PostProcessParam } from './../PostProcess/PostProcessParam';
 import { RendererParameters } from './Parameters/RendererParameters';
+import { ViewportParam } from './Parameters/ViewportParameters';
 export declare class Viewport {
     get canvas(): HTMLElement | null;
     get renderer(): WebGPURenderer;
@@ -32,15 +31,14 @@ export declare class Viewport {
     private fxaaPass;
     private smaaPass;
     private outlineObjects;
-    constructor(app: ThreeJsApp, viewportParam: ViewportParam, rendererParam: RendererParameters, postProcessParam?: PostProcessParam);
+    constructor(app: ThreeJsApp, viewportParam: ViewportParam, rendererParam: RendererParameters, postProcessParam: PostProcessParam);
     init(): void;
     setupPostProcess(): void;
-    updateToneMappingParam(params: ToneMappingParams): void;
     updateBloomPass(params: BloomParam): void;
-    updateGTAOParam(params: GTAOParam | null): void;
-    updateDOFParam(params: DOFParam | null): void;
-    updateSSRParam(params: SSRParam | null): void;
-    updateOutlineParam(params: OutlineParams | null): void;
+    updateGTAOParam(params: GTAOParam): void;
+    updateDOFParam(params: DOFParam): void;
+    updateSSRParam(params: SSRParam): void;
+    updateOutlineParam(params: OutlineParams): void;
     addOutlineObject(obj: Object3D): void;
     setOutlineObjects(objects: Object3D[]): void;
     removeOutlineObject(obj: Object3D): void;

package/dist/lythreeframe/PostProcess/Param/AAParam.d.ts

@@ -0,0 +1,5 @@
+export interface AAParams {
+    isEnabled: boolean;
+    type: "fxaa" | "smaa";
+}
+export declare const DefaultAAParams: AAParams;

package/dist/lythreeframe/PostProcess/Param/Bloom.d.ts

@@ -1,4 +1,5 @@
 export interface BloomParam {
+    isEnabled: boolean;
     threshold: number;
     strength: number;
     radius: number;

package/dist/lythreeframe/PostProcess/Param/DOF.d.ts

@@ -1,4 +1,5 @@
 export interface DOFParam {
+    isEnabled: boolean;
     focus: number;
     aperture: number;
     maxblur: number;

package/dist/lythreeframe/PostProcess/Param/GTAO.d.ts

@@ -1,5 +1,6 @@
 import { DenoiseParam } from './Denoise';
 export interface GTAOParam {
+    isEnabled: boolean;
     distanceExponent: number;
     distanceFallOff: number;
     radius: number;

package/dist/lythreeframe/PostProcess/Param/Outline.d.ts

@@ -1,5 +1,6 @@
 import { ColorRepresentation } from "three/webgpu";
 export interface OutlineParams {
+    isEnabled: boolean;
     edgeStrength: number;
     edgeGlow: number;
     edgeThickness: number;
@@ -7,11 +8,4 @@ export interface OutlineParams {
     visibleEdgeColor: ColorRepresentation;
     hiddenEdgeColor: ColorRepresentation;
 }
-export declare const DefaultOutlineParams: {
-    edgeStrength: number;
-    edgeGlow: number;
-    edgeThickness: number;
-    pulsePeriod: number;
-    visibleEdgeColor: number;
-    hiddenEdgeColor: number;
-};
+export declare const DefaultOutlineParams: OutlineParams;

package/dist/lythreeframe/PostProcess/Param/SSR.d.ts

@@ -1,4 +1,5 @@
 export interface SSRParam {
+    isEnabled: boolean;
     maxDistance: number;
     opacity: number;
     thickness: number;

package/dist/lythreeframe/PostProcess/PostProcessParam.d.ts

@@ -1,16 +1,15 @@
 import { SSRParam } from './Param/SSR';
 import { GTAOParam } from "./Param/GTAO";
 import { BloomParam } from "./Param/Bloom";
-import { ToneMappingParams } from "./Param/ToneMapping";
 import { DOFParam } from "./Param/DOF";
 import { OutlineParams } from './Param/Outline';
+import { AAParams } from './Param/AAParam';
 export interface PostProcessParam {
-    toneMapping?: ToneMappingParams;
-    bloom?: BloomParam | null;
-    dof?: DOFParam | null;
-    ssr?: SSRParam | null;
-    gtao?: GTAOParam | null;
-    outline?: OutlineParams | null;
-    aa?: "fxaa" | "smaa" | null;
+    bloom: BloomParam;
+    dof: DOFParam;
+    ssr: SSRParam;
+    gtao: GTAOParam;
+    outline: OutlineParams;
+    aa: AAParams;
 }
 export declare const DefaultPostProcessParam: PostProcessParam;

package/package.json

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

package/dist/lythreeframe/PostProcess/Param/ToneMapping.d.ts

@@ -1,9 +0,0 @@
-export interface ToneMappingParams {
-    exposure: number;
-    toneMapping: string;
-}
-export declare const DefaultToneMappingParams: {
-    exposure: number;
-    toneMapping: string;
-};
-export declare const ToneMappingOptions: Map<string, 0 | 1 | 2 | 3 | 4 | 6 | 7>;