Needle Engine 3.19.7

Files changed (3) hide show

src/engine-components/LODGroup.ts +13 -26
src/engine-components/OrbitControls.ts +14 -5
src/engine-components/postprocessing/PostProcessingHandler.ts +9 -0

src/engine-components/LODGroup.ts CHANGED Viewed

@@ -4,11 +4,9 @@
 import { getParam } from "../engine/engine_utils.js";
 import { serializable } from "../engine/engine_serialization_decorator.js";
 import { Vector3 } from "three";
-import { isDevEnvironment } from "../engine/debug/index.js";
-import { GuidsMap } from "../engine/engine_types.js";
-const debug = getParam("debugLODs");
-const noLods = getParam("noLODs");
+const debug = getParam("debuglods");
+const noLods = getParam("nolods");
 enum LODFadeMode {
     None = 0,
@@ -59,17 +57,15 @@
     private _lodsHandler?: Array<THREE.LOD>;
     start(): void {
+        if (debug)
+            console.log("LODGROUP", this.name, this.lodModels, this);
         if (noLods) return;
         if (this._lodsHandler) return;
         if (!this.gameObject) return;
-        if (debug)
-            console.log(this);
         if (this.lodModels && Array.isArray(this.lodModels)) {
-            let maxDistance = 0;
             const renderers: Renderer[] = [];
             for (const model of this.lodModels) {
-                maxDistance = Math.max(model.distance, maxDistance);
                 const lod = new LOD(model);
                 this._lods.push(lod);
                 for (const rend of lod.renderers) {
@@ -85,41 +81,32 @@
             }
             const empty = new THREE.Object3D();
             empty.name = "Cull " + this.name;
-            if (debug)
-                console.log(renderers);
             for (let i = 0; i < renderers.length; i++) {
                 const rend = renderers[i];
                 const handler = this._lodsHandler[i];
                 const obj = rend.gameObject;
-                let maxDistance = 0;
-                let lodDistanceDiff = 0;
                 if (debug)
                     console.log(i, obj.name);
                 for (const lod of this._lods) {
+                    const dist = lod.model.distance;
                     // get object to be lodded, it can be empty
                     let object: THREE.Object3D | null = null;
-                    if (lod.renderers.includes(rend)) object = obj;
+                    if (lod.renderers.includes(rend)) {
+                        object = obj;
+                    }
                     else {
                         object = empty;
                     }
-                    if (debug)
-                        console.log("add", lod.model.distance, object.name);
-                    const dist = lod.model.distance;
-                    lodDistanceDiff = dist - maxDistance;
-                    maxDistance = Math.max(dist, maxDistance);
                     if (object.type === "Group") {
-                        console.warn("LODGroup: Group is not supported as LOD object", obj.name, object);
+                        console.warn(`LODGroup ${this.name}: Group or MultiMaterial object's are not supported as LOD object: ${object.name}`);
                         continue;
                     }
-                    this.onAddLodLevel(handler, object, dist);
+                    if (debug)
+                        console.log("LEVEL", object.name, dist);
+                    this.onAddLodLevel(handler, object, lod.model.distance);
                 }
-                const cullDistance = maxDistance + lodDistanceDiff;
-                if (debug) {
-                    console.log("cull", cullDistance);
-                }
-                this.onAddLodLevel(handler, empty, cullDistance);
             }
         }
     }
@@ -140,7 +127,7 @@
             console.warn("LODGroup component must be on parent object and not mesh directly at the moment", obj.name, obj)
             return;
         }
-        lod.addLevel(obj, dist * this._distanceFactor);
+        lod.addLevel(obj, dist * this._distanceFactor, .01);
         const setting = { lod: lod, levelIndex: lod.levels.length - 1, distance: dist };
         this._settings.push(setting)
     }

src/engine-components/OrbitControls.ts CHANGED Viewed

@@ -6,7 +6,7 @@
 import { serializable } from "../engine/engine_serialization_decorator.js";
 import { getParam, isMobileDevice } from "../engine/engine_utils.js";
-import { Camera as ThreeCamera, Box3, Object3D, PerspectiveCamera, Vector2, Vector3, Box3Helper, GridHelper, Mesh, ShadowMaterial } from "three";
+import { Camera as ThreeCamera, Box3, Object3D, PerspectiveCamera, Vector2, Vector3, Box3Helper, GridHelper, Mesh, ShadowMaterial, RGBA_ASTC_10x10_Format } from "three";
 import { OrbitControls as ThreeOrbitControls } from "three/examples/jsm/controls/OrbitControls.js";
 import { AfterHandleInputEvent, EventSystem, EventSystemEvents } from "./ui/EventSystem.js";
 import { ICameraController } from "../engine/engine_types.js";
@@ -17,6 +17,7 @@
 const freeCam = getParam("freecam");
 const debugCameraFit = getParam("debugcamerafit");
+const smoothcam = getParam("smoothcam")
 const disabledKeys = { LEFT: "", UP: "", RIGHT: "", BOTTOM: "" };
 let defaultKeys: any = undefined;
@@ -206,9 +207,11 @@
             }
         }
         this._syncedTransform = GameObject.getComponent(this.gameObject, SyncedTransform) ?? undefined;
-        if (this._didStart) {
-            if (this.autoFit) this.fitCamera()
-        }
+        // if we autofit in onEnable then DragControls will trigger fitting every time (because they disable OrbitControls)
+        // that's confusing and not what we want
+        // if (this._didStart) {
+        //     if (this.autoFit) this.fitCamera()
+        // }
     }
     onDisable() {
@@ -308,14 +311,20 @@
             if (this.debugLog)
                 this._controls.domElement = this.context.renderer.domElement;
             this._controls.enabled = !this._shouldDisable && this._camera === this.context.mainCameraComponent && !this.context.isInXR;
-            this._controls.enableDamping = this.enableDamping;
             this._controls.keys = this.enableKeys ? defaultKeys : disabledKeys;
             this._controls.autoRotate = this.autoRotate;
             this._controls.autoRotateSpeed = this.autoRotateSpeed;
             this._controls.enableZoom = this.enableZoom;
+            this._controls.enableDamping = this.enableDamping;
             this._controls.dampingFactor = this.dampingFactor;
             this._controls.enablePan = this.enablePan;
             this._controls.enableRotate = this.enableRotate;
+            if (typeof smoothcam === "number" || smoothcam === true) {
+                this._controls.enableDamping = true;
+                const factor = typeof smoothcam === "number" ? smoothcam : .99;
+                this._controls.dampingFactor = Math.max(.001, 1 - Math.min(1, factor));
+                console.log(this._controls.dampingFactor)
+            }
             //@ts-ignore
             // this._controls.zoomToCursor = this.zoomToCursor;
             if (!this.context.isInXR)

src/engine-components/postprocessing/PostProcessingHandler.ts CHANGED Viewed

@@ -6,6 +6,7 @@
 import { Camera } from "../Camera.js";
 import { PostProcessingEffect } from "./PostProcessingEffect.js";
 import { Constructor } from "../../engine/engine_types.js";
+import { N8AOPostPass } from "n8ao";
 const debug = getParam("debugpost");
@@ -189,6 +190,13 @@
             return aidx - bidx;
         });
         if (debug) console.log("After ordering effects", [...this._effects]);
+        for (let i = 0; i < effects.length; i++) {
+            const effect = effects[i] as any;
+            if (effect?.configuration?.gammaCorrection !== undefined) {
+                const isLast = i === effects.length - 1;
+                effect.configuration.gammaCorrection = isLast;
+            }
+        }
     }
 }
@@ -197,6 +205,7 @@
     NormalPass,
     DepthDownsamplingPass,
     SSAOEffect,
+    N8AOPostPass,
     DepthOfFieldEffect,
     BloomEffect,
     SelectiveBloomEffect,