diff --git a/components/calcModels.vue b/components/calcModels.vue
index 43af46f..e4fabdb 100644
--- a/components/calcModels.vue
+++ b/components/calcModels.vue
@@ -34,7 +34,7 @@ const { hasFinishLoading, progress, items } = await useProgress()
-
+
diff --git a/components/expDiagram.vue b/components/expDiagram.vue
index 7a8cb81..ac07bed 100644
--- a/components/expDiagram.vue
+++ b/components/expDiagram.vue
@@ -22,14 +22,30 @@ const scrollBlock = (e: Event) => {
koef.value = visibleHeight / h
}
}
+const targetExplosion = useState('targetExplosion', () => {
+ return {
+ kosynka: [1, 1, 1],
+ krepleniye_planok: [0, 0, 0],
+ osnova_stolba: [0, 0, 0],
+ planki: [0, 0, 0],
+ stolb: [0, 0, 0],
+ verh: [0, 0, 0],
+ }
+})
+
+
+
+
+
+
-
+
diff --git a/components/model/diagram.vue b/components/model/diagram.vue
index a46327e..3385780 100644
--- a/components/model/diagram.vue
+++ b/components/model/diagram.vue
@@ -15,12 +15,12 @@ watch(props, () => {
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/components/model/item.vue b/components/model/item.vue
index 490339b..eef7834 100644
--- a/components/model/item.vue
+++ b/components/model/item.vue
@@ -1,7 +1,7 @@
-
+
diff --git a/components/model/parametric.vue b/components/model/parametric.vue
index 54db49e..7885bb1 100644
--- a/components/model/parametric.vue
+++ b/components/model/parametric.vue
@@ -17,13 +17,21 @@ renderer.value.toneMapping = ReinhardToneMapping
renderer.value.shadowMap.enabled = true
renderer.value.shadowMap.type = PCFShadowMap
-
+// public/texture/Ground039_4K-JPG_AmbientOcclusion.jpg
+// public/texture/Ground039_4K-JPG_Color.jpg
+// public/texture/Ground039_4K-JPG_Displacement.jpg
+// public/texture/Ground039_4K-JPG_NormalDX.jpg
+// public/texture/Ground039_4K-JPG_NormalGL.jpg
+// public/texture/Ground039_4K-JPG_Roughness.jpg
const pbrTexture = await useTexture({
- map: '/texture/Rock035_2K_Displacement.jpg',
- displacementMap: '/texture/Rock035_2K_Displacement.jpg',
- roughnessMap: '/texture/Rock035_2K_Roughness.jpg',
- normalMap: '/texture/Rock035_2K_NormalGL.jpg',
- ambientOcclusion: '/texture/Rock035_2K_AmbientOcclusion.jpg',
+ map: '/texture/Ground039_4K-JPG_Color.jpg',
+ displacementMap: '/texture/Ground039_4K-JPG_Displacement.jpg',
+ roughnessMap: '/texture/Ground039_4K-JPG_Roughness.jpg',
+ normalMap: '/texture/Ground039_4K-JPG_NormalDX.jpg',
+ aoMap: '/texture/Ground039_4K-JPG_AmbientOcclusion.jpg',
+ // metalnessMap: '/textures/myMetalnessTexture.jpg',
+ // matcap: '/textures/myMatcapTexture.jpg',
+ // alphaMap: '/textures/myAlphaMapTexture.jpg'
})
const { scene: top } = await useGLTF('/models_one/verh_100.glb')
const { scene: fence } = await useGLTF('/models_one/fence.glb')
@@ -40,9 +48,9 @@ watch(fence_section, () => {
-
+
-
+
diff --git a/public/models/kosynka.glb b/public/models/kosynka.glb
index fa9343f..284f7ea 100644
Binary files a/public/models/kosynka.glb and b/public/models/kosynka.glb differ
diff --git a/public/models/kreplaniye_planok.glb b/public/models/kreplaniye_planok.glb
deleted file mode 100644
index ac3a3a1..0000000
Binary files a/public/models/kreplaniye_planok.glb and /dev/null differ
diff --git a/public/models/krepleniye_planok.glb b/public/models/krepleniye_planok.glb
new file mode 100644
index 0000000..16feaab
Binary files /dev/null and b/public/models/krepleniye_planok.glb differ
diff --git a/public/models/osnova_stolba.glb b/public/models/osnova_stolba.glb
new file mode 100644
index 0000000..a50d82f
Binary files /dev/null and b/public/models/osnova_stolba.glb differ
diff --git a/public/models/planki.glb b/public/models/planki.glb
index 0a744ae..1f76d75 100644
Binary files a/public/models/planki.glb and b/public/models/planki.glb differ
diff --git a/public/models/stolb.glb b/public/models/stolb.glb
index bb7e7ff..296d5e8 100644
Binary files a/public/models/stolb.glb and b/public/models/stolb.glb differ
diff --git a/public/models/verh.glb b/public/models/verh.glb
index 988d2d2..ab71d32 100644
Binary files a/public/models/verh.glb and b/public/models/verh.glb differ
diff --git a/public/models/zakliopki.glb b/public/models/zakliopki.glb
deleted file mode 100644
index dedc882..0000000
Binary files a/public/models/zakliopki.glb and /dev/null differ
diff --git a/public/models_one/bottom.glb b/public/models_one/bottom.glb
deleted file mode 100644
index 4c3e90d..0000000
Binary files a/public/models_one/bottom.glb and /dev/null differ
diff --git a/public/texture/Ground039_4K-JPG_AmbientOcclusion.jpg b/public/texture/Ground039_4K-JPG_AmbientOcclusion.jpg
new file mode 100644
index 0000000..47bb2c3
Binary files /dev/null and b/public/texture/Ground039_4K-JPG_AmbientOcclusion.jpg differ
diff --git a/public/texture/Ground039_4K-JPG_Color.jpg b/public/texture/Ground039_4K-JPG_Color.jpg
new file mode 100644
index 0000000..20b9379
Binary files /dev/null and b/public/texture/Ground039_4K-JPG_Color.jpg differ
diff --git a/public/texture/Ground039_4K-JPG_Displacement.jpg b/public/texture/Ground039_4K-JPG_Displacement.jpg
new file mode 100644
index 0000000..0c3faaf
Binary files /dev/null and b/public/texture/Ground039_4K-JPG_Displacement.jpg differ
diff --git a/public/texture/Ground039_4K-JPG_NormalDX.jpg b/public/texture/Ground039_4K-JPG_NormalDX.jpg
new file mode 100644
index 0000000..b60ceb1
Binary files /dev/null and b/public/texture/Ground039_4K-JPG_NormalDX.jpg differ
diff --git a/public/texture/Ground039_4K-JPG_NormalGL.jpg b/public/texture/Ground039_4K-JPG_NormalGL.jpg
new file mode 100644
index 0000000..26e9b00
Binary files /dev/null and b/public/texture/Ground039_4K-JPG_NormalGL.jpg differ
diff --git a/public/texture/Rock035_2K_NormalGL.jpg b/public/texture/Ground039_4K-JPG_Roughness.jpg
similarity index 50%
rename from public/texture/Rock035_2K_NormalGL.jpg
rename to public/texture/Ground039_4K-JPG_Roughness.jpg
index 49c230d..e483c75 100644
Binary files a/public/texture/Rock035_2K_NormalGL.jpg and b/public/texture/Ground039_4K-JPG_Roughness.jpg differ
diff --git a/public/texture/Rock035_2K_AmbientOcclusion.jpg b/public/texture/Rock035_2K_AmbientOcclusion.jpg
deleted file mode 100644
index 99aebce..0000000
Binary files a/public/texture/Rock035_2K_AmbientOcclusion.jpg and /dev/null differ
diff --git a/public/texture/Rock035_2K_Displacement.jpg b/public/texture/Rock035_2K_Displacement.jpg
deleted file mode 100644
index 76de6c2..0000000
Binary files a/public/texture/Rock035_2K_Displacement.jpg and /dev/null differ
diff --git a/public/texture/Rock035_2K_Roughness (1).jpg b/public/texture/Rock035_2K_Roughness (1).jpg
deleted file mode 100644
index bb2601e..0000000
Binary files a/public/texture/Rock035_2K_Roughness (1).jpg and /dev/null differ
diff --git a/public/texture/Rock035_2K_Roughness.jpg b/public/texture/Rock035_2K_Roughness.jpg
deleted file mode 100644
index bb2601e..0000000
Binary files a/public/texture/Rock035_2K_Roughness.jpg and /dev/null differ