From f3302d3f333dcd2b313931f4c4b21cddd3b6ef88 Mon Sep 17 00:00:00 2001 From: Jerald-Golden-B Date: Thu, 11 Sep 2025 15:58:25 +0530 Subject: [PATCH] bug fix --- .../cameraShortcutsControls.tsx | 31 ++++--------------- app/src/modules/scene/camera/switchView.tsx | 2 +- app/src/modules/scene/environment/ground.tsx | 22 ++----------- app/src/modules/scene/environment/shadow.tsx | 15 ++++++++- app/src/modules/scene/environment/sky.tsx | 14 +++------ .../scene/postProcessing/postProcessing.tsx | 11 ++----- 6 files changed, 32 insertions(+), 63 deletions(-) diff --git a/app/src/modules/scene/camera/shortcutsControls/cameraShortcutsControls.tsx b/app/src/modules/scene/camera/shortcutsControls/cameraShortcutsControls.tsx index aaf3045..ce2685c 100644 --- a/app/src/modules/scene/camera/shortcutsControls/cameraShortcutsControls.tsx +++ b/app/src/modules/scene/camera/shortcutsControls/cameraShortcutsControls.tsx @@ -3,16 +3,12 @@ import { useEffect } from "react"; import { useThree } from "@react-three/fiber"; import type { CameraControls } from "@react-three/drei"; import { useThreeDStore } from "../../../../store/ui/useModuleStore"; -import * as CONSTANTS from "../../../../types/world/worldConstants"; const CameraShortcutsControls = () => { const { camera, controls } = useThree(); const { toggleThreeD, setToggleThreeD } = useThreeDStore(); - const isTextInput = (element: Element | null): boolean => - element instanceof HTMLInputElement || - element instanceof HTMLTextAreaElement || - element?.getAttribute("contenteditable") === "true"; + const isTextInput = (element: Element | null): boolean => element instanceof HTMLInputElement || element instanceof HTMLTextAreaElement || element?.getAttribute("contenteditable") === "true"; useEffect(() => { const handleKeyDown = (e: KeyboardEvent) => { @@ -20,7 +16,6 @@ const CameraShortcutsControls = () => { const cc = controls as CameraControls; - // get current target const target = new Vector3(); cc.getTarget(target); @@ -45,14 +40,11 @@ const CameraShortcutsControls = () => { LookAt(pos); break; case "Numpad9": { - // Opposite view logic + // Opposite if (Math.abs(dir.z) > Math.abs(dir.x) && Math.abs(dir.z) > Math.abs(dir.y)) { pos = new Vector3(0, 0, -Math.sign(dir.z) * distance).add(target); LookAt(pos); - } else if ( - Math.abs(dir.x) > Math.abs(dir.z) && - Math.abs(dir.x) > Math.abs(dir.y) - ) { + } else if (Math.abs(dir.x) > Math.abs(dir.z) && Math.abs(dir.x) > Math.abs(dir.y)) { pos = new Vector3(-Math.sign(dir.x) * distance, 0, 0).add(target); LookAt(pos); } else { @@ -62,29 +54,18 @@ const CameraShortcutsControls = () => { break; } case "Numpad5": { - // Only apply when on Top view - if (!toggleThreeD) { - console.log("cc: ", cc.camera); setToggleThreeD(true); - (cc as any).mouseButtons.left = CONSTANTS.threeDimension.leftMouse; - (cc as any).mouseButtons.right = CONSTANTS.threeDimension.rightMouse; } else { - console.log("cc: ", cc.camera); - cc.setLookAt(0, distance, 0, target.x, target.y, target.z, false).then( - () => { - setToggleThreeD(false); - (cc as any).mouseButtons.left = CONSTANTS.twoDimension.leftMouse; - (cc as any).mouseButtons.right = CONSTANTS.twoDimension.rightMouse; - } - ); + cc.setLookAt(0, distance, 0, target.x, target.y, target.z, false).then(() => { + setToggleThreeD(false); + }); } break; } } function LookAt(pos: Vector3) { - console.log('hi lookat'); cc.setLookAt(pos.x, pos.y, pos.z, target.x, target.y, target.z, true); } }; diff --git a/app/src/modules/scene/camera/switchView.tsx b/app/src/modules/scene/camera/switchView.tsx index 592f510..68a86c8 100644 --- a/app/src/modules/scene/camera/switchView.tsx +++ b/app/src/modules/scene/camera/switchView.tsx @@ -45,7 +45,7 @@ export default function SwitchView() { return ( <> - {(toggleView || !toggleThreeD) ? ( + {toggleView || !toggleThreeD ? ( { return ( - - + + - + diff --git a/app/src/modules/scene/environment/shadow.tsx b/app/src/modules/scene/environment/shadow.tsx index 77df5ba..b85d7ab 100644 --- a/app/src/modules/scene/environment/shadow.tsx +++ b/app/src/modules/scene/environment/shadow.tsx @@ -61,7 +61,20 @@ export default function Shadows() { {/* {(lightRef.current?.shadow) && } */} - + diff --git a/app/src/modules/scene/environment/sky.tsx b/app/src/modules/scene/environment/sky.tsx index ee7f2d9..8eaf75c 100644 --- a/app/src/modules/scene/environment/sky.tsx +++ b/app/src/modules/scene/environment/sky.tsx @@ -1,8 +1,8 @@ -import * as THREE from 'three'; +import * as THREE from "three"; import { Sky } from "@react-three/drei"; import { useAzimuth, useElevation, useSunPosition } from "../../../store/builder/store"; import { useEffect, useRef, useState } from "react"; -import * as CONSTANTS from '../../../types/world/worldConstants'; +import * as CONSTANTS from "../../../types/world/worldConstants"; export default function Sun() { const savedTheme: string | null = localStorage.getItem("theme"); @@ -24,20 +24,16 @@ export default function Sun() { sunPositionRef.current.setFromSphericalCoords(1, phi, theta); setSunPosition(sunPositionRef.current); - forceUpdate(prev => prev + 1); + forceUpdate((prev) => prev + 1); }, [elevation, azimuth]); return ( <> - {(azimuth !== undefined && elevation !== undefined && savedTheme !== "dark") && ( + {azimuth !== undefined && elevation !== undefined && savedTheme !== "dark" && ( <> { - - }, [selectedEventSphere, deletableEventSphere]) + useEffect(() => {}, [selectedEventSphere, deletableEventSphere]); return ( - {/* */} @@ -22,7 +18,6 @@ export default function PostProcessing() { {/* */} - ); -}; +}