From 985d4a424fb4c88435c7bcf0bb15383a825555f9 Mon Sep 17 00:00:00 2001 From: mina Date: Wed, 7 May 2025 18:09:47 +0200 Subject: [PATCH 1/4] Tages-Update --- package-lock.json | 40 ++-- .../view/[vorgang]/[tatort]/+page.svelte | 190 +++++++++++++++++- 2 files changed, 213 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index d2eafdb..dc9cd61 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1454,9 +1454,9 @@ } }, "node_modules/@sveltejs/kit": { - "version": "2.20.7", - "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.20.7.tgz", - "integrity": "sha512-dVbLMubpJJSLI4OYB+yWYNHGAhgc2bVevWuBjDj8jFUXIJOAnLwYP3vsmtcgoxNGUXoq0rHS5f7MFCsryb6nzg==", + "version": "2.20.8", + "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.20.8.tgz", + "integrity": "sha512-ep9qTxL7WALhfm0kFecL3VHeuNew8IccbYGqv5TqL/KSqWRKzEgDG8blNlIu1CkLTTua/kHjI+f5T8eCmWIxKw==", "dependencies": { "@types/cookie": "^0.6.0", "cookie": "^0.6.0", @@ -3242,10 +3242,9 @@ } }, "node_modules/fdir": { - "version": "6.4.3", - "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.3.tgz", - "integrity": "sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==", - "license": "MIT", + "version": "6.4.4", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz", + "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==", "peerDependencies": { "picomatch": "^3 || ^4" }, @@ -5959,6 +5958,21 @@ "dev": true, "license": "MIT" }, + "node_modules/tinyglobby": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz", + "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==", + "dependencies": { + "fdir": "^6.4.4", + "picomatch": "^4.0.2" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/SuperchupuDev" + } + }, "node_modules/tinypool": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.2.tgz", @@ -6227,14 +6241,16 @@ "license": "MIT" }, "node_modules/vite": { - "version": "6.2.6", - "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.6.tgz", - "integrity": "sha512-9xpjNl3kR4rVDZgPNdTL0/c6ao4km69a/2ihNQbcANz8RuCOK3hQBmLSJf3bRKVQjVMda+YvizNE8AwvogcPbw==", - "license": "MIT", + "version": "6.3.5", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz", + "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==", "dependencies": { "esbuild": "^0.25.0", + "fdir": "^6.4.4", + "picomatch": "^4.0.2", "postcss": "^8.5.3", - "rollup": "^4.30.1" + "rollup": "^4.34.9", + "tinyglobby": "^0.2.13" }, "bin": { "vite": "bin/vite.js" diff --git a/src/routes/(angemeldet)/view/[vorgang]/[tatort]/+page.svelte b/src/routes/(angemeldet)/view/[vorgang]/[tatort]/+page.svelte index a80e599..56d07ad 100644 --- a/src/routes/(angemeldet)/view/[vorgang]/[tatort]/+page.svelte +++ b/src/routes/(angemeldet)/view/[vorgang]/[tatort]/+page.svelte @@ -3,22 +3,53 @@ height: 100%; width: 100%; } + + .vertical-slider { + writing-mode: bt-lr; /* Schreibt von unten nach oben (Vertikale Darstellung) */ + transform: rotate(270deg); /* Slider um 270° drehen */ + height: 200px; + } + + + +
- +
+ +
+ + + + + +
+ + +
+ + + + +
+ +
+ + + +
+ +
+ + +
+
+ +
+ +
+ + + +
+
+ + + +
+
+ + + +
+
+ +
+ + + +
From f3850649c73c2e4974c160689910d30a52ad1f02 Mon Sep 17 00:00:00 2001 From: mina Date: Thu, 8 May 2025 15:35:24 +0200 Subject: [PATCH 2/4] zwischenspeichern --- .../view/[vorgang]/[tatort]/+page.svelte | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/routes/(angemeldet)/view/[vorgang]/[tatort]/+page.svelte b/src/routes/(angemeldet)/view/[vorgang]/[tatort]/+page.svelte index 56d07ad..0f5ed9d 100644 --- a/src/routes/(angemeldet)/view/[vorgang]/[tatort]/+page.svelte +++ b/src/routes/(angemeldet)/view/[vorgang]/[tatort]/+page.svelte @@ -63,8 +63,8 @@ function onResetView() { // cameraOrbit = '0deg 0deg 50m'; // cameraTarget ="0m 0m 0m" - console.log("show cameraOrbit:", modelViewer.getAttribute('camera-orbit'), modelViewer.cameraOrbit, modelViewer.getAttribute('rotation')) - console.log("Camera-orbit: ",modelViewer.getAttribute('camera-orbit'), "camera-target: ",modelViewer.getAttribute('camera-target'), "object-rotation: ", modelViewer.getAttribute('orientation')) + console.log("show cameraOrbit:", modelViewer.getCameraOrbit(), modelViewer.cameraOrbit, modelViewer.getDimensions()) + console.log("Camera-orbit: ",modelViewer.getAttribute('camera-orbit'), "camera-target: ",modelViewer.getAttribute('camera-target'), "object-rotation: ", modelViewer.getAttribute('rotation')) // modelViewer.cameraOrbit = cameraOrbit; // modelViewer.cameraTarget = cameraTarget; @@ -76,7 +76,7 @@ */ function updateCameraOrbit(newOrbit) { - cameraTarget ="0m 0m 0m" + // cameraTarget ="0m 0m 0m" console.log("update X",modelViewer.cameraOrbit,"target:", modelViewer.cameraTarget, newOrbit) modelViewer.cameraOrbit = newOrbit; modelViewer.cameraTarget = cameraTarget; @@ -84,7 +84,7 @@ } function slideCameraOrbit(){ - modelViewer.cameraOrbit =`${cameraAzimuth}deg ${cameraPolar}deg ${cameraZoom}m`; + modelViewer.cameraOrbit =`${cameraAzimuth}deg ${cameraPolar}deg ${cameraZoom}%`; } function slideRotation(){ @@ -113,7 +113,7 @@
@@ -211,10 +211,11 @@ src={data.url} bind:this={modelViewer} shadow-intensity="50" - + touch-action="pan-x" + camera-controls orientation={`${xRotation}deg ${yRotation}deg ${zRotation}deg`} camera-target="0m 0m 0m" - camera-orbit = {`${cameraAzimuth}deg ${cameraPolar}deg ${cameraZoom}m`} + camera-orbit = {`${cameraAzimuth}deg ${cameraPolar}deg ${cameraZoom}`} on:progress={onProgress} > From 8d71633f501273bbbe20d588c0543002667d8a36 Mon Sep 17 00:00:00 2001 From: mina Date: Mon, 12 May 2025 16:22:27 +0200 Subject: [PATCH 3/4] Update Buttons in model viewer --- .../view/[vorgang]/[tatort]/+page.svelte | 207 ++++++++++-------- 1 file changed, 111 insertions(+), 96 deletions(-) diff --git a/src/routes/(angemeldet)/view/[vorgang]/[tatort]/+page.svelte b/src/routes/(angemeldet)/view/[vorgang]/[tatort]/+page.svelte index 0f5ed9d..9cb348c 100644 --- a/src/routes/(angemeldet)/view/[vorgang]/[tatort]/+page.svelte +++ b/src/routes/(angemeldet)/view/[vorgang]/[tatort]/+page.svelte @@ -10,6 +10,9 @@ height: 200px; } + .model{ + height: calc(100%-84px) + } @@ -61,13 +64,23 @@ function onResetView() { - // cameraOrbit = '0deg 0deg 50m'; - // cameraTarget ="0m 0m 0m" + cameraOrbit = '0deg 0deg 0m'; + cameraTarget ="0m 0m 0m" + console.log("show cameraOrbit:", modelViewer.getCameraOrbit(), modelViewer.cameraOrbit, modelViewer.getDimensions()) console.log("Camera-orbit: ",modelViewer.getAttribute('camera-orbit'), "camera-target: ",modelViewer.getAttribute('camera-target'), "object-rotation: ", modelViewer.getAttribute('rotation')) - // modelViewer.cameraOrbit = cameraOrbit; - // modelViewer.cameraTarget = cameraTarget; + modelViewer.cameraOrbit = cameraOrbit; + modelViewer.cameraTarget = cameraTarget; + xRotation = yRotation = zRotation = 0; + cameraOrbit = '0deg 0deg 0%'; + cameraTarget ="0m 0m 0m"; + fieldOfView = '0deg'; + + cameraAzimuth = 0; + cameraPolar = 0; + cameraZoom = 0; + } @@ -107,96 +120,8 @@ class="relative cursor-default justify-start py-2 pl-3 pr-10 text-left" > --> -
-
-
- -
- - - - - -
- - -
- - - - -
- -
- - - -
- -
- - -
-
- -
- -
- - - -
-
- - - -
-
- - - -
-
- -
+
+ +
+
+ +
+ + + + + +
+ + +
+ + + + +
+ +
+ + + +
+ +
+ + +
+
+ +
+ +
+ + + +
+
+ + + +
+
+ + + +
+
+ +
Date: Wed, 14 May 2025 17:08:30 +0200 Subject: [PATCH 4/4] update des Tages CameraSteuerung --- .../(angemeldet)/view/[vorgang]/[tatort]/+page.svelte | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/routes/(angemeldet)/view/[vorgang]/[tatort]/+page.svelte b/src/routes/(angemeldet)/view/[vorgang]/[tatort]/+page.svelte index 9cb348c..e254045 100644 --- a/src/routes/(angemeldet)/view/[vorgang]/[tatort]/+page.svelte +++ b/src/routes/(angemeldet)/view/[vorgang]/[tatort]/+page.svelte @@ -33,7 +33,7 @@ let progress = 0; let hideProgressScreen = false; - let cameraOrbit = '0deg 0deg 0m'; + let cameraOrbit = '0deg 0deg 0%'; let cameraTarget ="0m 0m 0m"; let fieldOfView = '0deg'; @@ -64,8 +64,7 @@ function onResetView() { - cameraOrbit = '0deg 0deg 0m'; - cameraTarget ="0m 0m 0m" + console.log("show cameraOrbit:", modelViewer.getCameraOrbit(), modelViewer.cameraOrbit, modelViewer.getDimensions()) console.log("Camera-orbit: ",modelViewer.getAttribute('camera-orbit'), "camera-target: ",modelViewer.getAttribute('camera-target'), "object-rotation: ", modelViewer.getAttribute('rotation')) @@ -73,7 +72,7 @@ modelViewer.cameraOrbit = cameraOrbit; modelViewer.cameraTarget = cameraTarget; xRotation = yRotation = zRotation = 0; - cameraOrbit = '0deg 0deg 0%'; + cameraOrbit = '0deg 0deg 0m'; cameraTarget ="0m 0m 0m"; fieldOfView = '0deg';