From 7ddb1809496c15a90cf2f1298d0253b13f976c16 Mon Sep 17 00:00:00 2001
From: Lunga-Ntando-Ndlovu <u22525697@tuks.co.za>
Date: Mon, 30 Sep 2024 21:44:00 +0200
Subject: [PATCH 1/2] Fixed the tweakpane positioning

---
 .../lib/components/sandbox/c_environment/Player.svelte |  2 +-
 .../components/sandbox/c_environment/Scene_2.svelte    |  8 +++++---
 .../[workspace]/environments/simulation/+page@.svelte  | 10 +++++++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/src/lib/components/sandbox/c_environment/Player.svelte b/src/src/lib/components/sandbox/c_environment/Player.svelte
index 77c71f3b..f08582ad 100644
--- a/src/src/lib/components/sandbox/c_environment/Player.svelte
+++ b/src/src/lib/components/sandbox/c_environment/Player.svelte
@@ -222,7 +222,7 @@
 				const spotTarget = cam.position.clone().add(direction.multiplyScalar(5));
 
 				// Move the target slightly up on the Y-axis to point above the player's view
-				spotTarget.y += 1.0; // Adjust this value to move it higher
+				spotTarget.y += 1.0;
 
 				torchLight.target.position.copy(spotTarget);
 				torchLight.target.updateMatrixWorld();
diff --git a/src/src/lib/components/sandbox/c_environment/Scene_2.svelte b/src/src/lib/components/sandbox/c_environment/Scene_2.svelte
index a5cd8ab1..8e5ab44b 100644
--- a/src/src/lib/components/sandbox/c_environment/Scene_2.svelte
+++ b/src/src/lib/components/sandbox/c_environment/Scene_2.svelte
@@ -16,15 +16,17 @@
 	scene.backgroundIntensity = 0.02;
 </script>
 
-<Pane position="fixed" title="3D Environment Controls" x={1300} y={80}>
+<Pane position="fixed" title="3D Environment Controls" x={1160} y={30+20} scale ={1}
+width={256}>
 	<Text value="Use the 'WASD' keys to move around" disabled />
 	<Text value="Press escape 'Esc' to exit the scene" disabled />
 	<Text value="Use the mouse to look around" disabled />
 	<Text value="Press 'E' to interact with objects" disabled />
-	<Text value="Press to toggle the Torch" disabled />
+	<Text value="Press 'L' to toggle the Torch" disabled />
 </Pane>
 
-<Pane position="fixed" title="3D Environment Controls" x={1300} y={240}>
+<Pane position="fixed" title="3D Environment Controls" x={1160} y={210+20} scale ={1}
+width={256}>
 	<Text value="Press 'O' to exit stage" disabled />
 </Pane>
 
diff --git a/src/src/routes/(app)/workspaces/[workspace]/environments/simulation/+page@.svelte b/src/src/routes/(app)/workspaces/[workspace]/environments/simulation/+page@.svelte
index d72c93da..a2efe53c 100644
--- a/src/src/routes/(app)/workspaces/[workspace]/environments/simulation/+page@.svelte
+++ b/src/src/routes/(app)/workspaces/[workspace]/environments/simulation/+page@.svelte
@@ -42,17 +42,21 @@
 	</div>
 {/if}
 
-<main class="webgl h-screen bg-black">
+
 	{#if stagePicked}
-		<Canvas>
+	<div class="webgl h-screen w-screen bg-black">
+		<Canvas >
 			<!-- <Menu/> -->
 			<World>
 				<MiningStage />
 			</World>
 		</Canvas>
+	</div>
 	{:else}
+	<div class="webgl h-screen bg-black">
 		<Canvas>
 			<StarterScene />
 		</Canvas>
+	</div>
 	{/if}
-</main>
+

From 3c54d5aed9f772f356424f2b1b3296eebe51817a Mon Sep 17 00:00:00 2001
From: Lunga-Ntando-Ndlovu <u22525697@tuks.co.za>
Date: Mon, 30 Sep 2024 21:54:53 +0200
Subject: [PATCH 2/2] linter

---
 .../components/sandbox/c_environment/Scene_2.svelte    |  6 ++----
 .../[workspace]/environments/simulation/+page@.svelte  | 10 ++++------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/src/lib/components/sandbox/c_environment/Scene_2.svelte b/src/src/lib/components/sandbox/c_environment/Scene_2.svelte
index 8e5ab44b..b9e96ec9 100644
--- a/src/src/lib/components/sandbox/c_environment/Scene_2.svelte
+++ b/src/src/lib/components/sandbox/c_environment/Scene_2.svelte
@@ -16,8 +16,7 @@
 	scene.backgroundIntensity = 0.02;
 </script>
 
-<Pane position="fixed" title="3D Environment Controls" x={1160} y={30+20} scale ={1}
-width={256}>
+<Pane position="fixed" title="3D Environment Controls" x={1160} y={30 + 20} scale={1} width={256}>
 	<Text value="Use the 'WASD' keys to move around" disabled />
 	<Text value="Press escape 'Esc' to exit the scene" disabled />
 	<Text value="Use the mouse to look around" disabled />
@@ -25,8 +24,7 @@ width={256}>
 	<Text value="Press 'L' to toggle the Torch" disabled />
 </Pane>
 
-<Pane position="fixed" title="3D Environment Controls" x={1160} y={210+20} scale ={1}
-width={256}>
+<Pane position="fixed" title="3D Environment Controls" x={1160} y={210 + 20} scale={1} width={256}>
 	<Text value="Press 'O' to exit stage" disabled />
 </Pane>
 
diff --git a/src/src/routes/(app)/workspaces/[workspace]/environments/simulation/+page@.svelte b/src/src/routes/(app)/workspaces/[workspace]/environments/simulation/+page@.svelte
index a2efe53c..0e625eba 100644
--- a/src/src/routes/(app)/workspaces/[workspace]/environments/simulation/+page@.svelte
+++ b/src/src/routes/(app)/workspaces/[workspace]/environments/simulation/+page@.svelte
@@ -42,21 +42,19 @@
 	</div>
 {/if}
 
-
-	{#if stagePicked}
+{#if stagePicked}
 	<div class="webgl h-screen w-screen bg-black">
-		<Canvas >
+		<Canvas>
 			<!-- <Menu/> -->
 			<World>
 				<MiningStage />
 			</World>
 		</Canvas>
 	</div>
-	{:else}
+{:else}
 	<div class="webgl h-screen bg-black">
 		<Canvas>
 			<StarterScene />
 		</Canvas>
 	</div>
-	{/if}
-
+{/if}