Fixed ESLint issue + updated so theme pulls background colors properly

Autodesk · Jun 27, 2024 · 1f93a25 · 1f93a25
1 parent d037118
commit 1f93a25
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 10 deletions.
diff --git a/fission/src/Synthesis.tsx b/fission/src/Synthesis.tsx
@@ -53,6 +53,7 @@ import ManageAssembliesModal from '@/modals/spawning/ManageAssembliesModal.tsx';
 import World from '@/systems/World.ts';
 import { AddRobotsModal, AddFieldsModal, SpawningModal } from '@/modals/spawning/SpawningModals.tsx';
 import ImportMirabufModal from '@/modals/mirabuf/ImportMirabufModal.tsx';
+import Skybox from './ui/components/Skybox.tsx';
 
 const DEFAULT_MIRA_PATH = "/api/mira/Robots/Team 2471 (2018)_v7.mira"
 
@@ -130,6 +131,7 @@ function Synthesis() {
 
     return (
         <AnimatePresence>
+            <Skybox key="123"/>
             <TooltipControlProvider
                 showTooltip={(type: TooltipType, controls?: TooltipControl[], duration: number = TOOLTIP_DURATION) => {
                     showTooltip(type, controls, duration)

diff --git a/fission/src/Window.d.ts b/fission/src/Window.d.ts
@@ -1,3 +1,6 @@
+import { Theme } from "@mui/material"
+
 declare interface Window {
     setAuthCode(code: string): void
+    getTheme(): Theme;
 }
diff --git a/fission/src/systems/scene/SceneRenderer.ts b/fission/src/systems/scene/SceneRenderer.ts
@@ -4,6 +4,7 @@ import WorldSystem from '../WorldSystem';
 
 import vertexShader from '@/shaders/vertex.glsl';
 import fragmentShader from '@/shaders/fragment.glsl';
+import { Theme } from '@/ui/ThemeContext';
 
 const CLEAR_COLOR = 0x121212
 const GROUND_COLOR = 0x73937e
@@ -80,27 +81,23 @@ class SceneRenderer extends WorldSystem {
         this._scene.add(ground);
 
         // skybox
-        const currentTheme = (window as any).getTheme();
-        console.log('Current Theme:', currentTheme['Background']['color']['r']);
-
         const geometry = new THREE.SphereGeometry(1000);
         const material = new THREE.ShaderMaterial({
             vertexShader: vertexShader,
             fragmentShader: fragmentShader,
             side: THREE.BackSide,
             uniforms: {
-                rColor: { value: currentTheme['Background']['color']['r']},
-                gColor: { value: currentTheme['Background']['color']['g']},
-                bColor: { value: currentTheme['Background']['color']['b'] },
+                rColor: { value: 1.0 },
+                gColor: { value: 1.0 },
+                bColor: { value: 1.0 },
             }
         });
 
-        this._skybox = new THREE.Mesh(geometry, material);
+
+        this._skybox = new THREE.Mesh(geometry, material); 
         this._skybox.receiveShadow = false;
         this._skybox.castShadow = false;
         this.scene.add(this._skybox); 
-
-
     }
 
     public UpdateCanvasSize() {
@@ -167,6 +164,15 @@ class SceneRenderer extends WorldSystem {
         })
     }
 
+    public updateSkyboxColors(currentTheme: Theme) {
+        if (!this._skybox) return;
+        if (this._skybox.material instanceof THREE.ShaderMaterial) {
+            this._skybox.material.uniforms.rColor.value = currentTheme['Background']['color']['r'];
+            this._skybox.material.uniforms.gColor.value = currentTheme['Background']['color']['g'];
+            this._skybox.material.uniforms.bColor.value = currentTheme['Background']['color']['b'];
+        }
+    }
+
 }
 
-export default SceneRenderer
+export default SceneRenderer;
diff --git a/fission/src/ui/components/Skybox.tsx b/fission/src/ui/components/Skybox.tsx
@@ -0,0 +1,13 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+import World from "@/systems/World";
+
+const Skybox = () => {
+    const currentTheme = (window as any).getTheme();
+    if (World.SceneRenderer) { World.SceneRenderer.updateSkyboxColors(currentTheme); }
+    return (
+        <></>
+    );
+}
+
+export default Skybox;