components/model/fence.vue

@@ -87,11 +87,11 @@ watch([section_count, fence_section, extra_section], () => {
 })
 
 const setBraceCount = () => {
-    brace_count.value = Math.ceil(lamelles_count.value / 4)
+    brace_count.value = Math.floor(lamelles_count.value / 4)
 }
 
 const brace = props.models.pillar_brace.clone().children[0]
-const brace_h = lamelle_height.value * 3
+const brace_h = lamelle_height.value * 4
 const brace_count = ref<number>()
 
 setBraceCount()
@@ -127,38 +127,38 @@ watch([pillar_pattern, pillar_color, fence_section, lamelles_count], setPillar)
 
 const fastening = ref<Object3D[]>([])
 const setFastening = () => {
-    // const one = props.models.fastening.children[0].clone();
-    // one.position.setComponent(0, pillar_one_pos.value);
-    // one.scale.set(1, lamelles_count.value, 1);
-
-    // const two = props.models.fastening.children[0].clone();
-    // two.position.setComponent(0, pillar_two_pos.value);
-    // two.scale.set(-1, lamelles_count.value, 1);
-    const z_koef = -0.005 * scale_koef
-    const top_one = props.models.fastening_top_right.clone().children[0].children[1]
-    top_one.position.set(pillar_one_pos.value - bSize * 2, lamelles_count.value * lSize - 0.02 * scale_koef, 0)
+    const top_one = props.models.fixing.clone().children[0];
+    top_one.position.set(
+        pillar_one_pos.value + pillar_size * 0.66,
+        lamelles_count.value * lSize - 0.01 * scale_koef,
+        0.025 * scale_koef
+    )
     top_one.updateMatrixWorld()
-    
-    const top_two = props.models.fastening_top_right.clone().children[0].children[1]
-    top_two.position.set(pillar_two_pos.value - bSize * 2, lamelles_count.value * lSize - 0.02 * scale_koef, 0)
+
+    const top_two = props.models.fixing.clone().children[0];
+    top_two.position.set(
+        pillar_two_pos.value - pillar_size * 0.66,
+        lamelles_count.value * lSize - 0.01 * scale_koef,
+        0.025 * scale_koef
+    )
     top_two.updateMatrixWorld()
-    
-    const top = props.models.fastening_top_center.clone().children[0];
+
+    const top = props.models.fastening_top.clone().children[0];
     top.position.set(pillar_size * 0.5 + 0.01 * scale_koef, lamelles_count.value * lSize - 0.02 * scale_koef, 0);
-    const v = ((extra.value as number) || fence_section.value) * 10 + 0.2
+    const v = ((extra.value as number) || fence_section.value) * 10 + 0.2 * scale_koef
     top.scale.setComponent(0, v);
     top.updateMatrixWorld()
 
     const side_one = props.models.fastening_side.clone().children[0];
     side_one.name = 'side_one'
-    side_one.position.set(pillar_one_pos.value, 0, z_koef * -1);
+    side_one.position.set(pillar_one_pos.value, 0, 0.002 * scale_koef);
     side_one.scale.set(1, lamelles_count.value, 1)
     side_one.updateMatrixWorld();
 
     const side_two = props.models.fastening_side.clone().children[0];
     side_two.name = 'side_two'
     side_two.scale.set(-1, lamelles_count.value, -1)
-    side_two.position.set(pillar_two_pos.value, 0, z_koef);
+    side_two.position.set(pillar_two_pos.value, 0, -0.005 * scale_koef);
     side_two.updateMatrixWorld();
 
     // let arr = [one.clone(), two.clone(), top.clone(),]

components/model/parametric.vue

@@ -22,9 +22,10 @@ const { scene: model_pillar_bottom } = await useGLTF('/models_one/pillar/bottom.
 const { scene: model_pillar_inner } = await useGLTF('/models_one/pillar/inner.glb')
 const { scene: model_pillar_brace } = await useGLTF('/models_one/pillar/brace.glb')
 
-const { scene: model_fastening_top_center } = await useGLTF('/models_one/fastening/top_center.glb');
-const { scene: model_fastening_top_right } = await useGLTF('/models_one/fastening/top_right.glb');
+const { scene: model_fastening_top } = await useGLTF('/models_one/fastening/top.glb');
 const { scene: model_fastening_side } = await useGLTF('/models_one/fastening/side.glb');
+const { scene: model_fixing } = await useGLTF('/models_one/fixing.glb');
+
 const { scene: top_model } = await useGLTF('/models_one/top_100.glb', { draco: true })
 const { scene: lamelle_model } = await useGLTF('/models_one/lamel_100.glb', { draco: true });
 
@@ -34,9 +35,9 @@ const pillar_top = ref(model_pillar_top)
 const pillar_bottom = ref(model_pillar_bottom)
 const pillar_inner = ref(model_pillar_inner)
 const pillar_brace = ref(model_pillar_brace)
-const fastening_top_center = ref(model_fastening_top_center)
-const fastening_top_right = ref(model_fastening_top_right)
+const fastening_top = ref(model_fastening_top)
 const fastening_side = ref(model_fastening_side)
+const fixing = ref(model_fixing)
 const lamelle = ref(lamelle_model)
 
 const total = ref((section_count.value + ~~(!!extra_section.value)))
@@ -99,7 +100,7 @@ watch(open_calc, () => {
             <ModelLine :models="{
                 top,
                 pillar_center, pillar_top, pillar_bottom, pillar_inner, pillar_brace,
-                fastening_top_center, fastening_top_right, fastening_side,
+                fastening_top, fastening_side, fixing,
                 lamelle
             }" :number="line" :count="count" />
         </template>