From 47627410b7b5fe38b0c6fcedcd8889b50f657335 Mon Sep 17 00:00:00 2001 From: aarizona Date: Mon, 26 Aug 2024 19:09:02 +0300 Subject: [PATCH] pointer --- front/public/pointer.glb | Bin 6300 -> 3992 bytes front/src/components/Promo/load_models.vue | 11 +++++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/front/public/pointer.glb b/front/public/pointer.glb index bd476d769110b6f407d0a887e3ed9a8b58038750..8caf52d8bdc2a73071c8a4decaf90cdd5d28dddd 100644 GIT binary patch literal 3992 zcmeHHO>Yxd6uqS>P@vFKN-3q(4BuePcsw??fsB(tNXUn29KuHkkz-H7RL(dWk15oO zWC?ZKT~YfFy6U#O*lJa&>bARf({3wOEV?RHrJnO*hlfCjRacp(+&SmId(XY^&T|$j zlY<*Xsw3;FSeQLNS6(8xB71=n|jVpt7~tTA#YsQT4fWC1CW{)+3D-5@f2 zIv=@f$E;Y&G@`~`H>i14AHi14G?t@=doOf-x@uQzZrR9A8zVy#vx~*h4ZLEdHe2^A zUTDljjamtnjI7x~HH0<{zqkmWQBZqP!>^WIZkRL6$mp_$vFO(BsMJpUfESc1Zp<_- zv{WkN+GNZA?Nwv*}TOZrr~wVqXH{AI z2Q{Fz$vriRrNCSCLho)Tq!@;QH&+iy8^)DeOCg%DRc9#0~jp8Wj0 z`X%DChs9ulKgxuiNm)-$^AgFcaxa^oOxaJ@wh|^hdV1o?Svu#?nzz!aG;T*E60x_6 z^be2Yzf1RNw!Zt}(hAwiu10J3qwf{I{h-qNC9}OnfBe_U)?YnIh506@pZkm>W*+m2 zSM{0-gElpPuNL2{={TCcqt$h^ejKe&hjmt;CjGs{sKa=LQHMGz4t1!nFyG{i=RV_z zna6zMRlTOdpzOcvU(w=MG#$=I#qboYqfH z>ocd6VNi#Dha7bnuQ2LRM`6^-K|jYBzR8KX&p2Y{F`t-v)FsBl{&NJZuf?}CotCEG z*6Oyke%e}}ZR+v){IgB%o(Dg#5dZl{Py4GN-y)v$9=AUJ;-SKWGrza?eBDx*Z*s

_>uCKrTAw+k41+p3_|?5aogCsF?x7BK6h4(|1gx*ca}He{&Zn!-xhc%^Y5lacKHJoTw2E8D>vLGY z1M7F-|GWdH#N{I~@pnZmnZVn^UmP|e1=s?739)4ob`s2%q+Er)3YL_VOun+)d^|tK7dPjC+y(@dL-jlsp@5?@{4`e^qhw372P|6#X<`$*4UFqyp3cFSA ZUX`_9#rLSlZ7OD$+TEx8o0Vq|@PBuPLQntz literal 6300 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 aD)WPsnVpq6KFZU6%6I^dgy6dk=KSB}5(_T? diff --git a/front/src/components/Promo/load_models.vue b/front/src/components/Promo/load_models.vue index 729f07e..3e974b8 100644 --- a/front/src/components/Promo/load_models.vue +++ b/front/src/components/Promo/load_models.vue @@ -183,7 +183,8 @@ const loadModels = async () => { const p = raw_data.min_distance * 0.05 const point = pointer_pin.clone() - point.position.set(world_position.x, p * 3, world_position.z) + point.rotateX(-0.5 * Math.PI) + point.position.set(world_position.x, p * 3, world_position.z * 2) point.name = `${element.id}_clickable` point.scale.set(p * 2, p * 2, p * 2) point.updateMatrixWorld() @@ -212,8 +213,8 @@ const loadModels = async () => { const box_size = new Vector3(); box.getSize(box_size) props.loaded_pan( - new Vector3(box_size.x * 0.5, box_size.y * 0.5, box_size.z * 0.5), - new Vector3(box_size.x * -0.5, box_size.y * -0.25, box_size.z * -0.5), + new Vector3(box_size.x * 0.25, box_size.y * 0.25, box_size.z * 0.25), + new Vector3(box_size.x * -0.25, box_size.y * -0.25, box_size.z * -0.25), ) controls.value.enabled = true; props.loaded(false) @@ -229,7 +230,7 @@ const lookAtCamera = (obj) => { } obj.children.forEach(element => { if (element && typeof element.lookAt == 'function') { - element.lookAt(camera.value?.position) + element.lookAt(obj.position.x, obj.position.y * Math.PI * -0.5, camera.value?.position.z) } }); } @@ -258,8 +259,6 @@ const passShader = (obj: Mesh | Group) => { } const openSidebar = (id: number) => { sidebar.open(id) - - } loadModels()