components/expDiagram.vue

@@ -18,23 +18,16 @@ const toggleExpState = () => {
     explosion_state.value = !explosion_state.value
 }
 const back_light = ref()
-const key_light = ref()
 const secondary_light = ref()
 const loadAll = async () => {
     const { scene: back } = await useGLTF('/models_light/back_exp.glb')
-    const { scene: key } = await useGLTF('/models_light/key_exp.glb')
     const { scene: secondary } = await useGLTF('/models_light/secondary_exp.glb')
 
-    const k = 0.001
+    const k = 0.03
 
     back_light.value = back.children[0]
     back_light.value.intensity = back_light.value.intensity * k
-    back_light.value.shadow.bias = -0.01
+    back_light.value.shadow.bias = -0.02
-
-    key_light.value = key.children[0]
-    key_light.value.intensity = key_light.value.intensity * k
-    key_light.value.shadow.bias = -0.01
-    key_light.value.cast_shadow = true
 
     secondary_light.value = secondary.children[0]
     secondary_light.value.intensity = secondary_light.value.intensity * k
@@ -69,8 +62,6 @@ onMounted(() => {
 
                 <TresPointLight v-bind="back_light" v-if="back_light"
                     :position="[back_light.position.x, back_light.position.y, back_light.position.z]" />
-                <TresPointLight v-bind="key_light" v-if="key_light"
-                    :position="[key_light.position.x, key_light.position.y, key_light.position.z]" />
                 <TresPointLight v-bind="secondary_light" v-if="secondary_light"
                     :position="[secondary_light.position.x, secondary_light.position.y, secondary_light.position.z]" />
                 <!-- <TresAmbientLight :intensity="2" /> -->

components/model/diagram.vue

@@ -15,12 +15,12 @@ const targetExplosion = {
     verh: [0 * k, 0.25 * k, 0 * k],
 }
 
-const { scene: kosynka } = await useGLTF('/models/kosynka.glb')
+const { scene: kosynka } = await useGLTF('/models_exp/kosynka.glb')
-const { scene: krepleniye_planok } = await useGLTF('/models/krepleniye_planok.glb')
+const { scene: krepleniye_planok } = await useGLTF('/models_exp/krepleniye_planok.glb')
-const { scene: osnova_stolba } = await useGLTF('/models/osnova_stolba.glb')
+const { scene: osnova_stolba } = await useGLTF('/models_exp/osnova_stolba.glb')
-const { scene: planki } = await useGLTF('/models/planki.glb')
+const { scene: planki } = await useGLTF('/models_exp/planki.glb')
-const { scene: stolb } = await useGLTF('/models/stolb.glb')
+const { scene: stolb } = await useGLTF('/models_exp/stolb.glb')
-const { scene: verh } = await useGLTF('/models/verh.glb')
+const { scene: verh } = await useGLTF('/models_exp/verh.glb')
 
 const lamelle_color = use_lamelle_color()
 const pillar_color = use_pillar_color()

components/model/parametric.vue

@@ -17,11 +17,11 @@ const { scene, controls, camera } = useTresContext()
 const { seek, seekAll } = useSeek()
 
 const { scene: top_model } = await useGLTF('/models_one/verh_100.glb', { draco: true })
-const { scene: model_fence_top } = await useGLTF('/fence_one/top.glb')
+const { scene: model_fence_top } = await useGLTF('/models_one/top.glb')
-const { scene: model_fence_center } = await useGLTF('/fence_one/center.glb')
+const { scene: model_fence_center } = await useGLTF('/models_one/center.glb')
-const { scene: model_fence_bottom } = await useGLTF('/fence_one/bottom.glb')
+const { scene: model_fence_bottom } = await useGLTF('/models_one/bottom.glb')
-const { scene: model_fence_inner } = await useGLTF('/fence_one/inner.glb')
+const { scene: model_fence_inner } = await useGLTF('/models_one/inner.glb')
-const { scene: model_brace } = await useGLTF('/fence_one/brace.glb')
+const { scene: model_brace } = await useGLTF('/models_one/brace.glb')
 const { scene: fastening_model } = await useGLTF('/models_one/krepleniye_planok.glb', { draco: true });
 const { scene: lamelle_model } = await useGLTF('/models_one/lamel_100.glb', { draco: true });
 

pages/index.vue

@@ -107,10 +107,16 @@ const { data: advData } = await apiFetch<ApiAdvantageType[]>(`advantage/`)
                 alt="коричневый забор" title="" format="webp" loading="lazy" />
         </div>
         <div class="siteblock siteblock_calc bg-white">
-            <LazyCalcValues />
+            <div class="container">
-            <Suspense>
+                <div class="col-span-9 h-full relative">
-                <LazyCalcModels />
+                    <Suspense>
-            </Suspense>
+                        <LazyCalcModels />
+                    </Suspense>
+                </div>
+                <div class="col-span-3">
+                    <CalcValues />
+                </div>
+            </div>
         </div>
         <div class="siteblock bg-white siteblock_content" :id="delivery?.slug" v-if="deliveryText">
             <div class="container">