From 1901c3031a42eb0df684c15fb14c2e65e5c86ca0 Mon Sep 17 00:00:00 2001 From: Jerald-Golden-B Date: Fri, 13 Jun 2025 18:35:46 +0530 Subject: [PATCH] fix: enable controls when assets are selected and prevent play mode if comparison product is active --- .../scene/controls/selectionControls/selectionControls.tsx | 2 ++ app/src/modules/scene/scene.tsx | 3 ++- app/src/utils/shortcutkeys/handleShortcutKeys.ts | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/modules/scene/controls/selectionControls/selectionControls.tsx b/app/src/modules/scene/controls/selectionControls/selectionControls.tsx index 2fbeaf3..f412243 100644 --- a/app/src/modules/scene/controls/selectionControls/selectionControls.tsx +++ b/app/src/modules/scene/controls/selectionControls/selectionControls.tsx @@ -151,6 +151,8 @@ const SelectionControls: React.FC = () => { setSelectedAssets(selected); } } + } else if (controls) { + (controls as any).enabled = true; } }; diff --git a/app/src/modules/scene/scene.tsx b/app/src/modules/scene/scene.tsx index ee47596..1a79ede 100644 --- a/app/src/modules/scene/scene.tsx +++ b/app/src/modules/scene/scene.tsx @@ -14,6 +14,7 @@ import { getAllProjects } from "../../services/dashboard/getAllProjects"; import { getUserData } from "../../components/Dashboard/functions/getUserData"; import { useLoadingProgress, useSocketStore } from "../../store/builder/store"; import { useAssetsStore } from "../../store/builder/useAssetStore"; +import { Color } from "three"; export default function Scene({ layout }: { readonly layout: 'Main Layout' | 'Comparison Layout' }) { const map = useMemo(() => [ @@ -89,7 +90,7 @@ export default function Scene({ layout }: { readonly layout: 'Main Layout' | 'Co e.preventDefault(); }} onCreated={(e) => { - e.scene.background = null; + e.scene.background = layout === 'Main Layout' ? null : new Color(0x19191d); }} gl={{ powerPreference: "high-performance", antialias: true, preserveDrawingBuffer: true }} > diff --git a/app/src/utils/shortcutkeys/handleShortcutKeys.ts b/app/src/utils/shortcutkeys/handleShortcutKeys.ts index fed7fa4..cbfae82 100644 --- a/app/src/utils/shortcutkeys/handleShortcutKeys.ts +++ b/app/src/utils/shortcutkeys/handleShortcutKeys.ts @@ -23,7 +23,7 @@ import { useLogger } from "../../components/ui/log/LoggerContext"; import { useComparisonProduct } from "../../store/simulation/useSimulationStore"; const KeyPressListener: React.FC = () => { - const { clearComparisonProduct } = useComparisonProduct(); + const { comparisonProduct, clearComparisonProduct } = useComparisonProduct(); const { activeModule, setActiveModule } = useModuleStore(); const { setActiveSubTool } = useActiveSubTool(); const { toggleUILeft, toggleUIRight, setToggleUI } = useToggleStore(); @@ -195,7 +195,7 @@ const KeyPressListener: React.FC = () => { handleBuilderShortcuts(keyCombination); // Shortcut to enter play mode - if (keyCombination === "Ctrl+P" && !toggleView) { + if (keyCombination === "Ctrl+P" && !toggleView && !comparisonProduct) { setIsPlaying(true); }