loading

viewer/src/lib/splat.js/{core → cameras}/Camera.ts

@@ -1,7 +1,12 @@
-import { Object3D } from "./Object3D";
+import { Object3D } from "../core/Object3D";
+import { Matrix4 } from "../math/Matrix4";
 
 export class Camera extends Object3D {
+    projectionMatrix: Matrix4;
+
     constructor() {
         super();
+
+        this.projectionMatrix = new Matrix4();
     }
 }

viewer/src/lib/splat.js/cameras/PerspectiveCamera.ts

@@ -1,4 +1,4 @@
-import { Camera } from "../core/Camera";
+import { Camera } from "./Camera";
 import { Matrix4 } from "../math/Matrix4";
 
 export class PerspectiveCamera extends Camera {
@@ -8,8 +8,6 @@ export class PerspectiveCamera extends Camera {
     near: number;
     far: number;
 
-    projectionMatrix: Matrix4;
-
     constructor(fx: number = 1132, fy: number = 1132, near: number = 0.1, far: number = 100) {
         super();
 
@@ -17,8 +15,6 @@ export class PerspectiveCamera extends Camera {
         this.fy = fy;
         this.near = near;
         this.far = far;
-
-        this.projectionMatrix = new Matrix4();
     }
 
     updateProjectionMatrix(width: number, height: number): void {

viewer/src/lib/splat.js/core/Renderer.ts

@@ -1,5 +1,6 @@
-import type { Camera } from "./Camera";
+import type { Camera } from "../cameras/Camera";
 
 export interface Renderer {
     render(camera: Camera): void;
+    setData(data: Uint8Array): void;
 }

viewer/src/lib/splat.js/index.ts

@@ -1,4 +1,4 @@
-export * from "./core/Camera";
+export * from "./cameras/Camera";
 export * from "./core/Renderer";
 
 export * from "./loaders/Loader";

viewer/src/lib/splat.js/loaders/Loader.ts

@@ -11,18 +11,22 @@ export class Loader {
             throw new Error(req.status + " Unable to load " + req.url);
         }
 
-        const rowLength = 3 * 4 + 3 * 4 + 4 + 4;
         const reader = req.body!.getReader();
         const contentLength = parseInt(req.headers.get("content-length") as string);
-        const splatData = new Uint8Array(contentLength);
+        const data = new Uint8Array(contentLength);
 
         let bytesRead = 0;
-        let lastVertexCount = -1;
-        let stopLoading = false;
 
         while (true) {
             const { done, value } = await reader.read();
             if (done) break;
+
+            data.set(value, bytesRead);
+            bytesRead += value.length;
+
+            onProgress?.(bytesRead / contentLength);
         }
+
+        renderer.setData(data);
     }
 }

viewer/src/lib/splat.js/renderers/WebGLRenderer.ts

@@ -1,4 +1,4 @@
-import type { Camera } from "../core/Camera";
+import type { Camera } from "../cameras/Camera";
 import type { Renderer } from "../core/Renderer";
 
 export class WebGLRenderer implements Renderer {
@@ -10,4 +10,8 @@ export class WebGLRenderer implements Renderer {
     }
 
     render(camera: Camera): void {}
+
+    setData(data: Uint8Array): void {
+        console.log("setData", data);
+    }
 }

viewer/src/routes/viewer/[slug]/+page.svelte

@@ -2,7 +2,7 @@
     import { onMount, onDestroy } from "svelte";
     import type { IViewer } from "./IViewer";
     import { BabylonViewer } from "./BabylonViewer";
-    import { SplatViewer } from "./SplatViewer.Legacy";
+    import { SplatViewer } from "./SplatViewer";
 
     export let data: {
         scene: {

viewer/src/routes/viewer/[slug]/SplatViewer.ts

@@ -4,11 +4,13 @@ import * as SPLAT from "$lib/splat.js";
 export class SplatViewer implements IViewer {
     renderer: SPLAT.Renderer;
 
-    constructor() {
-        this.renderer = new SPLAT.WebGLRenderer();
+    constructor(canvas: HTMLCanvasElement) {
+        this.renderer = new SPLAT.WebGLRenderer(canvas);
     }
 
-    async loadScene(url: string, onProgress?: (progress: number) => void) {}
+    async loadScene(url: string, onProgress?: (progress: number) => void) {
+        await SPLAT.Loader.LoadAsync(url, this.renderer, onProgress);
+    }
 
     dispose() {}