From 9962f332969a0a581b3e5c49977197e4a46fe233 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Fri, 16 Aug 2024 12:54:49 +0300
Subject: [PATCH] add pointer

---
 front/public/pointer.glb                   | Bin 0 -> 6300 bytes
 front/src/components/Promo/load_models.vue |  48 ++++++++++-----------
 2 files changed, 22 insertions(+), 26 deletions(-)
 create mode 100644 front/public/pointer.glb

diff --git a/front/public/pointer.glb b/front/public/pointer.glb
new file mode 100644
index 0000000000000000000000000000000000000000..bd476d769110b6f407d0a887e3ed9a8b58038750
GIT binary patch
literal 6300
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
aD)WPsnVpq6KFZU6%6I^dgy6dk=KSB}5(_T?

literal 0
HcmV?d00001

diff --git a/front/src/components/Promo/load_models.vue b/front/src/components/Promo/load_models.vue
index ca8171e..9e35da4 100644
--- a/front/src/components/Promo/load_models.vue
+++ b/front/src/components/Promo/load_models.vue
@@ -1,10 +1,9 @@
 <script setup lang="ts">
 import { onMounted, onUnmounted, reactive, ref, watch } from 'vue';
 import {
-    Box3, Color, DoubleSide, Group, Mesh, MeshBasicMaterial,
-    MeshStandardMaterial,
-    MeshStandardMaterialParameters,
-    PlaneGeometry, SpriteMaterial, TextureLoader, Vector2, Vector3,
+    Box3, Color, DoubleSide, Group, Mesh, PlaneGeometry,
+    MeshStandardMaterial, MeshStandardMaterialParameters,
+    Vector2, Vector3, Object3D
 } from 'three';
 
 import { useTresContext, useSeek, useTexture, useLoop } from '@tresjs/core';
@@ -23,20 +22,23 @@ const models = ref<model3DType[]>([])
 const clickable = ref<clickableAreaType[]>([])
 const clickable_items = ref<any[]>([])
 const clickable_refs = ref<any[]>([])
+const envVars = reactive({}) as EnvVars
+
 const sidebar = usePromoSidebar();
 const sidebar_scene = usePromoScene()
 const { controls, camera, scene, raycaster, renderer } = useTresContext()
 const { pause, resume } = useLoop()
 const { seekByName, seekAllByName } = useSeek()
-const envVars = reactive({}) as EnvVars
 
 const groundTexture = await useTexture({
     displacementMap: '/ground_displacement.jpg',
 })
 
+const { scene: pointer_pin } = await useGLTF('/pointer.glb')
+
 const timer = ref(10)
 setInterval(() => {
-    console.log({ timer: timer.value })
+    // console.log({ timer: timer.value })
     if (timer.value > 0) {
         timer.value -= 1
     } else if (timer.value == 0 && !(controls.value as any).autoRotate && (controls.value as any).enabled) {
@@ -51,10 +53,6 @@ setInterval(() => {
     }
 }, 1000);
 
-// renderer.value.capabilities.maxTextures = 4
-// renderer.value.capabilities.maxTextureSize = 512
-renderer.value.capabilities.precision = 'lowp'
-
 const loadModels = async () => {
     const res = await fetch(`${SERVER_URL}/api/obj/scene/${props.source}`)
     const raw_data = await res.json() as scene3D
@@ -167,23 +165,20 @@ const loadModels = async () => {
             (find_element as Mesh).localToWorld(world_position);
 
             const p = raw_data.min_distance * 0.05
-            const plane = new PlaneGeometry(p, p, 32)
+            // const plane = new PlaneGeometry(p, p, 32)
 
-            const mesh_material = new MeshBasicMaterial({ side: DoubleSide })
-            const sprite_material = new SpriteMaterial()
-            if (element.image) {
-                const map = new TextureLoader().load(`${IMAGE_URL}/${element.image}`);
-                mesh_material.map = map
-                sprite_material.map = map
-            } else {
-                mesh_material.color = new Color('red')
-                sprite_material.color = new Color('red')
-            }
+            // const mesh_material = new MeshBasicMaterial({ side: DoubleSide })
+            // mesh_material.color = new Color('red')
+            // if (element.image) {
+            //     const map = new TextureLoader().load(`${IMAGE_URL}/${element.image}`);
+            //     mesh_material.map = map
+            // }
 
-            const point = new Mesh(plane, mesh_material);
+            const point = pointer_pin.clone()
             point.position.set(world_position.x, p * 3, world_position.z)
             point.name = `${element.id}_clickable`
-            point.renderOrder = 10
+            point.scale.set(p * 2, p * 2, p * 2)
+            point.updateMatrixWorld()
 
             if (clickable_items.value.find(el => el.name == point.name)) continue
             clickable_items.value.push(point)
@@ -215,8 +210,9 @@ const loadModels = async () => {
 const { onAfterRender } = useLoop()
 onAfterRender(() => {
     clickable_refs.value.map(el => {
-        if (el.value[0] && typeof el.value[0].lookAt == 'function') {
-            el.value[0].lookAt(camera.value?.position);
+        if (el.value[0].children[0] && typeof el.value[0].children[0].lookAt == 'function') {
+            el.value[0].children[0].lookAt(camera.value?.position);
+            // el.value[0].updateMatrixWorld()
         }
     })
     if (controls.value) {
@@ -318,7 +314,7 @@ watch(() => sidebar_scene.list, () => {
             </TresGroup>
         </template>
         <template v-for="(item, i) in clickable_items">
-            <TresMesh v-bind="item" :ref="clickable_refs[i]" />
+            <TresObject3D v-bind="item.clone()" :ref="clickable_refs[i]" />
         </template>
     </TresGroup>
 </template>
\ No newline at end of file