From da90feadb73d4d800dfe2a881830b35196d4b897 Mon Sep 17 00:00:00 2001 From: Jerald-Golden-B Date: Mon, 22 Sep 2025 11:19:19 +0530 Subject: [PATCH] use case bug fixed --- app/src/modules/scene/controls/controls.tsx | 11 ++++++----- app/src/modules/scene/sceneContext.tsx | 4 ++-- app/src/store/scene/useSceneStore.ts | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/src/modules/scene/controls/controls.tsx b/app/src/modules/scene/controls/controls.tsx index 7389bd6..b20f91a 100644 --- a/app/src/modules/scene/controls/controls.tsx +++ b/app/src/modules/scene/controls/controls.tsx @@ -23,13 +23,14 @@ import { getUserData } from "../../../functions/getUserData"; import { getCameraApi } from "../../../services/factoryBuilder/camera/getCameraApi"; import { setCameraApi } from "../../../services/factoryBuilder/camera/setCameraApi"; import updateCamPosition from "../camera/functions/updateCameraPosition"; +import { ALPHA_ORG } from "../../../pages/Dashboard"; export default function Controls() { const controlsRef = useRef(null); const state = useThree(); const { toggleView } = useToggleView(); const { resetCamera, setResetCamera } = useResetCamera(); - const { camType } = useSceneStore(); + const { camType, layoutType } = useSceneStore(); const { builderSocket } = useSocketStore(); const { projectId } = useParams(); const { userId, organization } = getUserData(); @@ -55,7 +56,7 @@ export default function Controls() { }, [projectId]); useEffect(() => { - if (resetCamera && projectId) { + if (resetCamera && projectId && (layoutType === "default" || (layoutType === "useCase" && organization === ALPHA_ORG))) { controlsRef.current?.setPosition(...CONSTANTS.threeDimension.defaultPosition); controlsRef.current?.setTarget(...CONSTANTS.threeDimension.defaultTarget); controlsRef.current?.rotateAzimuthTo(CONSTANTS.threeDimension.defaultAzimuth); @@ -82,7 +83,7 @@ export default function Controls() { setResetCamera(false); } - }, [resetCamera, builderSocket, projectId]); + }, [resetCamera, builderSocket, projectId, layoutType]); useEffect(() => { controlsRef.current?.setBoundary(new THREE.Box3(new THREE.Vector3(...CONSTANTS.threeDimension.boundaryBottom), new THREE.Vector3(...CONSTANTS.threeDimension.boundaryTop))); @@ -118,7 +119,7 @@ export default function Controls() { }; const controls = controlsRef.current; - if (controls && !toggleView && camType === "perspective") { + if (controls && !toggleView && camType === "perspective" && (layoutType === "default" || (layoutType === "useCase" && organization === ALPHA_ORG))) { controls.addEventListener("sleep", handleRest); controls.addEventListener("control", startInterval); controls.addEventListener("controlend", stopInterval); @@ -132,7 +133,7 @@ export default function Controls() { } stopInterval(); }; - }, [toggleView, state, builderSocket, camType]); + }, [toggleView, state, builderSocket, camType, layoutType]); return ( <> diff --git a/app/src/modules/scene/sceneContext.tsx b/app/src/modules/scene/sceneContext.tsx index ad6456b..57841ca 100644 --- a/app/src/modules/scene/sceneContext.tsx +++ b/app/src/modules/scene/sceneContext.tsx @@ -64,7 +64,7 @@ type SceneContextValue = { layout: "Main Layout" | "Comparison Layout"; - layoutType: "project" | "usecase" | "tutorial" | null; + layoutType: "default" | "useCase" | "tutorial" | null; }; const SceneContext = createContext(null); @@ -76,7 +76,7 @@ export function SceneProvider({ }: { readonly children: React.ReactNode; readonly layout: "Main Layout" | "Comparison Layout"; - readonly layoutType: "project" | "usecase" | "tutorial" | null; + readonly layoutType: "default" | "useCase" | "tutorial" | null; }) { const versionStore = useMemo(() => createVersionStore(), []); diff --git a/app/src/store/scene/useSceneStore.ts b/app/src/store/scene/useSceneStore.ts index 2b311a5..7e325fd 100644 --- a/app/src/store/scene/useSceneStore.ts +++ b/app/src/store/scene/useSceneStore.ts @@ -18,9 +18,9 @@ type SceneStore = { setCamType: (type: "orthographic" | "perspective") => void; - layoutType: "project" | "usecase" | "tutorial" | null; + layoutType: "default" | "useCase" | "tutorial" | null; - setLayoutType: (layoutType: "project" | "usecase" | "tutorial" | null) => void; + setLayoutType: (layoutType: "default" | "useCase" | "tutorial" | null) => void; }; export const useSceneStore = create()(