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(() => { - {{ show_extra && item.extra_name ? item.extra_name : + {{ item.name }} - {{ show_extra ? item.extra : item.value }} + {{ item.value }} - show_extra = !show_extra"> - - - Рассчитать 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 () => { - diff --git a/pages/calc.vue b/pages/calc.vue index 8f12135..9e21708 100644 --- a/pages/calc.vue +++ b/pages/calc.vue @@ -1,8 +1,8 @@ - + - + \ No newline at end of file diff --git a/public/models_one/krepleniye_planok (1).glb b/public/models_one/krepleniye_planok (1).glb deleted file mode 100644 index 9982e33..0000000 Binary files a/public/models_one/krepleniye_planok (1).glb and /dev/null differ diff --git a/public/models_one/krepleniye_planok.glb b/public/models_one/krepleniye_planok.glb new file mode 100644 index 0000000..f9c1b84 Binary files /dev/null and b/public/models_one/krepleniye_planok.glb differ diff --git a/public/models_one/pointer.glb b/public/models_one/pointer.glb deleted file mode 100644 index 487e20d..0000000 Binary files a/public/models_one/pointer.glb and /dev/null differ diff --git a/utils/material.ts b/utils/material.ts index cfde1a2..b3fddc9 100644 --- a/utils/material.ts +++ b/utils/material.ts @@ -12,24 +12,24 @@ const set_metaril_func = (scene: any, material: any) => { }) } // const texture = await useLoader(TextureLoader, '/fence_one/svg_tile1.svg'); -const get_texture = async () => { - const texture = await useLoader(TextureLoader, '/fence_one/tile1.png'); - return texture -} -const texture = await get_texture() -texture.wrapT = RepeatWrapping; +// const get_texture = async () => { +// const texture = await useLoader(TextureLoader, '/fence_one/tile1.png'); +// return texture +// } +// const texture = await get_texture() +// texture.wrapT = RepeatWrapping; export const set_material = (scene: any, color: any, count: number | undefined = undefined) => { let c = color - if (count) { - // console.log(texture) - texture.repeat.set(1, count); - texture.needsUpdate = true - } + // if (count) { + // // console.log(texture) + // texture.repeat.set(1, count); + // texture.needsUpdate = true + // } const material = new MeshStandardMaterial({ color: new Color(c || '#9c9c00'), - alphaMap: count ? texture : null, + // alphaMap: count ? texture : null, transparent: true, opacity: 1, roughness: 0.2,