dev #60

Merged
ksenia_mikhailova merged 48 commits from dev into main 2024-07-26 10:41:38 +03:00
2 changed files with 11 additions and 10 deletions
Showing only changes of commit a3e6a70b37 - Show all commits

View File

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

View File

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