From 052f4d6e414f8b400ae5e6abe1885563a1f47616 Mon Sep 17 00:00:00 2001
From: Kseninia Mikhaylova <k.mikhailova@svs-tech.pro>
Date: Tue, 4 Feb 2025 10:38:47 +0300
Subject: [PATCH] aristo

---
 components/calc/values.vue                    |   4 +-
 components/dropdown/list.vue                  |  25 ++++++--
 components/model/parametric.vue               |  41 +++++++++----
 components/topper.ts                          |  55 +++++++++++++++---
 composables/globalFenceType.ts                |   1 +
 pages/index.vue                               |   7 ++-
 .../{shapka.glb => pillar/topper/aristo1.glb} | Bin
 7 files changed, 105 insertions(+), 28 deletions(-)
 rename public/models_one/{shapka.glb => pillar/topper/aristo1.glb} (100%)

diff --git a/components/calc/values.vue b/components/calc/values.vue
index e7910f3..cd65ad7 100644
--- a/components/calc/values.vue
+++ b/components/calc/values.vue
@@ -19,6 +19,7 @@ const section_count = use_section_count()
 const extra_section = use_extra_section()
 const total_length = use_total_length()
 const min_length = use_min_length()
+const globalFenceType = useGlobalFenceType()
 
 if (!pillar_color.value) {
     const r = Math.floor(Math.random() * predefPillarColors.length)
@@ -205,7 +206,8 @@ const calc_table = computed(() => {
                     :goto_cam="new Vector3(1, 2, -1)" />
                 <label for="pillar_topper">Колпак столба</label>
                 <DropdownPicker type="topper" :cb="setPillarTopper" name="pillar_topper"
-                    :pattern="getTopper(pillar_topper)" :disabled="remove_pillar"
+                    :pattern="getTopper(pillar_topper, globalFenceType?.type == 'aristo' ? 'aristoToppers' : 'baseToppers')"
+                    :disabled="remove_pillar"
                     :goto_target="new Vector3(fence_section * -0.5, lamelles_count * lamelle_height, 0)"
                     :goto_cam="new Vector3(-1, 2, 1)" />
             </div>
diff --git a/components/dropdown/list.vue b/components/dropdown/list.vue
index 2aa0af9..d553083 100644
--- a/components/dropdown/list.vue
+++ b/components/dropdown/list.vue
@@ -1,24 +1,39 @@
 <script setup lang="ts">
 import { getFilename as getPattern, patterns } from '../pattern';
-import { getFilename as getTopper, toppers } from '../topper';
+import { getFilename as getTopper, baseToppers, aristoToppers } from '../topper';
 
+const globalFenceType = useGlobalFenceType()
 const props = defineProps(['cb', 'patterns']);
 type pType = {
-    list: typeof patterns | typeof toppers,
+    list: typeof patterns | typeof baseToppers,
     func: any
+    type: string | null
 }
-const p = {
+const p = reactive({
     list: [],
+    type: null,
     func: () => { }
-} as pType
+} as pType)
 
 if (props.patterns == 'pattern') {
     p.list = patterns;
     p.func = getPattern
 } else if (props.patterns == 'topper') {
-    p.list = toppers
+    p.list = baseToppers
     p.func = getTopper
 }
+watch(globalFenceType, () => {
+    if (props.patterns == 'topper') {
+        if (globalFenceType.value?.type == 'standart') {
+            p.list = baseToppers
+            p.type = 'toppers'
+        }
+        if (globalFenceType.value?.type == 'aristo') {
+            p.list = aristoToppers
+            p.type = 'aristoToppers'
+        }
+    }
+})
 </script>
 <template>
     <template v-for="item in p.list">
diff --git a/components/model/parametric.vue b/components/model/parametric.vue
index 4f65c82..ce23ab6 100644
--- a/components/model/parametric.vue
+++ b/components/model/parametric.vue
@@ -3,7 +3,7 @@ import { Object3D, Vector3 } from 'three';
 //@ts-ignore
 import { useGLTF, } from '@tresjs/cientos'
 import type { OrbitControlsProps } from '@tresjs/cientos/dist/core/controls/OrbitControls.vue.js';
-import { getModel, toppers, type toppersIds } from '../topper';
+import { getModel, allToppers, baseToppers, aristoToppers, type toppersIds } from '../topper';
 
 const section_count = use_section_count()
 const extra_section = use_extra_section()
@@ -22,10 +22,16 @@ const { seek, seekAll } = useSeek()
 
 const globalFenceType = useGlobalFenceType()
 
-const topper_models = {} as { [key: toppersIds]: Object3D }
-for await (const element of toppers) {
-    const { scene } = await useGLTF(getModel(element.id))
-    topper_models[element.id] = scene
+const topper_models = {
+    baseToppers: {} as { [key: toppersIds]: Object3D },
+    aristoToppers: {} as { [key: toppersIds]: Object3D },
+}
+for (const key of Object.keys(allToppers)) {
+    let toppers = allToppers[key]
+    for await (const element of toppers) {
+        const { scene } = await useGLTF(getModel(element.id, key))
+        topper_models[key][element.id] = scene
+    }
 }
 
 const { scene: model_pillar_center } = await useGLTF('/models_one/pillar/center.glb')
@@ -44,7 +50,7 @@ const { scene: lamelle_model_standart } = await useGLTF('/models_one/lamel_100.g
 const { scene: lamelle_model_aristo } = await useGLTF('/models_one/lamel_100_aristo.glb', { draco: true });
 
 const top = ref(top_model)
-const pillar_top = ref(topper_models[pillar_topper.value])
+const pillar_top = ref()
 const pillar_center = ref(model_pillar_center)
 const pillar_bottom = ref(model_pillar_bottom)
 const pillar_inner = ref(model_pillar_inner)
@@ -54,9 +60,15 @@ const fastening_side = ref(model_fastening_side)
 const fixing = ref(model_fixing)
 const lamelle = ref(lamelle_model_standart)
 
-watch(pillar_topper, async () => {
-    pillar_top.value = topper_models[pillar_topper.value]
-})
+const setPillarTopper = () => {
+    let key = 'baseToppers'
+    if (globalFenceType.value?.type == 'aristo') {
+        key = 'aristoToppers'
+    }
+    pillar_top.value = topper_models[key][pillar_topper.value]
+}
+setPillarTopper()
+watch(pillar_topper, setPillarTopper)
 
 const total = ref((section_count.value + ~~(!!extra_section.value)))
 const size = ref(Math.ceil(total.value / 4))
@@ -120,13 +132,17 @@ const min_for_square = 12;
 setTarget()
 
 const setLamelleType = () => {
-    if (globalFenceType.value?.id == 5) {
+    if (globalFenceType.value?.type == 'standart') {
         lamelle.value = lamelle_model_standart
         lamelle_height.value = 0.115
+        pillar_topper.value = 0
+        setPillarTopper()
     }
-    if (globalFenceType.value?.id == 6) {
+    if (globalFenceType.value?.type == 'aristo') {
         lamelle.value = lamelle_model_aristo
         lamelle_height.value = 0.196
+        pillar_topper.value = 0
+        setPillarTopper()
     }
 }
 setLamelleType()
@@ -134,7 +150,8 @@ watch(() => globalFenceType.value?.id, setLamelleType)
 </script>
 <template>
     <TresGroup name="base">
-        <template v-for="line in (total >= min_for_square) ? 4 : 1" :key="`${globalFenceType?.id ?? 5}_${line}_${count}`">
+        <template v-for="line in (total >= min_for_square) ? 4 : 1"
+            :key="`${globalFenceType?.id ?? 5}_${line}_${count}`">
             <ModelLine :models="{
                 top,
                 pillar_center, pillar_top, pillar_bottom, pillar_inner,
diff --git a/components/topper.ts b/components/topper.ts
index e27779d..0ee65fb 100644
--- a/components/topper.ts
+++ b/components/topper.ts
@@ -1,24 +1,63 @@
-export const toppers = [
+interface Topper {
+    id: number; // ID элемента
+    name: string; // Название
+    filename: string; // Имя файла
+    model: string; // Модель
+}
+
+export const baseToppers = [
     { name: 'Ровный', filename: 'icon_stolb_verh_3.svg', model: 'top' },
     { name: 'Вершина 1', filename: 'icon_stolb_verh_2.svg', model: 'decor1' },
     { name: 'Вершина 2', filename: 'icon_stolb_verh_1.svg', model: 'decor2' },
 ].map((el, i) => Object.assign(el, { id: i }))
 
-export const getFilename = (id: toppersIds) => {
-    const el = toppers.find(el => el.id == id)
+export const aristoToppers = [
+    { name: 'Колпак', filename: 'icon_stolb_verh_1.svg', model: 'aristo1' },
+].map((el, i) => Object.assign(el, { id: i }))
+
+export const allToppers = {
+    'baseToppers': baseToppers,
+    'aristoToppers': aristoToppers,
+} as { [key: string]: Topper[] }
+
+function getToppersByType(type: string | null): any {
+    if (!type) type = 'NONE'
+    // Проверяем, существует ли указанный тип в объекте allToppers
+    if (allToppers[type]) {
+        return allToppers[type];
+    }
+
+    // Если типа нет, берем первый доступный элемент из allToppers
+    const keys = Object.keys(allToppers);
+    if (keys.length > 0) {
+        const firstKey = keys[0];
+        return allToppers[firstKey];
+    }
+
+    // Если объект allToppers пустой, возвращаем значение по умолчанию (например, пустой массив)
+    return [];
+}
+export const getFilename = (id: toppersIds, type: string | null) => {
+    let toppers = getToppersByType(type)
+
+    const el = toppers.find((el: Topper) => el.id == id)
     if (!el || !el.filename) return undefined
     return `/topper/${el?.filename}`
 }
 
-export const getName = (id: toppersIds) => {
-    const el = toppers.find(el => el.id == id)
+export const getName = (id: toppersIds, type: string | null) => {
+    let toppers = getToppersByType(type)
+
+    const el = toppers.find((el: Topper) => el.id == id)
     if (!el || !el.filename) return undefined
     return el.name
 }
-export const getModel = (id: toppersIds) => {
-    const el = toppers.find(el => el.id == id)
+export const getModel = (id: toppersIds, type: string | null) => {
+    let toppers = getToppersByType(type)
+
+    let el = toppers.find((el: Topper) => el.id == id)
     if (!el || !el.filename) return undefined
     return `/models_one/pillar/topper/${el?.model}.glb`
 }
 
-export type toppersIds = typeof toppers[number]['id']
\ No newline at end of file
+export type toppersIds = typeof allToppers[string][number]['id']
\ No newline at end of file
diff --git a/composables/globalFenceType.ts b/composables/globalFenceType.ts
index 83e185a..2b524dd 100644
--- a/composables/globalFenceType.ts
+++ b/composables/globalFenceType.ts
@@ -1,5 +1,6 @@
 interface calc {
     id: number
+    type: 'standart' | 'aristo'
     calc: ApiCalcType
 }
 export const useGlobalFenceType = () => useState<calc | null>('fence-global-type', () => null)
diff --git a/pages/index.vue b/pages/index.vue
index ed1163d..263f877 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -56,11 +56,14 @@ const setCalcData = (id: number) => {
 watch(openTab, () => {
     if (!openTab.value) return
     if (!calculators.value) return
-
+    let type = 'standart'
+    if (openTab.value == 6) {
+        type = 'aristo'
+    }
     const v = {
         id: openTab.value as number,
+        type: type as "standart"|"aristo",
         calc: calculators.value.find(el => el.id == openTab.value) as ApiCalcType,
-
     }
     globalFenceType.value = v
 })
diff --git a/public/models_one/shapka.glb b/public/models_one/pillar/topper/aristo1.glb
similarity index 100%
rename from public/models_one/shapka.glb
rename to public/models_one/pillar/topper/aristo1.glb