diff --git a/components/calc/values.vue b/components/calc/values.vue index 82eccfb..be90612 100644 --- a/components/calc/values.vue +++ b/components/calc/values.vue @@ -232,8 +232,8 @@ const calc_table = computed(() => { -
-

+

+

Выбранный размер забора слишком мал для расчета стоимости. Пожалуйста, выберите больший размер, чтобы продолжить.

diff --git a/components/model/fence.vue b/components/model/fence.vue index 2a63caf..b05d4e4 100644 --- a/components/model/fence.vue +++ b/components/model/fence.vue @@ -16,7 +16,6 @@ const pillar_pattern = use_pattern() const lamelle_color = use_lamelle_color() const lSize = lamelle_height.value -const bSize = 0.0235 const pillar_size = 104 * 0.001 const pillar_one_pos = ref() @@ -42,7 +41,7 @@ const extra = ref(getExtraValue()) setPillarValues() const make_translate_to_section = (source = fence_section.value) => { - const one_s = (source + pillar_size + bSize) * scale_koef + const one_s = (source + pillar_size) * scale_koef let r = (props.index - 1) * one_s if (typeof extra.value == 'number') { r -= (fence_section.value - extra.value) * scale_koef * 0.5 @@ -81,7 +80,7 @@ const lamelleMatrix = (i: number) => { const scale_x = (((extra.value as number) || fence_section.value) * 9.935) const pos_x = pillar_size * 0.5 const pos_y = (lSize * i) - const pos_z = 0.022 + const pos_z = 0.022 * scale_koef return new Matrix4().fromArray([ scale_x, 0, 0, 0, 0, 1, 0, 0, @@ -92,7 +91,7 @@ const lamelleMatrix = (i: number) => { const fixingOneMatrix = (i: number) => { const pos_x = pillar_one_pos.value + pillar_size * 0.66 const pos_y = (lSize * i) + 0.01 * scale_koef; - const pos_z = 0.022 + const pos_z = 0.022 * scale_koef return new Matrix4().fromArray([ 1, 0, 0, 0, 0, 1, 0, 0, @@ -103,7 +102,7 @@ const fixingOneMatrix = (i: number) => { const fixingTwoMatrix = (i: number) => { const pos_x = pillar_two_pos.value - pillar_size * 0.66 const pos_y = (lSize * i) + 0.01 * scale_koef; - const pos_z = 0.022 + const pos_z = 0.022 * scale_koef return new Matrix4().fromArray([ 1, 0, 0, 0, 0, 1, 0, 0, diff --git a/components/model/line.vue b/components/model/line.vue index fb118d9..800da0d 100644 --- a/components/model/line.vue +++ b/components/model/line.vue @@ -48,7 +48,7 @@ const count_pos = () => { new Box3().expandByObject(line1).getSize(line1_size) line1.getWorldPosition(line1_pos) } - const k = (line1_size.x / props.count) * 0.5 + 0.05 + const k = (line1_size.x / props.count) * 0.5 - 0.065 switch (props.number) { case 1: break; case 2: diff --git a/composables/useCalc.ts b/composables/useCalc.ts index 996098b..a2576dd 100644 --- a/composables/useCalc.ts +++ b/composables/useCalc.ts @@ -19,7 +19,7 @@ export const use_section_count = () => useState('section_count', () => n) export const use_extra_section = () => useState('extra_section', () => 0) export const use_total_length = () => useState('total_length', () => (((min + 104) * n) + 104) * 0.001) export const use_min_length = () => useState('min_length', () => 700) -export const use_max_size = () => useState('max_size', () => 2) +export const use_max_size = () => useState('max_size', () => 20) export const use_explosion_state = () => useState('explosion_state', () => false) export const use_goto_camera = () => useState('gotocam', () => undefined)