first person bug fix

app/src/components/layout/scenes/MainScene.tsx

@@ -80,7 +80,7 @@ function MainScene() {
                 }
             })
         }
-    }, [setSelectedVersion, versionHistory])
+    }, [setSelectedVersion, versionHistory, projectId])
 
     const handleSelectVersion = (option: string) => {
         const version = versionHistory.find((version) => version.versionName === option);

app/src/components/layout/sidebarRight/versionHisory/VersionHistory.tsx

@@ -1,10 +1,4 @@
-import {
-    AddIcon,
-    ArrowIcon,
-    CloseIcon,
-    KebabIcon,
-    LocationIcon,
-} from "../../../icons/ExportCommonIcons";
+import { AddIcon, ArrowIcon, CloseIcon, KebabIcon, LocationIcon } from "../../../icons/ExportCommonIcons";
 import RenameInput from "../../../ui/inputs/RenameInput";
 import { useVersionHistoryStore } from "../../../../store/builder/useVersionHistoryStore";
 import { useSubModuleStore } from "../../../../store/useModuleStore";
@@ -30,9 +24,8 @@ const VersionHistory = () => {
 
         getVersionDataApi(projectId, version.versionId).then((versionData) => {
             setSelectedVersion(version);
-            // console.log(versionData);
         }).catch((err) => {
-            // console.log(err);
+            echo.error(err);
         })
     };
 

app/src/components/layout/sidebarRight/versionHisory/VersionSaved.tsx

@@ -1,8 +1,5 @@
 import { useEffect, useState } from "react";
-import {
-  FinishEditIcon,
-  RenameVersionIcon,
-} from "../../../icons/ExportCommonIcons";
+import { FinishEditIcon, RenameVersionIcon } from "../../../icons/ExportCommonIcons";
 import RenderOverlay from "../../../templates/Overlay";
 import { useVersionHistoryStore } from "../../../../store/builder/useVersionHistoryStore";
 import { createVersionApi } from "../../../../services/factoryBuilder/versionControl/addVersionApi";
@@ -22,7 +19,7 @@ const VersionSaved = () => {
         minute: "2-digit",
     }));
     const [description, setDescription] = useState("");
-  const [showSaveFinish, setSaveFinish] = useState(false);
+    const [saveFinish, setSaveFinish] = useState(false);
     const { projectId } = useParams();
     const { userId } = getUserData();
 
@@ -132,7 +129,7 @@ const VersionSaved = () => {
                 </RenderOverlay>
             }
 
-      {showSaveFinish && (
+            {saveFinish && (
                 <RenderOverlay>
                     <div className="finishEdit-version-popup-wrapper">
                         <div className="finishEdit-wrapper-popup-container">

app/src/modules/builder/Decal/eventHandler/useDecalEventHandlers.ts

@@ -338,6 +338,8 @@ export function useDecalEventHandlers({
             canvasElement.addEventListener('pointerup', handlePointerUp);
             canvasElement?.addEventListener("keyup", onKeyUp);
             canvasElement.addEventListener("keydown", onKeyDown);
+        } else {
+            setKeyEvent("");
         }
 
         return () => {

app/src/modules/builder/builder.tsx

@@ -30,7 +30,6 @@ import Decal from "./Decal/decal";
 
 import { useParams } from "react-router-dom";
 import { useBuilderStore } from "../../store/builder/useBuilderStore";
-import { getUserData } from "../../functions/getUserData";
 import { findEnvironment } from "../../services/factoryBuilder/environment/findEnvironment";
 
 export default function Builder() {
@@ -46,8 +45,7 @@ export default function Builder() {
     const { setRenderDistance } = useRenderDistance();
     const { setLimitDistance } = useLimitDistance();
     const { projectId } = useParams();
-    const { setHoveredPoint, setHoveredLine } = useBuilderStore();
-    const { userId, organization } = getUserData();
+    const { setHoveredPoint, setHoveredLine, selectedWallAsset } = useBuilderStore();
 
     useEffect(() => {
         if (!toggleView) {
@@ -71,7 +69,7 @@ export default function Builder() {
     }, [projectId]);
 
     useFrame(() => {
-        if (csgRef.current) {
+        if (csgRef.current && selectedWallAsset) {
             csgRef.current.update();
         }
     })

app/src/modules/scene/camera/camMode.tsx

@@ -19,7 +19,9 @@ const CamMode: React.FC = () => {
 
     useEffect(() => {
         const handlePointerLockChange = async () => {
-            if (camMode === "FirstPerson" && !toggleView) {
+            if (document.pointerLockElement && !toggleView) {
+                return;
+            } else if (camMode === "FirstPerson" && !toggleView) {
                 setCamMode("ThirdPerson");
                 await switchToThirdPerson(state.controls, state.camera);
             }

app/src/modules/scene/clouds/clouds.tsx

@@ -1,7 +1,7 @@
 import * as THREE from 'three';
 import { useRef, useState } from 'react';
 import { useFrame } from '@react-three/fiber';
-import { Clouds, Cloud } from '@react-three/drei';
+import { Clouds as DreiClouds, Cloud } from '@react-three/drei';
 
 interface CloudGroupProps {
     initialX: number;
@@ -26,7 +26,7 @@ function CloudGroup({ initialX, initialZ, speed, height }: Readonly<CloudGroupPr
 
     return (
         <group ref={group} position={[initialX, height, initialZ]}>
-            <Clouds material={THREE.MeshBasicMaterial} frustumCulled={false} limit={10000}>
+            <DreiClouds material={THREE.MeshBasicMaterial} frustumCulled={false} limit={10000}>
                 <Cloud
                     seed={Math.random() * 100}
                     bounds={[100, 15, 100]}
@@ -51,12 +51,12 @@ function CloudGroup({ initialX, initialZ, speed, height }: Readonly<CloudGroupPr
                     fade={10000}
                     color="#f0f0f0"
                 />
-            </Clouds>
+            </DreiClouds>
         </group>
     );
 }
 
-export function MovingClouds() {
+export default function Clouds() {
 
     const savedTheme: string | null = localStorage.getItem("theme");
     const [theme, setTheme] = useState(savedTheme || "light");
@@ -71,8 +71,6 @@ export function MovingClouds() {
     ];
 
     return (
-        <>
-            {theme === 'light' &&
         <>
             {cloudGroups.map((group, index) => (
                 <CloudGroup
@@ -84,7 +82,5 @@ export function MovingClouds() {
                 />
             ))}
         </>
-            }
-        </>
     );
 }

app/src/modules/scene/setup/setup.tsx

@@ -1,5 +1,6 @@
 import Sun from '../environment/sky'
 import Shadows from '../environment/shadow'
+// import Clouds from '../clouds/clouds';
 import PostProcessing from '../postProcessing/postProcessing'
 import StatsHelper from '../helpers/StatsHelper';
 import Controls from '../controls/controls';
@@ -18,7 +19,7 @@ function Setup() {
 
             <PostProcessing />
 
-            {/* <MovingClouds /> */}
+            {/* <Clouds /> */}
 
             <Environment files={background} environmentIntensity={1.5} />