diff --git a/app/src/components/ui/compareVersion/Button.tsx b/app/src/components/ui/compareVersion/Button.tsx
new file mode 100644
index 0000000..66e4124
--- /dev/null
+++ b/app/src/components/ui/compareVersion/Button.tsx
@@ -0,0 +1,47 @@
+import React from "react";
+import {
+ useCreateNewWindow,
+ useIsComparing,
+ useLoadingProgress,
+} from "../../../store/builder/store";
+import { useSimulationState } from "../../../store/simulation/useSimulationStore";
+
+const Button = () => {
+ const { isComparing, setIsComparing } = useIsComparing();
+ const { createNewWindow, setCreateNewWindow } = useCreateNewWindow();
+ const { setLoadingProgress } = useLoadingProgress();
+ const { clearComparisonState } = useSimulationState();
+
+ const handleExit = () => {
+ setIsComparing(false);
+ setCreateNewWindow(false);
+ setLoadingProgress(0);
+ clearComparisonState();
+ };
+
+ const handleOpenInNewWindow = () => {
+ // ๐งน Immediately reset any loading or scene state
+ setLoadingProgress(0);
+ setCreateNewWindow(true);
+ };
+
+ return (
+
+ {isComparing && }
+ {isComparing && !createNewWindow && (
+
+ )}
+
+ );
+};
+
+export default Button;
diff --git a/app/src/components/ui/compareVersion/CompareLayOut.tsx b/app/src/components/ui/compareVersion/CompareLayOut.tsx
index 23c6313..3b123f7 100644
--- a/app/src/components/ui/compareVersion/CompareLayOut.tsx
+++ b/app/src/components/ui/compareVersion/CompareLayOut.tsx
@@ -1,7 +1,11 @@
import { useParams } from "react-router-dom";
import React, { useState, useRef, useEffect, Suspense } from "react";
import { CompareLayoutIcon, LayoutIcon, ResizerIcon } from "../../icons/SimulationIcons";
-import { useLoadingProgress, useIsComparing } from "../../../store/builder/store";
+import {
+ useLoadingProgress,
+ useIsComparing,
+ useCreateNewWindow,
+} from "../../../store/builder/store";
import { useSimulationState } from "../../../store/simulation/useSimulationStore";
import { usePlayButtonStore } from "../../../store/ui/usePlayButtonStore";
import { useSceneContext } from "../../../modules/scene/sceneContext";
@@ -13,11 +17,18 @@ import useRestStates from "../../../hooks/useResetStates";
import { getVersionHistoryApi } from "../../../services/factoryBuilder/versionControl/getVersionHistoryApi";
import { validateSimulationDataApi } from "../../../services/simulation/comparison/validateSimulationDataApi";
+import Button from "./Button";
const CompareLayOut = () => {
const { clearComparisonState, comparisonScene, setComparisonState } = useSimulationState();
const { versionStore } = useSceneContext();
- const { versionHistory, selectedVersion, setSelectedVersion, clearSelectedVersion, setVersions } = versionStore();
+ const {
+ versionHistory,
+ selectedVersion,
+ setSelectedVersion,
+ clearSelectedVersion,
+ setVersions,
+ } = versionStore();
const { setLoadingProgress } = useLoadingProgress();
const [width, setWidth] = useState("50vw");
const [isResizing, setIsResizing] = useState(false);
@@ -30,6 +41,7 @@ const CompareLayOut = () => {
const { setIsPlaying } = usePlayButtonStore();
const { projectId } = useParams();
const { resetStates } = useRestStates();
+ const { createNewWindow } = useCreateNewWindow();
useEffect(() => {
return () => {
resetStates();
@@ -162,8 +174,8 @@ const CompareLayOut = () => {
setLoadingProgress(1);
const singleData = {
projectId: projectId,
- versionId: version.versionId,
- productUuid: data[0].productUuid,
+ versionId: version.versionId,
+ productUuid: data[0].productUuid,
};
validateSimulationDataApi(singleData).then((getData) => {
@@ -178,59 +190,77 @@ const CompareLayOut = () => {
};
return (
-
- {loadingProgress === 0 && selectedVersion?.versionId && (
-
- )}
-
- {selectedVersion?.versionId && (
-
-
-
-
-
- )}
-
- {width !== "0px" &&
- !selectedVersion?.versionId && ( // Show only if no layout selected
-
-
-
+ <>
+ {!createNewWindow && (
+
+ {loadingProgress === 0 && selectedVersion?.versionId && (
+
+ )}
+
+ {selectedVersion?.versionId && (
+
+
+
+
-
Choose Version to compare
-
+ )}
- {showLayoutDropdown && (
-
-
Versions
-
{}} />
-
- {versionHistory.map((version) => (
-
- ))}
+ {width !== "0px" &&
+ !selectedVersion?.versionId && ( // Show only if no layout selected
+
+
+
+
Choose Version to compare
+
+
+ {showLayoutDropdown && (
+
+
Versions
+
{}} />
+
+ {versionHistory.map((version) => (
+
+ ))}
+
+ )}
)}
-
-
+ {/* Always show after layout is selected */}
+
+
+ )}
+
);
};
diff --git a/app/src/components/ui/compareVersion/NewWindowScene.tsx b/app/src/components/ui/compareVersion/NewWindowScene.tsx
new file mode 100644
index 0000000..8e09060
--- /dev/null
+++ b/app/src/components/ui/compareVersion/NewWindowScene.tsx
@@ -0,0 +1,44 @@
+import React, { Suspense, useEffect, useState } from "react";
+import { RenderInNewWindow } from "../../templates/CreateNewWindow";
+import { useSceneContext } from "../../../modules/scene/sceneContext";
+import { useCreateNewWindow, useLoadingProgress } from "../../../store/builder/store";
+import Scene from "../../../modules/scene/scene";
+import ComparisonResult from "./ComparisonResult";
+import Button from "./Button";
+
+const NewWindowScene = () => {
+ const { versionStore } = useSceneContext();
+ const { selectedVersion } = versionStore();
+ const { setCreateNewWindow } = useCreateNewWindow();
+ const { loadingProgress } = useLoadingProgress();
+
+ return (
+ <>
+ {selectedVersion?.versionId && (
+
+
+ setCreateNewWindow(false)}
+ >
+
+
+
+
+ {!loadingProgress && }
+
+
+
+ )}
+
+ );
+};
+
+export default NewWindowScene;
diff --git a/app/src/components/ui/log/LogList.tsx b/app/src/components/ui/log/LogList.tsx
index b7b39dc..8f420d6 100644
--- a/app/src/components/ui/log/LogList.tsx
+++ b/app/src/components/ui/log/LogList.tsx
@@ -1,185 +1,164 @@
import React, { useEffect, useState } from "react";
-import {
- LogListIcon,
- CloseIcon,
- ExpandIcon2,
-} from "../../icons/ExportCommonIcons"; // Adjust path as needed
+import { LogListIcon, CloseIcon, ExpandIcon2 } from "../../icons/ExportCommonIcons"; // Adjust path as needed
import { LogEntry, useLogger } from "./LoggerContext";
import { GetLogIcon } from "../../footer/getLogIcons";
import { RenderInNewWindow } from "../../templates/CreateNewWindow";
// --- Logs Component ---
type LogsProps = {
- selectedTab: "all" | "info" | "warning" | "error";
- setSelectedTab: (tab: "all" | "info" | "warning" | "error") => void;
- clear: () => void;
- filteredLogs: LogEntry[];
- formatTimestamp: (date: Date) => string;
+ selectedTab: "all" | "info" | "warning" | "error";
+ setSelectedTab: (tab: "all" | "info" | "warning" | "error") => void;
+ clear: () => void;
+ filteredLogs: LogEntry[];
+ formatTimestamp: (date: Date) => string;
};
const Logs: React.FC
= ({
- selectedTab,
- setSelectedTab,
- clear,
- filteredLogs,
- formatTimestamp,
+ selectedTab,
+ setSelectedTab,
+ clear,
+ filteredLogs,
+ formatTimestamp,
}) => {
- return (
- <>
-
-
- {["all", "info", "warning", "error"].map((type) => (
-
- ))}
-
-
-
- {filteredLogs.length > 0 ? (
- filteredLogs.map((log) => (
-
-
{GetLogIcon(log.type)}
-
-
{log.message}
-
- {formatTimestamp(log.timestamp)}
+ return (
+ <>
+
+
+ {["all", "info", "warning", "error"].map((type) => (
+
+ ))}
-
+
- ))
- ) : (
-
- There are no logs to display at the moment.
-
- )}
-
-
- );
+
+ {/* Log Entries */}
+
+ {filteredLogs.length > 0 ? (
+ filteredLogs.map((log) => (
+
+
{GetLogIcon(log.type)}
+
+
{log.message}
+
{formatTimestamp(log.timestamp)}
+
+
+ ))
+ ) : (
+
There are no logs to display at the moment.
+ )}
+
+
+ );
};
// --- LogList Component ---
const LogList: React.FC = () => {
- const {
- logs,
- clear,
- setIsLogListVisible,
- isLogListVisible,
- selectedTab,
- setSelectedTab,
- } = useLogger();
+ const { logs, clear, setIsLogListVisible, isLogListVisible, selectedTab, setSelectedTab } =
+ useLogger();
- const formatTimestamp = (date: Date) => new Date(date).toLocaleTimeString();
- const [open, setOpen] = useState(false);
+ const formatTimestamp = (date: Date) => new Date(date).toLocaleTimeString();
+ const [open, setOpen] = useState(false);
+ console.log('open: ', open);
+ const filteredLogs =
+ selectedTab === "all"
+ ? [...logs].reverse()
+ : [...logs].filter((log) => log.type === selectedTab).reverse();
- const filteredLogs =
- selectedTab === "all"
- ? [...logs].reverse()
- : [...logs].filter((log) => log.type === selectedTab).reverse();
+ useEffect(() => {
+ if (isLogListVisible && logs.length > 0) {
+ const lastLog = logs[logs.length - 1];
+ const validTypes = ["all", "info", "warning", "error"];
+ if (validTypes.includes(lastLog.type)) {
+ setSelectedTab(lastLog.type as any);
+ } else {
+ setSelectedTab("all");
+ }
+ }
+ // eslint-disable-next-line
+ }, [isLogListVisible]);
- useEffect(() => {
- if (isLogListVisible && logs.length > 0) {
- const lastLog = logs[logs.length - 1];
- const validTypes = ["all", "info", "warning", "error"];
- if (validTypes.includes(lastLog.type)) {
- setSelectedTab(lastLog.type as any);
- } else {
- setSelectedTab("all");
- }
- }
- // eslint-disable-next-line
- }, [isLogListVisible]);
+ return (
+ <>
+ {!open ? (
+
setIsLogListVisible(false)}>
+ {/* eslint-disable-next-line */}
+
{
+ e.stopPropagation();
+ }}
+ >
+
+
+
+
+
+
+
- return (
- <>
- {!open ? (
-
setIsLogListVisible(false)}
- >
- {/* eslint-disable-next-line */}
-
{
- e.stopPropagation();
- }}
- >
-
-
-
-
+ {/* Logs Section */}
+
+
-
Log List
-
-
-
-
-
-
-
- {/* Logs Section */}
-
-
-
- ) : (
-
{
- setOpen(false);
- setIsLogListVisible(false);
- }}
- >
-
-
-
-
- )}
-
- );
+
+
+
+
+ )}
+
+ );
};
export default LogList;
+
\ No newline at end of file
diff --git a/app/src/modules/builder/asset/models/model/model.tsx b/app/src/modules/builder/asset/models/model/model.tsx
index 6fadd18..2a4834c 100644
--- a/app/src/modules/builder/asset/models/model/model.tsx
+++ b/app/src/modules/builder/asset/models/model/model.tsx
@@ -13,13 +13,17 @@ import { getAssetFieldApi } from "../../../../../services/factoryBuilder/asset/f
import { ModelAnimator } from "./animator/modelAnimator";
import { useModelEventHandlers } from "./eventHandlers/useModelEventHandlers";
-function Model({ asset, isRendered, loader }: Readonly<{ asset: Asset; isRendered: boolean; loader: GLTFLoader }>) {
+function Model({
+ asset,
+ isRendered,
+ loader,
+}: Readonly<{ asset: Asset; isRendered: boolean; loader: GLTFLoader }>) {
const url_Backend_dwinzo = `http://${process.env.REACT_APP_SERVER_MARKETPLACE_URL}`;
const savedTheme: string = localStorage.getItem("theme") || "light";
const { toolMode } = useToolMode();
const { toggleView } = useToggleView();
const { activeModule } = useModuleStore();
- const { assetStore } = useSceneContext();
+ const { assetStore, layout } = useSceneContext();
const { resetAnimation, hasSelectedAsset, updateSelectedAsset, selectedAssets } = assetStore();
const { setDeletableFloorAsset } = useBuilderStore();
const [gltfScene, setGltfScene] = useState
(null);
@@ -52,7 +56,12 @@ function Model({ asset, isRendered, loader }: Readonly<{ asset: Asset; isRendere
}, [activeModule, toolMode, selectedAssets]);
useEffect(() => {
- if (groupRef.current && selectedAssets.length === 1 && selectedAssets[0].userData.modelUuid === asset.modelUuid && hasSelectedAsset(asset.modelUuid)) {
+ if (
+ groupRef.current &&
+ selectedAssets.length === 1 &&
+ selectedAssets[0].userData.modelUuid === asset.modelUuid &&
+ hasSelectedAsset(asset.modelUuid)
+ ) {
updateSelectedAsset(groupRef.current);
}
}, [isRendered, selectedAssets, asset]);
@@ -130,7 +139,10 @@ function Model({ asset, isRendered, loader }: Readonly<{ asset: Asset; isRendere
logModelStatus(assetId, "backend-loaded");
})
.catch((error) => {
- console.error(`[Backend] Error storing/loading ${asset.modelName}:`, error);
+ console.error(
+ `[Backend] Error storing/loading ${asset.modelName}:`,
+ error
+ );
});
},
undefined,
@@ -144,7 +156,8 @@ function Model({ asset, isRendered, loader }: Readonly<{ asset: Asset; isRendere
});
}, []);
- const { handleDblClick, handleClick, handlePointerOver, handlePointerOut, handleContextMenu } = useModelEventHandlers({ boundingBox, groupRef, asset });
+ const { handleDblClick, handleClick, handlePointerOver, handlePointerOut, handleContextMenu } =
+ useModelEventHandlers({ boundingBox, groupRef, asset });
return (
) : (
- <>{!hasSelectedAsset(asset.modelUuid) && }
+ <>
+ {!hasSelectedAsset(asset.modelUuid) && (
+
+ )}
+
+ )}
+ {hasSelectedAsset(asset.modelUuid) && (
+
)}
- {hasSelectedAsset(asset.modelUuid) && }
)}
diff --git a/app/src/modules/builder/asset/models/models.tsx b/app/src/modules/builder/asset/models/models.tsx
index 588a617..2291aba 100644
--- a/app/src/modules/builder/asset/models/models.tsx
+++ b/app/src/modules/builder/asset/models/models.tsx
@@ -3,7 +3,11 @@ import { Group, Vector3 } from "three";
import { CameraControls } from "@react-three/drei";
import { GLTFLoader } from "three/examples/jsm/Addons";
import { useThree, useFrame } from "@react-three/fiber";
-import { useContextActionStore, useLimitDistance, useRenderDistance } from "../../../../store/builder/store";
+import {
+ useContextActionStore,
+ useLimitDistance,
+ useRenderDistance,
+} from "../../../../store/builder/store";
import { useSelectedAsset } from "../../../../store/simulation/useSimulationStore";
import { useSceneContext } from "../../../scene/sceneContext";
import useZoomMesh from "../../hooks/useZoomMesh";
@@ -11,12 +15,14 @@ import useCallBackOnKey from "../../../../utils/hooks/useCallBackOnKey";
import Model from "./model/model";
-const distanceWorker = new Worker(new URL("../../../../services/factoryBuilder/webWorkers/distanceWorker.js", import.meta.url));
+const distanceWorker = new Worker(
+ new URL("../../../../services/factoryBuilder/webWorkers/distanceWorker.js", import.meta.url)
+);
function Models({ loader }: { readonly loader: GLTFLoader }) {
const { controls, camera } = useThree();
const assetGroupRef = useRef(null);
- const { assetStore } = useSceneContext();
+ const { assetStore, layout } = useSceneContext();
const { assets, selectedAssets, getSelectedAssetUuids } = assetStore();
const { selectedAsset, clearSelectedAsset } = useSelectedAsset();
const { contextAction, setContextAction } = useContextActionStore();
@@ -30,6 +36,14 @@ function Models({ loader }: { readonly loader: GLTFLoader }) {
// console.log(assets);
}, [assets]);
+ useEffect(() => {
+ const initialRenderMap: Record = {};
+ assets.forEach((asset) => {
+ initialRenderMap[asset.modelUuid] = true;
+ });
+ setRenderMap(initialRenderMap);
+ }, [assets.length]);
+
useEffect(() => {
if (contextAction === "focusAsset") {
zoomMeshes(getSelectedAssetUuids());
@@ -55,20 +69,51 @@ function Models({ loader }: { readonly loader: GLTFLoader }) {
return { ...prev, [modelUuid]: shouldRender };
});
};
- }, []);
+
+ return () => {
+ distanceWorker.terminate();
+ };
+ }, [distanceWorker, layout]);
useFrame(() => {
camera.getWorldPosition(cameraPos.current);
for (const asset of assets) {
const isRendered = renderMap[asset.modelUuid] ?? false;
- distanceWorker.postMessage({
- modelUuid: asset.modelUuid,
- assetPosition: { x: asset.position[0], y: asset.position[1], z: asset.position[2] },
- cameraPosition: cameraPos.current,
- limitDistance,
- renderDistance,
- isRendered,
- });
+ // distanceWorker.postMessage({
+ // modelUuid: asset.modelUuid,
+ // assetPosition: { x: asset.position[0], y: asset.position[1], z: asset.position[2] },
+ // cameraPosition: cameraPos.current,
+ // limitDistance,
+ // renderDistance,
+ // isRendered,
+ // });
+
+ const assetVec = new Vector3(...asset.position);
+ const cameraVec = new Vector3(
+ cameraPos.current.x,
+ cameraPos.current.y,
+ cameraPos.current.z
+ );
+ const distance = assetVec.distanceTo(cameraVec);
+
+ if (limitDistance) {
+ if (!isRendered && distance <= renderDistance) {
+ setRenderMap((prev) => {
+ if (prev[asset.modelUuid] === true) return prev;
+ return { ...prev, [asset.modelUuid]: true };
+ });
+ } else if (isRendered && distance > renderDistance) {
+ setRenderMap((prev) => {
+ if (prev[asset.modelUuid] === false) return prev;
+ return { ...prev, [asset.modelUuid]: false };
+ });
+ }
+ } else if (!isRendered) {
+ setRenderMap((prev) => {
+ if (prev[asset.modelUuid] === true) return prev;
+ return { ...prev, [asset.modelUuid]: true };
+ });
+ }
}
});
@@ -88,7 +133,12 @@ function Models({ loader }: { readonly loader: GLTFLoader }) {
}}
>
{assets.map((asset) => (
-
+
))}
);
diff --git a/app/src/modules/scene/camera/syncCam.tsx b/app/src/modules/scene/camera/syncCam.tsx
index 2d4026b..dd2ebd3 100644
--- a/app/src/modules/scene/camera/syncCam.tsx
+++ b/app/src/modules/scene/camera/syncCam.tsx
@@ -2,13 +2,11 @@ import { Vector3 } from "three";
import { useFrame, useThree } from "@react-three/fiber";
import { CameraControls } from "@react-three/drei";
import { useSceneContext } from "../sceneContext";
-import { useIsComparing } from "../../../store/builder/store";
+import { useCreateNewWindow, useIsComparing } from "../../../store/builder/store";
import { useSceneStore } from "../../../store/scene/useSceneStore";
import { useSimulationState } from "../../../store/simulation/useSimulationStore";
import useModuleStore from "../../../store/ui/useModuleStore";
-import * as CONSTANTS from "../../../types/world/worldConstants";
-
function SyncCam() {
const { layout } = useSceneContext();
const { controls } = useThree();
@@ -16,19 +14,39 @@ function SyncCam() {
const { activeModule } = useModuleStore();
const { comparisonScene } = useSimulationState();
const { setCamera, camState } = useSceneStore();
+ const { windowRendered } = useCreateNewWindow();
+
+ function getControls() {
+ const position = (controls as CameraControls).getPosition(new Vector3());
+ const target = (controls as CameraControls).getTarget(new Vector3());
+ setCamera(position, target);
+ }
+
+ function setControls() {
+ (controls as CameraControls).setLookAt(
+ camState.position.x,
+ camState.position.y,
+ camState.position.z,
+ camState.target.x,
+ camState.target.y,
+ camState.target.z,
+ true
+ );
+ }
useFrame(() => {
- if (layout === "Comparison Layout" && controls && camState) {
- (controls as any).mouseButtons.left = CONSTANTS.controlsTransition.leftMouse;
- (controls as any).mouseButtons.right = CONSTANTS.controlsTransition.rightMouse;
- (controls as any).mouseButtons.wheel = CONSTANTS.controlsTransition.wheelMouse;
- (controls as any).mouseButtons.middle = CONSTANTS.controlsTransition.middleMouse;
- (controls as CameraControls).setLookAt(camState.position.x, camState.position.y, camState.position.z, camState.target.x, camState.target.y, camState.target.z, true);
- }
- if (layout === "Main Layout" && controls && isComparing && activeModule === "simulation" && comparisonScene) {
- const position = (controls as CameraControls).getPosition(new Vector3());
- const target = (controls as CameraControls).getTarget(new Vector3());
- setCamera(position, target);
+ if (
+ controls &&
+ isComparing &&
+ activeModule === "simulation" &&
+ comparisonScene &&
+ camState
+ ) {
+ if (layout === windowRendered) {
+ getControls();
+ } else {
+ setControls();
+ }
}
});
diff --git a/app/src/modules/scene/scene.tsx b/app/src/modules/scene/scene.tsx
index fe59f21..c4939be 100644
--- a/app/src/modules/scene/scene.tsx
+++ b/app/src/modules/scene/scene.tsx
@@ -1,5 +1,5 @@
import { useEffect, useMemo } from "react";
-import { Canvas } from "@react-three/fiber";
+import { Canvas, useThree } from "@react-three/fiber";
import { KeyboardControls } from "@react-three/drei";
import { useSceneContext } from "./sceneContext";
@@ -11,13 +11,17 @@ import Collaboration from "../collaboration/collaboration";
import useModuleStore from "../../store/ui/useModuleStore";
import { useParams } from "react-router-dom";
import { getUserData } from "../../functions/getUserData";
-import { useLoadingProgress } from "../../store/builder/store";
+import { useCreateNewWindow, useLoadingProgress } from "../../store/builder/store";
import { useSocketStore } from "../../store/socket/useSocketStore";
import { Color, SRGBColorSpace } from "three";
import { compressImage } from "../../utils/compressImage";
import { ALPHA_ORG } from "../../pages/Dashboard";
-export default function Scene({ layout }: { readonly layout: "Main Layout" | "Comparison Layout" }) {
+export default function Scene({
+ layout,
+}: {
+ readonly layout: "Main Layout" | "Comparison Layout";
+}) {
const map = useMemo(
() => [
{ name: "forward", keys: ["ArrowUp", "w", "W"] },
@@ -35,11 +39,16 @@ export default function Scene({ layout }: { readonly layout: "Main Layout" | "Co
const { projectSocket } = useSocketStore();
const { activeModule } = useModuleStore();
const { loadingProgress } = useLoadingProgress();
+ const { setWindowRendered } = useCreateNewWindow();
useEffect(() => {
if (!projectId || loadingProgress !== 0) return;
const canvas = document.getElementById("sceneCanvas")?.getElementsByTagName("canvas")[0];
- if (!canvas || !(layoutType === "default" || (layoutType === "useCase" && organization === ALPHA_ORG))) return;
+ if (
+ !canvas ||
+ !(layoutType === "default" || (layoutType === "useCase" && organization === ALPHA_ORG))
+ )
+ return;
compressImage(canvas.toDataURL("image/png")).then((screenshotDataUrl) => {
const updateProjects = {
projectId,
@@ -64,11 +73,21 @@ export default function Scene({ layout }: { readonly layout: "Main Layout" | "Co
onContextMenu={(e) => {
e.preventDefault();
}}
+ resize={{ polyfill: ResizeObserver }}
+ style={{ width: "100vw", height: "100vh", background: "#202020" }}
performance={{ min: 0.9, max: 1.0 }}
onCreated={(e) => {
e.scene.background = layout === "Main Layout" ? null : new Color(0x19191d);
}}
- gl={{ outputColorSpace: SRGBColorSpace, powerPreference: "high-performance", antialias: true, preserveDrawingBuffer: true }}
+ gl={{
+ outputColorSpace: SRGBColorSpace,
+ powerPreference: "high-performance",
+ antialias: true,
+ preserveDrawingBuffer: true,
+ }}
+ onPointerEnter={() => {
+ setWindowRendered(layout);
+ }}
>
diff --git a/app/src/pages/Project.tsx b/app/src/pages/Project.tsx
index 4665702..162b6ad 100644
--- a/app/src/pages/Project.tsx
+++ b/app/src/pages/Project.tsx
@@ -171,6 +171,7 @@ const Project: React.FC = () => {
+
{selectedUser && }
diff --git a/app/src/store/builder/store.ts b/app/src/store/builder/store.ts
index bb913c1..bda5a2b 100644
--- a/app/src/store/builder/store.ts
+++ b/app/src/store/builder/store.ts
@@ -138,7 +138,8 @@ export const useDrieTemp = create((set: any) => ({
export const useDrieUIValue = create((set: any) => ({
drieUIValue: { touch: null, temperature: null, humidity: null },
- setDrieUIValue: (x: any) => set((state: any) => ({ drieUIValue: { ...state.drieUIValue, ...x } })),
+ setDrieUIValue: (x: any) =>
+ set((state: any) => ({ drieUIValue: { ...state.drieUIValue, ...x } })),
setTouch: (value: any) =>
set((state: any) => ({
@@ -462,9 +463,18 @@ interface DecalStore {
// Create the Zustand store with types
export const useDecalStore = create((set) => ({
selectedSubCategory: "Safety",
- setSelectedSubCategory: (subCategory: string | null) => set({ selectedSubCategory: subCategory }),
+ setSelectedSubCategory: (subCategory: string | null) =>
+ set({ selectedSubCategory: subCategory }),
}));
+
export const comparsionMaterialData = create((set: any) => ({
materialData: [],
setMaterialData: (x: any) => set({ materialData: x }),
}));
+
+export const useCreateNewWindow = create((set: any) => ({
+ createNewWindow: false,
+ setCreateNewWindow: (x: any) => set({ createNewWindow: x }),
+ windowRendered: "",
+ setWindowRendered: (x: any) => set({ windowRendered: x }),
+}));