diff --git a/app/src/modules/builder/point/point.tsx b/app/src/modules/builder/point/point.tsx index 3293d45..f7a3d86 100644 --- a/app/src/modules/builder/point/point.tsx +++ b/app/src/modules/builder/point/point.tsx @@ -72,24 +72,27 @@ function Point({ point }: { readonly point: Point }) { ) : ( - - - - - + + + + + - - - + + + + - + )} ); diff --git a/app/src/modules/scene/controls/selectionControls/selection2D/moveControls2D.tsx b/app/src/modules/scene/controls/selectionControls/selection2D/moveControls2D.tsx index 9098125..77fe2a8 100644 --- a/app/src/modules/scene/controls/selectionControls/selection2D/moveControls2D.tsx +++ b/app/src/modules/scene/controls/selectionControls/selection2D/moveControls2D.tsx @@ -9,8 +9,6 @@ import { getUserData } from "../../../../../functions/getUserData"; import { useSceneContext } from "../../../sceneContext"; import { useSelectedPoints } from "../../../../../store/simulation/useSimulationStore"; import useModuleStore from "../../../../../store/ui/useModuleStore"; -import useWallAssetResponseHandler from "../../../../collaboration/responseHandler/useWallAssetResponseHandler"; -import useWallResponseHandler from "../../../../collaboration/responseHandler/useWallResponseHandler"; import { calculateAssetTransformationOnWall } from "../../../../builder/wallAsset/Instances/Instance/functions/calculateAssetTransformationOnWall"; import { upsertAisleApi } from "../../../../../services/factoryBuilder/aisle/upsertAisleApi"; @@ -18,6 +16,9 @@ import { upsertWallApi } from "../../../../../services/factoryBuilder/wall/upser import { upsertFloorApi } from "../../../../../services/factoryBuilder/floor/upsertFloorApi"; import { upsertZoneApi } from "../../../../../services/factoryBuilder/zone/upsertZoneApi"; import { upsertWallAssetApi } from "../../../../../services/factoryBuilder/asset/wallAsset/upsertWallAssetApi"; + +import useWallAssetResponseHandler from "../../../../collaboration/responseHandler/useWallAssetResponseHandler"; +import useWallResponseHandler from "../../../../collaboration/responseHandler/useWallResponseHandler"; import useAisleResponseHandler from "../../../../collaboration/responseHandler/useAisleResponseHandler"; function MoveControls2D({ movedObjects, setMovedObjects, pastedObjects, setPastedObjects, duplicatedObjects, setDuplicatedObjects, rotatedObjects, setRotatedObjects }: any) { diff --git a/app/src/types/world/worldConstants.ts b/app/src/types/world/worldConstants.ts index e81e102..a53284c 100644 --- a/app/src/types/world/worldConstants.ts +++ b/app/src/types/world/worldConstants.ts @@ -115,6 +115,8 @@ export type PointConfig = { defaultOuterColor: string; deleteColor: string; screenSpaceBoxScale: [number, number, number]; + screenSpaceSphere: [number, number, number]; + screenSpaceTorus: [number, number, number, number]; boxScale: [number, number, number]; wallOuterColor: string; floorOuterColor: string; @@ -319,13 +321,15 @@ export const pointConfig: PointConfig = { defaultOuterColor: "#ffffff", // Default outer color of the points deleteColor: "#ff0000", // Color of the points when deleting screenSpaceBoxScale: [20, 20, 20], // Scale of the points + screenSpaceSphere: [7.5, 8, 16], // [Radius, WidthSegment, HeightSegment] + screenSpaceTorus: [7.5, 5, 2, 16], // [Radius, Tube, RadicalSegment, TublarSegment] boxScale: [0.5, 0.5, 0.5], // Scale of the points wallOuterColor: "#C7C7C7", // Outer color of the wall points floorOuterColor: "#808080", // Outer color of the floor points aisleOuterColor: "#FBBC05", // Outer color of the aisle points zoneOuterColor: "#007BFF", // Outer color of the zone points - snappingThreshold: 1, // Threshold for snapping helperColor: "#C164FF", // Color of the helper lines + snappingThreshold: 1, // Threshold for snapping }; export const lineConfig: LineConfig = {