From 69add3ceaba8f30b585ded0b3dbaf8eff51e67cb Mon Sep 17 00:00:00 2001 From: Kseninia Mikhaylova Date: Tue, 24 Sep 2024 13:02:19 +0300 Subject: [PATCH] remove async --- components/calcModels.vue | 2 +- components/calcValues.vue | 11 ++------- components/model/parametric.vue | 7 +----- pages/calc.vue | 4 ++-- public/models_one/krepleniye_planok (1).glb | Bin 3588 -> 0 bytes public/models_one/krepleniye_planok.glb | Bin 0 -> 3452 bytes public/models_one/pointer.glb | Bin 90284 -> 0 bytes utils/material.ts | 24 ++++++++++---------- 8 files changed, 18 insertions(+), 30 deletions(-) delete mode 100644 public/models_one/krepleniye_planok (1).glb create mode 100644 public/models_one/krepleniye_planok.glb delete mode 100644 public/models_one/pointer.glb diff --git a/components/calcModels.vue b/components/calcModels.vue index a929ec9..30b45b2 100644 --- a/components/calcModels.vue +++ b/components/calcModels.vue @@ -44,7 +44,7 @@ watch(fence_section, ()=>{ - + diff --git a/components/calcValues.vue b/components/calcValues.vue index cd3c860..c0c6787 100644 --- a/components/calcValues.vue +++ b/components/calcValues.vue @@ -148,7 +148,6 @@ const goal = (target: string, params: object) => { (nuxtApp.$metrika as any).reachGoal(target, params || {}) } } -const show_extra = ref(false) const calc_table = computed(() => { return [ { @@ -233,16 +232,10 @@ const calc_table = computed(() => {
- - - -
diff --git a/components/model/parametric.vue b/components/model/parametric.vue index dbac4a6..306f95f 100644 --- a/components/model/parametric.vue +++ b/components/model/parametric.vue @@ -34,7 +34,6 @@ const { scene: model_fence_bottom } = await useGLTF('/fence_one/bottom.glb') const { scene: model_fence_inner } = await useGLTF('/fence_one/inner.glb') const { scene: fastening_model } = await useGLTF('/models_one/krepleniye_planok (1).glb', { draco: true }); const { scene: lamelle_model } = await useGLTF('/models_one/lamel_100.glb', { draco: true }); -const { scene: point_model } = await useGLTF('/models_one/pointer.glb'); [model_fence_top, model_fence_bottom].map((sc: Object3D) => sc.traverse((child: Object3D) => { @@ -43,7 +42,6 @@ const { scene: point_model } = await useGLTF('/models_one/pointer.glb'); } }) ) -point_model.traverse((el: Object3D) => el.position.set(0, 0, 0)) const top = ref(top_model) const fence = ref(model_fence_center) @@ -52,7 +50,6 @@ const fence_bottom = ref(model_fence_bottom) const fence_inner = ref(model_fence_inner) const fastening = ref(fastening_model) const lamelle = ref(lamelle_model) -const pointer = ref(point_model) if (!pillar_color.value) { const r = Math.floor(Math.random() * predefPillarColors.length) @@ -67,8 +64,6 @@ set_material(lamelle.value, getColorHexFromRal(lamelle_color.value)); (el: Ref) => { set_material(el.value, getColorHexFromRal(pillar_color.value)) }); [fence_inner].map( (el: Ref) => { set_material(el.value, getColorHexFromRal(pillar_color.value), lamelle_count.value) }); -set_material(pointer.value, getColorHexFromRal('5012')); - const { seek, seekAll } = useSeek() watch(lamelle_color, () => { @@ -159,7 +154,7 @@ onMounted(async () => {