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 +11 -10
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a3e6a70b37 - Show all commits

4
components/model/diagram.vue
View File

@ -30,8 +30,8 @@ set_material(planki, getColorHexFromRal(lamelle_color.value));
</script> </script>
<template> <template>
<TresGroup :position-y="-3.5" :scale="2"> <TresGroup :position-y="-3.5" :scale="2">
<!-- <ModelItem :model="kosynka" :target="explosion_state ? targetExplosion.kosynka : [0, 0, 0]" /> --> <ModelItem :model="kosynka" :target="explosion_state ? targetExplosion.kosynka : [0, 0, 0]" />
<!-- <ModelItem :model="krepleniye_planok" :target="explosion_state ? targetExplosion.krepleniye_planok : [0, 0, 0]" /> --> <ModelItem :model="krepleniye_planok" :target="explosion_state ? targetExplosion.krepleniye_planok : [0, 0, 0]" />
<ModelItem :model="osnova_stolba" /> <ModelItem :model="osnova_stolba" />
<ModelItem :model="planki" :target="explosion_state ? targetExplosion.planki : [0, 0, 0]" /> <ModelItem :model="planki" :target="explosion_state ? targetExplosion.planki : [0, 0, 0]" />
<ModelItem :model="stolb" :target="explosion_state ? targetExplosion.stolb : [0, 0, 0]" /> <ModelItem :model="stolb" :target="explosion_state ? targetExplosion.stolb : [0, 0, 0]" />

17
components/model/item.vue
View File

@ -30,14 +30,15 @@ onLoop(() => {
if (model.value && target.value) { if (model.value && target.value) {
axis.forEach(element => { axis.forEach(element => {
if (target.value) { if (target.value) {
const point = model.value.position[element.axis] console.log('r')
let step = stepbase * target.value[element.axis as vectorType] // const point = model.value.position[element.axis]
if (step !== 0) { // let step = stepbase * target.value[element.axis as vectorType]
if (Math.abs(point) >= Math.abs(target.value[element.axis as vectorType])) { // if (step !== 0) {
step = 0 // if (Math.abs(point) >= Math.abs(target.value[element.axis as vectorType])) {
} // step = 0
model.value[element.func](step) // }
} // model.value[element.func](step)
// }
} }
}); });
} }