From aef5d2f2eb94cf2c46cd620115b3b9725c389592 Mon Sep 17 00:00:00 2001 From: Chaoscaot Date: Sun, 19 May 2024 22:30:30 +0200 Subject: [PATCH] Refactoring --- .gitignore | 0 src/components/admin/App.svelte | 2 +- src/components/publics/PublicPreview.svelte | 15 +++++--- src/components/publics/XRayPreview.svelte | 14 ++------ src/content/config.ts | 1 + src/content/publics/frostbite.json | 4 +-- src/images/2024-03-24_20.59.03.png | Bin 3851946 -> 0 bytes src/images/2024-03-24_20.59.59.png | Bin 2402870 -> 0 bytes src/images/area_render_1_.png | Bin 1495213 -> 0 bytes src/images/area_render_2_.png | Bin 1765042 -> 0 bytes src/layouts/NavbarLayout.astro | 2 +- src/pages/index.astro | 2 +- src/pages/publics/[schem].astro | 4 +-- src/pages/publics/index.astro | 37 +++++++++++--------- 14 files changed, 42 insertions(+), 39 deletions(-) mode change 100755 => 100644 .gitignore delete mode 100644 src/images/2024-03-24_20.59.03.png delete mode 100644 src/images/2024-03-24_20.59.59.png delete mode 100644 src/images/area_render_1_.png delete mode 100644 src/images/area_render_2_.png diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 diff --git a/src/components/admin/App.svelte b/src/components/admin/App.svelte index 26a031d..9923513 100644 --- a/src/components/admin/App.svelte +++ b/src/components/admin/App.svelte @@ -63,5 +63,5 @@
- +
diff --git a/src/components/publics/PublicPreview.svelte b/src/components/publics/PublicPreview.svelte index 503540c..8934b83 100644 --- a/src/components/publics/PublicPreview.svelte +++ b/src/components/publics/PublicPreview.svelte @@ -22,8 +22,9 @@ import { GLTFLoader } from "three/addons/loaders/GLTFLoader.js"; import { OrbitControls } from "three/addons/controls/OrbitControls.js"; import {onDestroy, onMount} from "svelte"; + import { CollectionEntry } from "astro:content"; - export let file: string; + export let pub: CollectionEntry<"publics">; export let fov: number = 60; export let near: number = 1 export let far: number = 1000; @@ -40,6 +41,10 @@ let observer: ResizeObserver; onMount(() => { + if (!pub.data["3d"]) { + return; + } + scene = new THREE.Scene(); scene.background = new THREE.Color(0x171717); camera = new THREE.PerspectiveCamera(fov, 1, near, far); @@ -52,8 +57,8 @@ const loader = new GLTFLoader(); - loader.load(`/3d/${file}.glb`, (gltf) => { - let s = scene.add(gltf.scene); + loader.load(`/3d/${pub.id}.glb`, (gltf) => { + scene.add(gltf.scene); let cube_bbox = new THREE.Box3(); cube_bbox.setFromObject(gltf.scene); @@ -64,7 +69,9 @@ camera.position.set(0, center.y, distance); controls.update(); - }, undefined, console.log); + }, undefined, (e) => { + console.error(e); + }); div.append(renderer.domElement); diff --git a/src/components/publics/XRayPreview.svelte b/src/components/publics/XRayPreview.svelte index b458e98..1676343 100644 --- a/src/components/publics/XRayPreview.svelte +++ b/src/components/publics/XRayPreview.svelte @@ -20,29 +20,19 @@ -