v3-ui #98

Merged
Vishnu merged 51 commits from v3-ui into main 2025-06-10 06:46:08 +00:00
12 changed files with 27 additions and 12 deletions
Showing only changes of commit c77e30dabb - Show all commits

View File

@ -53,15 +53,15 @@ async function addAssetModel(
intersectPoint = intersectPoint =
intersectedFloor.distance < intersectedPlane.distance intersectedFloor.distance < intersectedPlane.distance
? new THREE.Vector3( ? new THREE.Vector3(
intersectedFloor.point.x, intersectedFloor.point.x,
Math.round(intersectedFloor.point.y), Math.round(intersectedFloor.point.y),
intersectedFloor.point.z intersectedFloor.point.z
) )
: new THREE.Vector3( : new THREE.Vector3(
intersectedPlane.point.x, intersectedPlane.point.x,
0, 0,
intersectedPlane.point.z intersectedPlane.point.z
); );
} else if (intersectedFloor) { } else if (intersectedFloor) {
intersectPoint = new THREE.Vector3( intersectPoint = new THREE.Vector3(
intersectedFloor.point.x, intersectedFloor.point.x,
@ -111,7 +111,9 @@ async function addAssetModel(
selectedItem, selectedItem,
addEvent, addEvent,
addAsset, addAsset,
socket socket,
projectId,
userId
); );
}); });
} else { } else {
@ -129,7 +131,9 @@ async function addAssetModel(
selectedItem, selectedItem,
addEvent, addEvent,
addAsset, addAsset,
socket socket,
projectId,
userId
); );
} }
); );
@ -463,6 +467,7 @@ async function handleModelLoad(
userId: userId, userId: userId,
}; };
console.log('data: ', data);
socket.emit("v1:model-asset:add", data); socket.emit("v1:model-asset:add", data);
const asset = { const asset = {

View File

@ -144,6 +144,7 @@ const CamModelsGroup = () => {
}); });
socket.on("v1:camera:Response:update", (data: any) => { socket.on("v1:camera:Response:update", (data: any) => {
console.log('data: ', data);
if ( if (
!groupRef.current || !groupRef.current ||
socket.id === data.socketId || socket.id === data.socketId ||

View File

@ -84,6 +84,7 @@ export default function SocketResponses({
}); });
socket.on("v1:camera:Response:update", (data: any) => { socket.on("v1:camera:Response:update", (data: any) => {
console.log('dataCamera: ', data);
// //
}); });

View File

@ -22,6 +22,7 @@ export default function updateCamPosition(
socketId: socket.id, socketId: socket.id,
projectId projectId
}; };
// console.log('CameracamData: ', camData);
socket.emit("v1:Camera:set", camData); socket.emit("v1:Camera:set", camData);
localStorage.setItem("cameraPosition", JSON.stringify(position)); localStorage.setItem("cameraPosition", JSON.stringify(position));
localStorage.setItem("controlTarget", JSON.stringify(new THREE.Vector3(target.x, 0, target.z))); localStorage.setItem("controlTarget", JSON.stringify(new THREE.Vector3(target.x, 0, target.z)));

View File

@ -64,6 +64,7 @@ export default function Controls() {
socketId: socket.id, socketId: socket.id,
projectId projectId
}; };
// console.log('CameracamData: ', camData);
socket.emit('v1:Camera:set', camData) socket.emit('v1:Camera:set', camData)
setResetCamera(false); setResetCamera(false);

View File

@ -363,6 +363,7 @@ const CopyPasteControls = ({
projectId projectId
}; };
console.log('data: ', data);
socket.emit("v1:model-asset:add", data); socket.emit("v1:model-asset:add", data);
obj.userData = { obj.userData = {
@ -418,6 +419,7 @@ const CopyPasteControls = ({
userId userId
}; };
console.log('data: ', data);
socket.emit("v1:model-asset:add", data); socket.emit("v1:model-asset:add", data);
const asset: Asset = { const asset: Asset = {

View File

@ -338,6 +338,7 @@ const DuplicationControls = ({
userId userId
}; };
console.log('data: ', data);
socket.emit("v1:model-asset:add", data); socket.emit("v1:model-asset:add", data);
const asset: Asset = { const asset: Asset = {
@ -387,6 +388,7 @@ const DuplicationControls = ({
projectId projectId
}; };
console.log('data: ', data);
socket.emit("v1:model-asset:add", data); socket.emit("v1:model-asset:add", data);
const asset: Asset = { const asset: Asset = {

View File

@ -318,6 +318,7 @@ function MoveControls({
userId userId
}; };
console.log('data: ', data);
socket.emit("v1:model-asset:add", data); socket.emit("v1:model-asset:add", data);
AssetGroup.current.add(obj); AssetGroup.current.add(obj);

View File

@ -273,6 +273,7 @@ function RotateControls({
userId userId
}; };
console.log('data: ', data);
socket.emit("v1:model-asset:add", data); socket.emit("v1:model-asset:add", data);
AssetGroup.current.add(obj); AssetGroup.current.add(obj);

View File

@ -135,6 +135,7 @@ export default function TransformControl() {
projectId projectId
}; };
console.log('data: ', data);
socket.emit("v1:model-asset:add", data); socket.emit("v1:model-asset:add", data);
} }
} }

View File

@ -23,7 +23,7 @@ export const getCamera = async (organization: string, userId: string,projectId?:
} }
const result = await response.json(); const result = await response.json();
// console.log('result: ', result); console.log('resultCamera: ', result);
if (result === "user not found") { if (result === "user not found") {
return null; return null;
} else { } else {

View File

@ -31,7 +31,6 @@ export const setEnvironment = async (
renderDistance, renderDistance,
limitDistance, limitDistance,
projectId projectId
}), }),
} }
); );