feat(soba): adjust loaders

nartc · Apr 15, 2022 · 02dbfb7 · 02dbfb7
1 parent 1a8fa0f
commit 02dbfb7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/libs/soba/loaders/src/lib/loader/loader.ts b/libs/soba/loaders/src/lib/loader/loader.ts
@@ -1,4 +1,4 @@
-import { NgtStore, tapEffect } from '@angular-three/core';
+import { NgtComponentStore, tapEffect } from '@angular-three/core';
 import { CommonModule } from '@angular/common';
 import {
     AfterViewInit,
@@ -9,7 +9,7 @@ import {
     NgZone,
     ViewChild,
 } from '@angular/core';
-import { timer } from 'rxjs';
+import { Observable, timer } from 'rxjs';
 import { NgtSobaProgress } from '../progress/progress';
 
 interface NgtSobaLoaderState {
@@ -103,10 +103,18 @@ interface NgtSobaLoaderState {
     providers: [NgtSobaProgress],
 })
 export class NgtSobaLoader
-    extends NgtStore<NgtSobaLoaderState>
+    extends NgtComponentStore<NgtSobaLoaderState>
     implements AfterViewInit
 {
-    readonly vm$ = this.select(
+    readonly vm$: Observable<{
+        shown: boolean;
+        containerClass: string | undefined;
+        innerContainerClass: string | undefined;
+        dataClass: string | undefined;
+        barClass: string | undefined;
+        active: boolean;
+        progress: number;
+    }> = this.select(
         this.select((s) => s.shown),
         this.select((s) => s.loaderConfig),
         this.sobaProgress.select((s) => s.active),

diff --git a/libs/soba/loaders/src/lib/progress/progress.ts b/libs/soba/loaders/src/lib/progress/progress.ts
@@ -1,4 +1,4 @@
-import { NgtStore } from '@angular-three/core';
+import { NgtComponentStore } from '@angular-three/core';
 import { Injectable } from '@angular/core';
 import * as THREE from 'three';
 
@@ -12,7 +12,7 @@ interface NgtSobaProgressResult {
 }
 
 @Injectable()
-export class NgtSobaProgress extends NgtStore<NgtSobaProgressResult> {
+export class NgtSobaProgress extends NgtComponentStore<NgtSobaProgressResult> {
     constructor() {
         super();
         let saveLastTotalLoaded = 0;

diff --git a/libs/soba/loaders/src/lib/texture-loader/texture-loader.ts b/libs/soba/loaders/src/lib/texture-loader/texture-loader.ts
@@ -1,4 +1,4 @@
-import { NgtCanvasStore, NgtLoader } from '@angular-three/core';
+import { NgtLoader, NgtStore } from '@angular-three/core';
 import { Injectable } from '@angular/core';
 import { defer, map, Observable, tap } from 'rxjs';
 import * as THREE from 'three';
@@ -8,10 +8,7 @@ export const IsObject = (url: any): url is Record<string, string> =>
 
 @Injectable()
 export class NgtTextureLoader {
-    constructor(
-        private canvasStore: NgtCanvasStore,
-        private loader: NgtLoader
-    ) {}
+    constructor(private store: NgtStore, private loader: NgtLoader) {}
 
     load<TInput extends string | string[] | Record<string, string>>(
         input: TInput
@@ -29,10 +26,10 @@ export class NgtTextureLoader {
             )
         ).pipe(
             tap((textures: THREE.Texture | THREE.Texture[]) => {
-                const renderer = this.canvasStore.get((s) => s.renderer);
-                if (renderer) {
+                const gl = this.store.get((s) => s.gl);
+                if (gl) {
                     (Array.isArray(textures) ? textures : [textures]).forEach(
-                        renderer.initTexture.bind(renderer)
+                        gl.initTexture.bind(gl)
                     );
                 }
             }),