mns/mns-mini-zabor
mns
/
mns-mini-zabor
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #84

Merged
ksenia_mikhailova merged 141 commits from dev into main 2024-10-03 15:30:24 +03:00
Conversation 0 Commits 141 Files Changed 62 +8 -9
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bc628b07fd - Show all commits

4
components/calc/values.vue
View File

@ -232,8 +232,8 @@ const calc_table = computed(() => {
<input type="number" id="total_length" v-bind="parametric.total_length" min=0 max="600" <input type="number" id="total_length" v-bind="parametric.total_length" min=0 max="600"
v-model="form_state.total_length" :ref="form_refs.total_length" /> v-model="form_state.total_length" :ref="form_refs.total_length" />
</div> </div>
<div class="form-item text-sm xl:text-base"> <div class="form-item">
<p v-if="form_state.total_length_mm < parametric.length.min" class="text-ioprim test-sm"> <p v-if="form_state.total_length_mm < parametric.length.min" class="text-ioprim text-sm">
Выбранный размер забора слишком мал для расчета стоимости. Пожалуйста, выберите больший Выбранный размер забора слишком мал для расчета стоимости. Пожалуйста, выберите больший
размер, чтобы продолжить. размер, чтобы продолжить.
</p> </p>

9
components/model/fence.vue
View File

@ -16,7 +16,6 @@ const pillar_pattern = use_pattern()
const lamelle_color = use_lamelle_color() const lamelle_color = use_lamelle_color()
const lSize = lamelle_height.value const lSize = lamelle_height.value
const bSize = 0.0235
const pillar_size = 104 * 0.001 const pillar_size = 104 * 0.001
const pillar_one_pos = ref() const pillar_one_pos = ref()
@ -42,7 +41,7 @@ const extra = ref(getExtraValue())
setPillarValues() setPillarValues()
const make_translate_to_section = (source = fence_section.value) => { 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 let r = (props.index - 1) * one_s
if (typeof extra.value == 'number') { if (typeof extra.value == 'number') {
r -= (fence_section.value - extra.value) * scale_koef * 0.5 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 scale_x = (((extra.value as number) || fence_section.value) * 9.935)
const pos_x = pillar_size * 0.5 const pos_x = pillar_size * 0.5
const pos_y = (lSize * i) const pos_y = (lSize * i)
const pos_z = 0.022 const pos_z = 0.022 * scale_koef
return new Matrix4().fromArray([ return new Matrix4().fromArray([
scale_x, 0, 0, 0, scale_x, 0, 0, 0,
0, 1, 0, 0, 0, 1, 0, 0,
@ -92,7 +91,7 @@ const lamelleMatrix = (i: number) => {
const fixingOneMatrix = (i: number) => { const fixingOneMatrix = (i: number) => {
const pos_x = pillar_one_pos.value + pillar_size * 0.66 const pos_x = pillar_one_pos.value + pillar_size * 0.66
const pos_y = (lSize * i) + 0.01 * scale_koef; 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([ return new Matrix4().fromArray([
1, 0, 0, 0, 1, 0, 0, 0,
0, 1, 0, 0, 0, 1, 0, 0,
@ -103,7 +102,7 @@ const fixingOneMatrix = (i: number) => {
const fixingTwoMatrix = (i: number) => { const fixingTwoMatrix = (i: number) => {
const pos_x = pillar_two_pos.value - pillar_size * 0.66 const pos_x = pillar_two_pos.value - pillar_size * 0.66
const pos_y = (lSize * i) + 0.01 * scale_koef; 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([ return new Matrix4().fromArray([
1, 0, 0, 0, 1, 0, 0, 0,
0, 1, 0, 0, 0, 1, 0, 0,

2
components/model/line.vue
View File

@ -48,7 +48,7 @@ const count_pos = () => {
new Box3().expandByObject(line1).getSize(line1_size) new Box3().expandByObject(line1).getSize(line1_size)
line1.getWorldPosition(line1_pos) 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) { switch (props.number) {
case 1: break; case 1: break;
case 2: case 2:

2
composables/useCalc.ts
View File

@ -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_extra_section = () => useState('extra_section', () => 0)
export const use_total_length = () => useState('total_length', () => (((min + 104) * n) + 104) * 0.001) 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_min_length = () => useState('min_length', () => 700)
export const use_max_size = () => useState<number>('max_size', () => 2) export const use_max_size = () => useState<number>('max_size', () => 20)
export const use_explosion_state = () => useState<boolean>('explosion_state', () => false) export const use_explosion_state = () => useState<boolean>('explosion_state', () => false)
export const use_goto_camera = () => useState<Vector3 | undefined>('gotocam', () => undefined) export const use_goto_camera = () => useState<Vector3 | undefined>('gotocam', () => undefined)