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

dev #60

Merged
ksenia_mikhailova merged 48 commits from dev into main 2024-07-26 10:41:38 +03:00
Conversation 0 Commits 48 Files Changed 18 +23 -34
2 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 017e37d5e3 - Show all commits

33
components/model/item.vue
View File

@ -25,14 +25,10 @@ const axis = [
{ axis: 'z', func: 'translateZ', }, { axis: 'z', func: 'translateZ', },
] ]
type vectorType = 'x' | 'y' | 'z'; type vectorType = 'x' | 'y' | 'z';
const expFunc = (element: typeof axis[0]) => {
onLoop(() => {
if (model.value && target.value) {
axis.forEach(element => {
if (target.value) { if (target.value) {
const point = model.value.position[element.axis] const point = model.value.position[element.axis]
let step = stepbase * target.value[element.axis as vectorType] let step = stepbase * target.value[element.axis as vectorType]
// console.log({ point, step })
if (step !== 0) { if (step !== 0) {
if (Math.abs(point) >= Math.abs(target.value[element.axis as vectorType])) { if (Math.abs(point) >= Math.abs(target.value[element.axis as vectorType])) {
step = 0 step = 0
@ -41,27 +37,20 @@ onLoop(() => {
try { try {
model.value[element.func](step) model.value[element.func](step)
} catch (error) { } catch (error) {
expFunc(element)
}
}
}
}
}
onLoop(() => {
if (model.value && target.value) {
axis.forEach(element => {
try { try {
model.value[element.func](step) expFunc(element)
} catch (error) {
try {
model.value[element.func](step)
} catch (error) {
try {
model.value[element.func](step)
} catch (error) {
try {
model.value[element.func](step)
} catch (error) { } catch (error) {
console.log(error) console.log(error)
} }
}
}
}
}
}
}
}
}); });
} }
}) })

2
composables/useCalc.ts
View File

@ -17,4 +17,4 @@ 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', () => 20) export const use_max_size = () => useState<number>('max_size', () => 20)
export const use_explosion_state = () => useState<boolean>('explosion_state', () => true) export const use_explosion_state = () => useState<boolean>('explosion_state', () => false)