diff --git a/front/src/assets/promo/models/quadro/Andrey_Color_1k.jpg b/front/src/assets/promo/models/quadro/Andrey_Color_1k.jpg new file mode 100644 index 0000000..aadc761 Binary files /dev/null and b/front/src/assets/promo/models/quadro/Andrey_Color_1k.jpg differ diff --git a/front/src/assets/promo/models/quadro/Andrey_Roughness_16px.jpg b/front/src/assets/promo/models/quadro/Andrey_Roughness_16px.jpg new file mode 100644 index 0000000..51d578d Binary files /dev/null and b/front/src/assets/promo/models/quadro/Andrey_Roughness_16px.jpg differ diff --git a/front/src/assets/promo/models/quadro/Atlas_Color_1k.jpg b/front/src/assets/promo/models/quadro/Atlas_Color_1k.jpg new file mode 100644 index 0000000..36474dc Binary files /dev/null and b/front/src/assets/promo/models/quadro/Atlas_Color_1k.jpg differ diff --git a/front/src/assets/promo/models/quadro/Atlas_Metalness_1k.jpg b/front/src/assets/promo/models/quadro/Atlas_Metalness_1k.jpg new file mode 100644 index 0000000..79eef7e Binary files /dev/null and b/front/src/assets/promo/models/quadro/Atlas_Metalness_1k.jpg differ diff --git a/front/src/assets/promo/models/quadro/Atlas_Opacity_16px.jpg b/front/src/assets/promo/models/quadro/Atlas_Opacity_16px.jpg new file mode 100644 index 0000000..bd25c3e Binary files /dev/null and b/front/src/assets/promo/models/quadro/Atlas_Opacity_16px.jpg differ diff --git a/front/src/assets/promo/models/quadro/Atlas_Roughness_1k.jpg b/front/src/assets/promo/models/quadro/Atlas_Roughness_1k.jpg new file mode 100644 index 0000000..128c0a3 Binary files /dev/null and b/front/src/assets/promo/models/quadro/Atlas_Roughness_1k.jpg differ diff --git a/front/src/assets/promo/models/quadro/Floor_diffuse.jpg b/front/src/assets/promo/models/quadro/Floor_diffuse.jpg deleted file mode 100644 index c5c50be..0000000 Binary files a/front/src/assets/promo/models/quadro/Floor_diffuse.jpg and /dev/null differ diff --git a/front/src/assets/promo/models/quadro/net_alpha.jpg b/front/src/assets/promo/models/quadro/Grid_Alpha_1k.jpg similarity index 100% rename from front/src/assets/promo/models/quadro/net_alpha.jpg rename to front/src/assets/promo/models/quadro/Grid_Alpha_1k.jpg diff --git a/front/src/assets/promo/models/quadro/Grid_Color_16px.jpg b/front/src/assets/promo/models/quadro/Grid_Color_16px.jpg new file mode 100644 index 0000000..a44b494 Binary files /dev/null and b/front/src/assets/promo/models/quadro/Grid_Color_16px.jpg differ diff --git a/front/src/assets/promo/models/quadro/net_normal.jpg b/front/src/assets/promo/models/quadro/Grid_Normal_1k.jpg similarity index 100% rename from front/src/assets/promo/models/quadro/net_normal.jpg rename to front/src/assets/promo/models/quadro/Grid_Normal_1k.jpg diff --git a/front/src/assets/promo/models/quadro/Ground_Color_1k.jpg b/front/src/assets/promo/models/quadro/Ground_Color_1k.jpg new file mode 100644 index 0000000..86f2115 Binary files /dev/null and b/front/src/assets/promo/models/quadro/Ground_Color_1k.jpg differ diff --git a/front/src/assets/promo/models/quadro/Ground_Normal_1k.jpg b/front/src/assets/promo/models/quadro/Ground_Normal_1k.jpg new file mode 100644 index 0000000..8def61b Binary files /dev/null and b/front/src/assets/promo/models/quadro/Ground_Normal_1k.jpg differ diff --git a/front/src/assets/promo/models/quadro/Ground_Roughness_1k.jpg b/front/src/assets/promo/models/quadro/Ground_Roughness_1k.jpg new file mode 100644 index 0000000..323040c Binary files /dev/null and b/front/src/assets/promo/models/quadro/Ground_Roughness_1k.jpg differ diff --git a/front/src/assets/promo/models/quadro/Perf_Alpha_256px.jpg b/front/src/assets/promo/models/quadro/Perf_Alpha_256px.jpg new file mode 100644 index 0000000..e0cfef8 Binary files /dev/null and b/front/src/assets/promo/models/quadro/Perf_Alpha_256px.jpg differ diff --git a/front/src/assets/promo/models/quadro/Perf_Normal_256px.jpg b/front/src/assets/promo/models/quadro/Perf_Normal_256px.jpg new file mode 100644 index 0000000..4b00cbe Binary files /dev/null and b/front/src/assets/promo/models/quadro/Perf_Normal_256px.jpg differ diff --git a/front/src/assets/promo/models/quadro/Perf_Roughness_256px.jpg b/front/src/assets/promo/models/quadro/Perf_Roughness_256px.jpg new file mode 100644 index 0000000..526e9a2 Binary files /dev/null and b/front/src/assets/promo/models/quadro/Perf_Roughness_256px.jpg differ diff --git a/front/src/assets/promo/models/quadro/Perforated_alpha.jpg b/front/src/assets/promo/models/quadro/Perforated_alpha.jpg deleted file mode 100644 index 5375f56..0000000 Binary files a/front/src/assets/promo/models/quadro/Perforated_alpha.jpg and /dev/null differ diff --git a/front/src/assets/promo/models/quadro/Perforated_normal.jpg b/front/src/assets/promo/models/quadro/Perforated_normal.jpg deleted file mode 100644 index aab8634..0000000 Binary files a/front/src/assets/promo/models/quadro/Perforated_normal.jpg and /dev/null differ diff --git a/front/src/assets/promo/models/quadro/Perforated_roughness.jpg b/front/src/assets/promo/models/quadro/Perforated_roughness.jpg deleted file mode 100644 index a5e270a..0000000 Binary files a/front/src/assets/promo/models/quadro/Perforated_roughness.jpg and /dev/null differ diff --git a/front/src/assets/promo/models/quadro/Sky_Color_2k.png b/front/src/assets/promo/models/quadro/Sky_Color_2k.png new file mode 100644 index 0000000..c49c603 Binary files /dev/null and b/front/src/assets/promo/models/quadro/Sky_Color_2k.png differ diff --git a/front/src/assets/promo/models/quadro/Sky_Emission_2k.png b/front/src/assets/promo/models/quadro/Sky_Emission_2k.png new file mode 100644 index 0000000..c49c603 Binary files /dev/null and b/front/src/assets/promo/models/quadro/Sky_Emission_2k.png differ diff --git a/front/src/assets/promo/models/quadro/Sky_emission.jpg b/front/src/assets/promo/models/quadro/Sky_emission.jpg deleted file mode 100644 index 563e7b4..0000000 Binary files a/front/src/assets/promo/models/quadro/Sky_emission.jpg and /dev/null differ diff --git a/front/src/assets/promo/models/quadro/solar_basecolor.jpg b/front/src/assets/promo/models/quadro/Solar_Color_256px.jpg similarity index 100% rename from front/src/assets/promo/models/quadro/solar_basecolor.jpg rename to front/src/assets/promo/models/quadro/Solar_Color_256px.jpg diff --git a/front/src/assets/promo/models/quadro/solar_metallic.jpg b/front/src/assets/promo/models/quadro/Solar_Metalness_256px.jpg similarity index 100% rename from front/src/assets/promo/models/quadro/solar_metallic.jpg rename to front/src/assets/promo/models/quadro/Solar_Metalness_256px.jpg diff --git a/front/src/assets/promo/models/quadro/solar_normal.jpg b/front/src/assets/promo/models/quadro/Solar_Normal_256px.jpg similarity index 100% rename from front/src/assets/promo/models/quadro/solar_normal.jpg rename to front/src/assets/promo/models/quadro/Solar_Normal_256px.jpg diff --git a/front/src/assets/promo/models/quadro/solar_roughness.jpg b/front/src/assets/promo/models/quadro/Solar_Roughness_256px.jpg similarity index 100% rename from front/src/assets/promo/models/quadro/solar_roughness.jpg rename to front/src/assets/promo/models/quadro/Solar_Roughness_256px.jpg diff --git a/front/src/assets/promo/models/quadro/Wood_diffuse.jpg b/front/src/assets/promo/models/quadro/Wood_Color_1k.jpg similarity index 100% rename from front/src/assets/promo/models/quadro/Wood_diffuse.jpg rename to front/src/assets/promo/models/quadro/Wood_Color_1k.jpg diff --git a/front/src/assets/promo/models/quadro/Wood_roughness.jpg b/front/src/assets/promo/models/quadro/Wood_Roughness_1k.jpg similarity index 100% rename from front/src/assets/promo/models/quadro/Wood_roughness.jpg rename to front/src/assets/promo/models/quadro/Wood_Roughness_1k.jpg diff --git a/front/src/assets/promo/models/quadro/andrey.fbx b/front/src/assets/promo/models/quadro/andrey.fbx new file mode 100644 index 0000000..fd97374 Binary files /dev/null and b/front/src/assets/promo/models/quadro/andrey.fbx differ diff --git a/front/src/assets/promo/models/quadro/ground.fbx b/front/src/assets/promo/models/quadro/ground.fbx new file mode 100644 index 0000000..8a7673d Binary files /dev/null and b/front/src/assets/promo/models/quadro/ground.fbx differ diff --git a/front/src/assets/promo/models/quadro/mangal.fbx b/front/src/assets/promo/models/quadro/mangal.fbx new file mode 100644 index 0000000..0ce3c54 Binary files /dev/null and b/front/src/assets/promo/models/quadro/mangal.fbx differ diff --git a/front/src/assets/promo/models/quadro/pillar.fbx b/front/src/assets/promo/models/quadro/pillar.fbx new file mode 100644 index 0000000..7353818 Binary files /dev/null and b/front/src/assets/promo/models/quadro/pillar.fbx differ diff --git a/front/src/assets/promo/models/quadro/pointer.fbx b/front/src/assets/promo/models/quadro/pointer.fbx new file mode 100644 index 0000000..97bf056 Binary files /dev/null and b/front/src/assets/promo/models/quadro/pointer.fbx differ diff --git a/front/src/assets/promo/models/quadro/privetandrey_diffuse.jpg b/front/src/assets/promo/models/quadro/privetandrey_diffuse.jpg deleted file mode 100644 index 0c21f52..0000000 Binary files a/front/src/assets/promo/models/quadro/privetandrey_diffuse.jpg and /dev/null differ diff --git a/front/src/assets/promo/models/quadro/quad.fbx b/front/src/assets/promo/models/quadro/quad.fbx new file mode 100644 index 0000000..2c9ca35 Binary files /dev/null and b/front/src/assets/promo/models/quadro/quad.fbx differ diff --git a/front/src/assets/promo/models/quadro/scene.fbx b/front/src/assets/promo/models/quadro/scene.fbx index 66a963a..7ba80b8 100644 Binary files a/front/src/assets/promo/models/quadro/scene.fbx and b/front/src/assets/promo/models/quadro/scene.fbx differ diff --git a/front/src/assets/promo/models/quadro/sky.fbx b/front/src/assets/promo/models/quadro/sky.fbx new file mode 100644 index 0000000..82b9b3d Binary files /dev/null and b/front/src/assets/promo/models/quadro/sky.fbx differ diff --git a/front/src/assets/promo/models/quadro/walkway.fbx b/front/src/assets/promo/models/quadro/walkway.fbx new file mode 100644 index 0000000..b36a95a Binary files /dev/null and b/front/src/assets/promo/models/quadro/walkway.fbx differ diff --git a/front/src/components/Promo/main.vue b/front/src/components/Promo/main.vue index a23935e..c7dacf9 100644 --- a/front/src/components/Promo/main.vue +++ b/front/src/components/Promo/main.vue @@ -4,21 +4,35 @@ import { shallowRef } from 'vue'; import { onUnmounted, reactive, ref } from 'vue'; import { TresCanvas, useRenderLoop } from '@tresjs/core'; import { CameraControls, FBXModel, PositionalAudio, useFBX, useProgress } from '@tresjs/cientos' +import { Sky } from '@tresjs/cientos' import { Vector3 } from 'three'; import modelUrl from '../../assets/promo/models/sea_fbx/source/Stronghold.fbx' import jeepUrl from '../../assets/promo/models/jeep.fbx' -import quadroUrl from '../../assets/promo/models/quadro/scene.fbx' -// const img = import.meta.glob('../../assets/promo/models/quadro/*.jpg') -// Object.keys(img).forEach(element => { -// import(element) -// }); + +import sceneUrl from '../../assets/promo/models/quadro/scene.fbx' +import andreyUrl from '../../assets/promo/models/quadro/andrey.fbx' +const andreyModel = await useFBX(andreyUrl) +import groundUrl from '../../assets/promo/models/quadro/ground.fbx' +const groundModel = await useFBX(groundUrl) +import mangalUrl from '../../assets/promo/models/quadro/mangal.fbx' +const mangalModel = await useFBX(mangalUrl) +import pillarUrl from '../../assets/promo/models/quadro/pillar.fbx' +const pillarModel = await useFBX(pillarUrl) +import pointerUrl from '../../assets/promo/models/quadro/pointer.fbx' +const pointerModel = await useFBX(pointerUrl) +import quadUrl from '../../assets/promo/models/quadro/quad.fbx' +const quadModel = await useFBX(quadUrl) +import skyUrl from '../../assets/promo/models/quadro/sky.fbx' +const skyModel = await useFBX(skyUrl) +import walkbayUrl from '../../assets/promo/models/quadro/walkway.fbx' +const walkbayModel = await useFBX(walkbayUrl) import audioUrl from '../../assets/promo/sounds/sea.ogg' const router = useRouter() -const minPan = new Vector3(-210, 0, -80); -const maxPan = new Vector3(210, 0, 100); +const minPan = new Vector3(-10, 1, -5); +const maxPan = new Vector3(5, 1, 5); const _v = new Vector3(); const onChange = (e: any) => { @@ -28,13 +42,13 @@ const onChange = (e: any) => { e._camera.position.sub(_v); } -const cameraPosition = [200, 400, 800] +const cameraPosition = [-6, 4, 25] const lightPosition = [3, 3, 3] const controlsState = reactive({ - minDistance: 300, - maxDistance: 900, - maxPolarAngle: (Math.PI / 2) - 0.2, + minDistance: 1, + maxDistance: 30, + maxPolarAngle: (Math.PI / 2) - 0.02, maxZoom: 1, minZoom: 0.2, }) @@ -66,35 +80,28 @@ onLoop(() => { } } }) +console.log(andreyModel)