From 9fdb1de483de1dfbb6c87880c92660deff9a008a Mon Sep 17 00:00:00 2001
From: Rune Harlyk <rune@harlyk.dk>
Date: Tue, 6 Feb 2024 19:21:15 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=85=20Adds=20alias=20for=20common=20pa?=
 =?UTF-8?q?ths?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/components/Controls.svelte                 |  6 +++---
 app/src/components/Topbar.svelte                   |  4 ++--
 .../{Model/ModelView.svelte => Views/Model.svelte} | 14 +++++++-------
 app/src/{ => components}/Views/Stream.svelte       |  2 +-
 app/src/{components/Model => lib}/sceneBuilder.ts  | 12 +++++++++---
 app/src/routes/Config.svelte                       |  4 ++--
 app/src/routes/Controller.svelte                   | 10 +++++-----
 app/tsconfig.json                                  |  9 ++++++++-
 app/vite.config.ts                                 | 11 ++++++++++-
 9 files changed, 47 insertions(+), 25 deletions(-)
 rename app/src/components/{Model/ModelView.svelte => Views/Model.svelte} (95%)
 rename app/src/{ => components}/Views/Stream.svelte (90%)
 rename app/src/{components/Model => lib}/sceneBuilder.ts (96%)

diff --git a/app/src/components/Controls.svelte b/app/src/components/Controls.svelte
index 5932c3e..9ef3569 100644
--- a/app/src/components/Controls.svelte
+++ b/app/src/components/Controls.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
 	import nipplejs from 'nipplejs';
 	import { onMount } from 'svelte';
-	import { throttler } from '../lib/throttle';
-	import { socket } from '../lib/socket';
-	import { emulateModel, input, outControllerData } from '../lib/store';
+	import { throttler } from '$lib/throttle';
+	import { socket } from '$lib/socket';
+	import { emulateModel, input, outControllerData } from '$lib/store';
 
 	let throttle = new throttler();
 	let left: nipplejs.JoystickManager;
diff --git a/app/src/components/Topbar.svelte b/app/src/components/Topbar.svelte
index 232f46a..90c238e 100644
--- a/app/src/components/Topbar.svelte
+++ b/app/src/components/Topbar.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-	import { isConnected, status, socket } from '../lib/socket';
+	import { isConnected, status, socket } from '$lib/socket';
 	import { Icon, Bars3, XMark, Power, Battery100, Signal, SignalSlash } from 'svelte-hero-icons';
-	import { emulateModel } from '../lib/store';
+	import { emulateModel } from '$lib/store';
     import { Link, useLocation } from 'svelte-routing'
 
     const views = ["Virtual environment", "Robot camera"]
diff --git a/app/src/components/Model/ModelView.svelte b/app/src/components/Views/Model.svelte
similarity index 95%
rename from app/src/components/Model/ModelView.svelte
rename to app/src/components/Views/Model.svelte
index 3f91d4e..7d0496e 100644
--- a/app/src/components/Model/ModelView.svelte
+++ b/app/src/components/Views/Model.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
 import { onDestroy, onMount } from 'svelte';
 import { CanvasTexture, CircleGeometry, Mesh, MeshBasicMaterial} from 'three';
-import {socket, angles, mpu } from '../../lib/socket'
-import { lerp } from '../../lib/utils';
+import {socket, angles, mpu } from '$lib/socket'
+import { lerp } from '$lib/utils';
 import uzip from 'uzip';
-import { model, outControllerData } from '../../lib/store';
-import { ForwardKinematics } from '../../lib/kinematic';
-import location from '../../lib/location';
-import FileCache from '../../lib/cache';
-import SceneBuilder from './sceneBuilder';
+import { model, outControllerData } from '$lib/store';
+import { ForwardKinematics } from '$lib/kinematic';
+import location from '$lib/location';
+import FileCache from '$lib/cache';
+import SceneBuilder from '$lib/sceneBuilder';
 
 let sceneManager:SceneBuilder
 let canvas: HTMLCanvasElement, streamCanvas: HTMLCanvasElement, stream: HTMLImageElement
diff --git a/app/src/Views/Stream.svelte b/app/src/components/Views/Stream.svelte
similarity index 90%
rename from app/src/Views/Stream.svelte
rename to app/src/components/Views/Stream.svelte
index b54cce4..5da0b82 100644
--- a/app/src/Views/Stream.svelte
+++ b/app/src/components/Views/Stream.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { onDestroy } from 'svelte';
-	import location from '../lib/location';
+	import location from '$lib/location';
 
 	let videoStream = `//${location}/api/stream`;
 
diff --git a/app/src/components/Model/sceneBuilder.ts b/app/src/lib/sceneBuilder.ts
similarity index 96%
rename from app/src/components/Model/sceneBuilder.ts
rename to app/src/lib/sceneBuilder.ts
index b21dfe5..51c64fe 100644
--- a/app/src/components/Model/sceneBuilder.ts
+++ b/app/src/lib/sceneBuilder.ts
@@ -23,9 +23,8 @@ import { Mesh,
 } from "three";
 import { Sky } from 'three/addons/objects/Sky.js';
 import { OrbitControls } from "three/examples/jsm/controls/OrbitControls";
-import URDFLoader, { type URDFMimicJoint } from "urdf-loader";
+import { type URDFMimicJoint } from "urdf-loader";
 import { PointerURDFDragControls } from 'urdf-loader/src/URDFDragControls'
-import { XacroLoader } from "xacro-parser";
 
 export const addScene = () => new Scene()
 
@@ -56,6 +55,13 @@ type directionalLight = position & light
 
 type gridHelperOptions = gridOptions & position
 
+function calculateCurrentSunElevation() {
+    let now = new Date();
+    let decimalTime = now.getHours() + now.getMinutes() / 60;
+    let normalizedTime = ((decimalTime - 6) % 12) / 6 - 1;
+    return 10 * Math.sin(normalizedTime * Math.PI);
+}
+
 export default class SceneBuilder {
     public scene: Scene
     public camera: PerspectiveCamera
@@ -98,7 +104,7 @@ export default class SceneBuilder {
             rayleigh: 3,
             mieCoefficient: 0.005,
             mieDirectionalG: 0.7,
-            elevation: -10,
+            elevation: calculateCurrentSunElevation(),
             azimuth: 180,
             exposure: this.renderer.toneMappingExposure
         };
diff --git a/app/src/routes/Config.svelte b/app/src/routes/Config.svelte
index 557633f..4f52ecb 100644
--- a/app/src/routes/Config.svelte
+++ b/app/src/routes/Config.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
     import { Card, CardHeader } from "../components/index";
-	import { socket, isConnected } from "../lib/socket";
-    import { throttler } from "../lib/throttle";
+	import { socket, isConnected } from "$lib/socket";
+    import { throttler } from "$lib/throttle";
 
     let throttle = new throttler();
     let throttle_timing = 25;
diff --git a/app/src/routes/Controller.svelte b/app/src/routes/Controller.svelte
index bbc1d3c..e6108e1 100644
--- a/app/src/routes/Controller.svelte
+++ b/app/src/routes/Controller.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
-	import Stream from '../Views/Stream.svelte';
-	import Controls from '../components/Controls.svelte';
-    import ModelView from '../components/Model/ModelView.svelte';
-	import { emulateModel } from '../lib/store';
+	import Stream from '$components/Views/Stream.svelte';
+    import Model from '$components/Views/Model.svelte';
+	import Controls from '$components/Controls.svelte';
+	import { emulateModel } from '$lib/store';
 </script>
 
 <div class="flex justify-center items-center w-full h-full">
     {#if $emulateModel}
-        <ModelView />
+        <Model />
     {:else}
         <Stream />
     {/if}
diff --git a/app/tsconfig.json b/app/tsconfig.json
index 319ff21..2e1fbc5 100644
--- a/app/tsconfig.json
+++ b/app/tsconfig.json
@@ -14,7 +14,14 @@
 		 */
 		"allowJs": true,
 		"checkJs": true,
-		"isolatedModules": true
+		"isolatedModules": true,
+        "paths": {
+			"$lib/*": ["./src/lib/*"],
+			"$utils/*": ["./src/utils/*"],
+			"$components/*": ["./src/components/*"],
+			"$stores/*": ["./src/stores/*"]
+		}
+
 	},
 	"include": ["src/**/*.d.ts", "src/**/*.ts", "src/**/*.js", "src/**/*.svelte"],
 	"references": [{ "path": "./tsconfig.node.json" }]
diff --git a/app/vite.config.ts b/app/vite.config.ts
index 3e9328b..9c50df8 100644
--- a/app/vite.config.ts
+++ b/app/vite.config.ts
@@ -2,6 +2,7 @@ import { defineConfig } from 'vite';
 import { svelte } from '@sveltejs/vite-plugin-svelte';
 import { viteSingleFile } from 'vite-plugin-singlefile';
 import viteCompression from 'vite-plugin-compression';
+import path from 'path'
 
 const forEmbedded = process.env.FOR_EMBEDDED == 'true'
 
@@ -12,5 +13,13 @@ export default defineConfig({
 	build: {
 		outDir: forEmbedded ? '../data': './build',
 		emptyOutDir: true
-	}
+	},
+    resolve: {
+        alias: {
+            '$lib': path.resolve('./src/lib/'),
+            '$components': path.resolve('./src/components'),
+            '$utils': path.resolve('./src/utils'),
+            '$stores': path.resolve('./src/stores'),
+        },
+    },
 });