From 41fbe5443022c607adc338f3417a29a86a305370 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Tue, 27 Aug 2024 09:37:05 +0300
Subject: [PATCH] circle pointer

---
 front/public/pointer.glb                   | Bin 3992 -> 6304 bytes
 front/src/components/Promo/load_models.vue |  56 +++++++++------------
 front/src/stores/raw_data.ts               |   8 +++
 3 files changed, 31 insertions(+), 33 deletions(-)
 create mode 100644 front/src/stores/raw_data.ts

diff --git a/front/public/pointer.glb b/front/public/pointer.glb
index 8caf52d8bdc2a73071c8a4decaf90cdd5d28dddd..73d796e13cf7c4b4654ee2b5338e58ecb7742aae 100644
GIT binary patch
literal 6304
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
N$Ds0K3XehQPXGp^qhtU8

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<*X<jWl*Lp>sw3;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{Wk<D-fABV{zL|*>N+GNZA?Nwv*}TOZrr~wVqXH<!XJd;ugFz4;2P=S3fET_q=0f
z8_O6;r^&I-4A5pAZ7$6PV{TZiRJ_tewZ3r2cWXE*&$j9uESA()z<`48{+chAS>{AI
z2Q{Fz$vriRrNCSCLho)Tq!@;QH&+iy8^)D<VR&*lKd$CDo}U=&8#S_VwCnk0uf!M&
z1v)(=Xju)VSi)AV8t|($jJf*!yc<k;?k7s6R9#%E`mP^N-e1BONXD&H)F@T!K5kY9
zaIts~X^B`em5yiZL^_kO6ILpICTd2Xb@F%~F4pv^XZMis94|6LRoIxiIFP_)e7eCn
zdwFq#FG|NWo=s1zozF@mpp#!1=o{^uF!+U@Oh})Yn%3O?&>eOCg%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#qb<jUCy)H59i$Nv&A}mMrX?HN4BN-<G*Ly*MIy*
zVe6lX_O~nlD*V%L=i9|k540K2H#sr)8Ar@K<`Ywoy2N;zn%~jl9Zkp4^mAI>oYqfH
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<P
zpK-*@V?HtUs7s8esrh@gct_K5G<`>_>uCKrTAw+k41+p3_|?5aogCsF?x7BK6h<BD
zE6g`JW4O;aV&*ZQn0nMD#>4(|1gx*ca}He{&Zn!-xhc%^Y5lacKHJoTw2E8D>vLGY
z1M7F-|GWdH#N{I~@pnZmnZVn^UmP|e1=s?739)4ob`s2%q+Er)3YL_VOu<fprR0oU
zgS`fJM$&Q}_BvQvGI9g<23SV2aufC@SXR!;H0(6kSve=SU~hq)lk+kII|FuJdgV6k
zZLnT(WEOT7%#n!XU~^y*IUs$oeP9Q~kbc;HFhdT?0PFzRK{+HBU@w3jlEZQl_9EC}
zIU<9wgJ4JGs9b`*1a?%8$q?)i*fBXS!?43($K`}vhP@1SLQcvE><HLNiOMMKC|FcZ
z$r$Vy*eQw0IP5rBOioK4HV<ZE)_K@Gd?K&N2CP@52kSN2h_y*JW4$h0u(rxJtT$vk
z)(&|S>n+)d^|tK7dPjC+y(@dL-jlsp@5?@{4`e^qhw372P|6#X<`$*4UFqyp3cFSA
ZUX`_9#rLSlZ7OD$+TEx8o0Vq|@PBuPLQntz

diff --git a/front/src/components/Promo/load_models.vue b/front/src/components/Promo/load_models.vue
index 732edb7..67cf20e 100644
--- a/front/src/components/Promo/load_models.vue
+++ b/front/src/components/Promo/load_models.vue
@@ -6,6 +6,7 @@ import {
     Vector2, Vector3,
     Object3D,
     MeshPhongMaterial,
+    CircleGeometry,
 } from 'three';
 
 import { useTresContext, useSeek, useTexture, useLoop } from '@tresjs/core';
@@ -112,7 +113,7 @@ const loadModels = async () => {
         let { scene: loaded_scene } = await useGLTF(item.modelUrl)
         item.modelFile = loaded_scene
         item.name = element.name
-        
+
         if (!element.is_enabled) {
             item.modelFile.visible = false
         }
@@ -125,7 +126,7 @@ const loadModels = async () => {
             )
             item.modelFile.children[0].updateMatrixWorld(true)
         }
-        
+
         item.modelFile.updateMatrixWorld(true)
         models.value.push(item)
 
@@ -186,12 +187,13 @@ const loadModels = async () => {
 
             const p = raw_data.min_distance * 0.05
 
-            const point = pointer_pin.clone()
+            const point = new Mesh(
+                new CircleGeometry(p, 32),
+                new MeshPhongMaterial({ emissive: new Color(1, 1, 1), emissiveIntensity: 10 })
+            )
             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.material = new MeshPhongMaterial({ emissive: new Color(1, 1, 1), emissiveIntensity: 10 })
             point.updateMatrixWorld()
 
             if (clickable_items.value.find(el => el.name == point.name)) continue
@@ -229,20 +231,11 @@ const loadModels = async () => {
         (controls.value as any).autoRotate = false;
     }
 }
-const lookAtCamera = (obj: Group) => {
-    if (!obj || !obj.children) {
-        return
-    }
-    obj.children.forEach((element: Object3D) => {
-        if (element && typeof element.lookAt == 'function' && camera.value) {
-            element.lookAt(obj.position.x, obj.position.y * Math.PI * -0.5, camera.value?.position.z)
-        }
-    });
-}
+
 const { onAfterRender } = useLoop()
 onAfterRender(() => {
     clickable_refs.value.map(el => {
-        lookAtCamera(el.value[0])
+        el.value[0].lookAt(camera.value?.position)
     })
     if (controls.value) {
         if (timer.value == 0) {
@@ -254,24 +247,21 @@ onAfterRender(() => {
 const openSidebar = (id: number) => {
     sidebar.open(id);
 
-    // const clickable = useClickable()
-    // const target = clickable.list.find(el => el.id == id)
-    // if (!target) return
-    // const el = seekByName(scene.value, target.object_name);
-    // if (el) {
-    //     // (controls.value as any).maxDistance = 10;
-    //     // (controls.value as any).minDistance = 1;
-    //     const target_vector = new Vector3();
+    const clickable = useClickable()
+    const target = clickable.list.find(el => el.id == id)
+    if (!target) return
+    const el = seekByName(scene.value, `${id}_clickable`);
+    console.log(el)
+    if (el) {
+        (controls.value as any).maxDistance = 10;
+        (controls.value as any).minDistance = 1;
+        const target_vector = new Vector3();
 
-    //     el.getWorldPosition(target_vector);
-    //     (controls.value as any).target = target_vector;
-    //     console.log(target_vector)
-
-    //     target_vector.copy( el.position );
-    //     el.localToWorld( target_vector );
-    //     console.log(target_vector)
-    //     // (camera.value as any).lookAt(el)
-    // }
+        el.getWorldPosition(target_vector);
+        (controls.value as any).target = target_vector;
+        console.log(target_vector)
+        // (camera.value as any).lookAt(el)
+    }
 }
 
 loadModels()
diff --git a/front/src/stores/raw_data.ts b/front/src/stores/raw_data.ts
new file mode 100644
index 0000000..94977ef
--- /dev/null
+++ b/front/src/stores/raw_data.ts
@@ -0,0 +1,8 @@
+import { defineStore } from 'pinia'
+export const useRawData = defineStore('raw_data', {
+    state: () => {
+        return {
+            
+        } 
+    },
+})