dev #60

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

View File

@ -30,7 +30,7 @@ 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="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]" />

View File

@ -37,7 +37,7 @@ onLoop(() => {
if (Math.abs(point) >= Math.abs(target.value[element.axis as vectorType])) {
step = 0
}
if (model.value !== undefined && model.value[element.func] !== undefined) {
if (model.value !== undefined && model.value[element.func] !== undefined && model.value.__tres) {
try {
model.value[element.func](step)
} catch (error) {