add silent updates to deep stores

- additionally, update camera-controls

Author: alexpineda

package.json

@@ -27,12 +27,12 @@
         "./src",
         "package.json",
         "README.md"
-      ],
-      "types": "./types/index.d.ts",
-      "exports": {
+    ],
+    "types": "./types/index.d.ts",
+    "exports": {
         "./host/*": "./dist/host/*",
         "./ui/*": "./dist/ui/*"
-      },
+    },
     "repository": {
         "type": "git",
         "url": "git+https://github.com/alexpineda/titan-reactor.git"
@@ -65,7 +65,7 @@
         "bl": "^5.0.0",
         "buffer": "^6.0.3",
         "bw-chk": "^1.4.0",
-        "camera-controls": "1.37.2",
+        "camera-controls": "2.7.3",
         "concat-stream": "^2.0.0",
         "deep-diff": "^1.0.2",
         "deepmerge": "^4.2.2",

src/camera/game-viewport.ts

@@ -128,16 +128,16 @@ export class GameViewPort extends Sizeable {
         this.cameraShake.restore( this.camera );
     }
 
-    update( targetDamping: number, delta: number ) {
+    update( targetSmoothTime: number, delta: number ) {
 
         this.viewport.copy(this.getActualSize());
         this.#direction32 = this.rotateSprites
             ? getDirection32( this.projectedView.center, this.camera.getWorldPosition( _target ))
             : 0;
 
-        this.orbit.dampingFactor = MathUtils.damp(
-            this.orbit.dampingFactor,
-            targetDamping,
+        this.orbit.smoothTime = MathUtils.damp(
+            this.orbit.smoothTime,
+            targetSmoothTime,
             0.0001,
             delta
         );

src/common/get-app-settings-leva-config.ts

@@ -284,11 +284,11 @@ const getInputConfig = (
         ),
     },
     "input.dampingFactor": {
-        label: "Camera Movement Damping",
+        label: "Camera Movement Time",
         value: input.dampingFactor,
-        min: 0.01,
-        max: 0.1,
-        step: 0.01,
+        min: 0.1,
+        max: 10,
+        step: 0.1,
     },
     "input.zoomLevels": {
         label: "Camera Zoom Levels",

src/core/titan-reactor.ts

@@ -185,7 +185,9 @@ logCapabilities();
     // }
     // metaVerse().setSession(session);
 
-    await initCacheDB();
+    try {
+        await initCacheDB();
+    } catch (e) {}
 
     await sceneStore().loadScene(new LoadingScene());
 

src/core/world/plugin-session-store.ts

@@ -88,10 +88,8 @@ export const createPluginSessionStore = (
 
     const vars = plugins.reduce( ( acc, plugin ) => {
         Object.keys( plugin.rawConfig ?? {} ).forEach( ( key ) => {
-            if ( key !== "system" ) {
-                const compKey = [ plugin.name, key ];
-                lSet( acc, compKey, store.createVariable( compKey ) );
-            }
+            const compKey = [ plugin.name, key ];
+            lSet( acc, compKey, store.createVariable( compKey ) );
         } );
 
         return acc;

src/core/world/settings-session-store.ts

@@ -62,9 +62,8 @@ export const createSettingsSessionStore = ( events: TypeEmitter<WorldEvents> ) =
     const store = createOperatableStore(
         createDeepStore<PartialSettings>( {
             initialState: sourceOfTruth.clone(),
-            validateMerge: ( newSettings, rhs ) =>
-                events.emit( "settings-changed", { settings: newSettings, rhs } ) !==
-                false,
+            onUpdate: ( newSettings, rhs ) =>
+                events.emit( "settings-changed", { settings: newSettings, rhs } ),
         } ),
         sourceOfTruth,
         ( path, state ) =>

src/image/loader/indexed-db-cache.ts

@@ -12,45 +12,58 @@ export const cacheDBStoreNames = ["general-casc-cache", "image-cache"] as const;
 
 export let appCacheDb: IDBDatabase;
 
+let _cacheWasOpened = false;
+
 export const initCacheDB = () =>
     new Promise((resolve, reject) => {
+        const _timeout = setTimeout(() => {
+            console.error("IndexedDB timeout");
+            reject(new Error("IndexedDB timeout"));
+        }, 1000);
+
         console.log("Opening IndexedDB");
         const dbReq = indexedDB.open(DB_NAME, DB_VERSION);
 
         dbReq.onblocked = () => {
+            clearTimeout(_timeout);
             console.error("IndexedDB blocked");
             reject(new Error("IndexedDB blocked"));
         };
 
         // Create the schema
         dbReq.onupgradeneeded = () => {
+            clearTimeout(_timeout);
             console.log("IndexedDB upgrade needed");
             appCacheDb = dbReq.result;
             for (const storeName of cacheDBStoreNames) {
                 if (!appCacheDb.objectStoreNames.contains(storeName)) {
                     appCacheDb.createObjectStore(storeName, { keyPath: "id" });
                 }
             }
+            _cacheWasOpened = true;
             resolve(undefined);
         };
 
         // Error handler
         dbReq.onerror = (error) => {
+            clearTimeout(_timeout);
             console.error(error);
             reject(error);
         };
 
         // Success handler
         dbReq.onsuccess = () => {
+            clearTimeout(_timeout);
             console.log("IndexedDB opened successfully");
             appCacheDb = dbReq.result;
+            _cacheWasOpened = true;
             resolve(undefined);
         };
     });
 
 export class IndexedDBCache {
     #storeName: CacheDBStoreName;
-    #enabled = true;
+    #enabled = _cacheWasOpened;
 
     constructor(storeName: CacheDBStoreName) {
         this.#storeName = storeName;
@@ -61,6 +74,9 @@ export class IndexedDBCache {
     }
 
     set enabled(value: boolean) {
+        if (_cacheWasOpened === false) {
+            return;
+        }
         if (value !== this.#enabled && value === false) {
             this.clear();
         }

src/stores/deep-store.ts

@@ -47,8 +47,17 @@ export function createDeepStore<T extends Record<string, any>>( {
 
     const getValue = ( path: string[] ) => lGet( store, path ) as unknown;
 
-    const setValue = ( path: string[], value: any ) => {
-        merge( lSet<DeepPartial<T>>( {}, path, value ), path, value );
+    /**
+     * Merge changes to our deep store
+     * Typically we want a copy so that it can be diffed against the change, but this incurs quite a cost
+     * So we provide the option to "silentUpdate" to avoid this cost. Only use if performance critical.
+     */
+    const setValue = ( path: string[], value: any, silentUpdate = false ) => {
+        if (silentUpdate) {
+            lSet<DeepPartial<T>>( store, path, value );
+        } else {
+            merge( lSet<DeepPartial<T>>( {}, path, value ), path, value );
+        }
     };
 
     return {
@@ -61,7 +70,7 @@ export function createDeepStore<T extends Record<string, any>>( {
 
 export interface DeepStore<T extends object> {
     getState: () => T;
-    setValue: ( path: string[], value: unknown ) => void;
+    setValue: ( path: string[], value: unknown, silentUpdate?: boolean ) => void;
     getValue: ( path: string[] ) => unknown;
     merge: ( rhs: DeepPartial<T> ) => void;
 }

src/stores/operatable-store.ts

@@ -7,7 +7,7 @@ import { SourceOfTruth } from "./source-of-truth";
 export type MutationVariable = ReturnType<ReturnType<typeof createMutationVariable>>;
 
 export const createMutationVariable =
-    ( operate: ( operation: Operation ) => void, getValue: ( path: string[] ) => unknown ) =>
+    ( operate: OperationRequest, getValue: ( path: string[] ) => unknown ) =>
     ( path: string[] ) => {
         const _data: {
             value: unknown;
@@ -19,10 +19,10 @@ export const createMutationVariable =
             operator: Operator.Set,
         };
 
-        const apply = ( operator: Operator, value?: any ) => {
+        const apply = ( operator: Operator, value?: any, silentUpdate = false ) => {
             _data.operator = operator;
             _data.value = value;
-            operate( _data );
+            operate( _data, x => x, silentUpdate );
         };
 
         const fn = function ( value?: unknown ) {
@@ -69,11 +69,50 @@ export const createMutationVariable =
              * Reset the value of the property to the default.
              */
             toggle: () => apply( Operator.Toggle ),
+
+            // silent update variants
+
+            $set: ( value: any ) => apply( Operator.Set, value, true ),
+
+            /**
+             * Increase the value of the property.
+             */
+            $inc: () => apply( Operator.Increase, null, true ),
+            /**
+             * Increase the value of the property. Loop around if the value is greater than the maximum.
+             */
+            $incCycle: () => apply( Operator.IncreaseCycle, null, true ),
+            /**
+             * Decrease the value of the property.
+             */
+            $dec: () => apply( Operator.Decrease, null, true ),
+            /**
+             * Decrease the value of the property. Loop around if the value is less than the minimum.
+             */
+            $decCycle: () => apply( Operator.DecreaseCycle, null, true ),
+            /**
+             * Set the value of the property to the minimum.
+             */
+            $min: () => apply( Operator.Min, null, true ),
+            /**
+             * Set the value of the property to the maximum.
+             */
+            $max: () => apply( Operator.Max, null, true ),
+            /**
+             * Reset the value of the property to the default.
+             */
+            $reset: () => apply( Operator.SetToDefault, null, true ),
+            /**
+             * Reset the value of the property to the default.
+             */
+            $toggle: () => apply( Operator.Toggle, null, true ),
         } );
     };
 
+type OperationRequest = ( action: Operation, transformPath?: ( path: string[] ) => string[], silentUpdate?: boolean ) => void;
+
 export type OperatableStore<T extends object> = DeepStore<T> & {
-    operate: ( action: Operation, transformPath?: ( path: string[] ) => string[] ) => void;
+    operate: OperationRequest;
     createVariable: ( path: string[] ) => MutationVariable;
     sourceOfTruth: SourceOfTruth<T>;
 };
@@ -98,7 +137,9 @@ export function createOperatableStore<T extends object>(
 
     const operate = (
         operation: Operation,
-        transformPath: ( path: string[] ) => string[] = ( x ) => x
+        // this should probably belong to the store itself
+        transformPath: ( path: string[] ) => string[] = ( x ) => x,
+        silentUpdate = false
     ) => {
         const path = transformPath( operation.path );
 
@@ -112,7 +153,8 @@ export function createOperatableStore<T extends object>(
                     field,
                     operation.value,
                     sourceOfTruth.getValue( path )
-                )
+                ),
+                silentUpdate
             );
         } else {
             log.warn( "Session field is no found." );

yarn.lock

@@ -2522,10 +2522,10 @@ camelcase@^6.2.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
-camera-controls@1.37.2:
-  version "1.37.2"
-  resolved "https://registry.yarnpkg.com/camera-controls/-/camera-controls-1.37.2.tgz#12d808c98b3fea1fffd72c8dfeb024f2495ab307"
-  integrity sha512-b+8DYJc/honm3b/PzjTQbVjsnkdgiDnI44/PRAWKlLhF0lzggGtaU9ZSGRM/lll2HkF0KN+OHx/ZN80wJmEbqA==
+camera-controls@2.7.3:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/camera-controls/-/camera-controls-2.7.3.tgz#99e0449f68d203bf5f98f6c4ac0021c10b5c13a8"
+  integrity sha512-L4mxjBd3u8qiOLozdWrH2P8ZybSsDXBF7iyNyqNEFJhPUkovmuARWR8JTc1B/qlclOIg6FvZZA/0uAZMMim0mw==
 
 caniuse-lite@^1.0.30001449:
   version "1.0.30001480"