diff --git a/front/package-lock.json b/front/package-lock.json index 8e471c0..b8e2ec0 100644 --- a/front/package-lock.json +++ b/front/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@fireworks-js/vue": "^2.10.7", "@tresjs/cientos": "^3.9.0", - "@tresjs/core": "^3.9.0", + "@tresjs/core": "^4.0.0-rc.0", "@vueuse/components": "^10.9.0", "@vueuse/core": "^10.9.0", "d3": "^7.9.0", @@ -802,7 +802,7 @@ "vue": ">=3.3" } }, - "node_modules/@tresjs/core": { + "node_modules/@tresjs/cientos/node_modules/@tresjs/core": { "version": "3.9.0", "resolved": "https://registry.npmjs.org/@tresjs/core/-/core-3.9.0.tgz", "integrity": "sha512-6el70oXSduTvSA3XCI8/rQV2GzcgCLceZKA443CTU/MBPmRDULJ12q/UYl18Ij4CJ68rTqgVi0Da+WNMrs784A==", @@ -816,6 +816,20 @@ "vue": ">=3.3" } }, + "node_modules/@tresjs/core": { + "version": "4.0.0-rc.0", + "resolved": "https://registry.npmjs.org/@tresjs/core/-/core-4.0.0-rc.0.tgz", + "integrity": "sha512-xztDCvDbIisHUWY6Axwy4swMj/LgxmfJRSke3E1gKV+W5uS77sWxD2r9i5rzUq+Gh4Gq8Vt5xNnS1D01QL412Q==", + "dependencies": { + "@alvarosabu/utils": "^3.2.0", + "@vue/devtools-api": "^6.6.1", + "@vueuse/core": "^10.9.0" + }, + "peerDependencies": { + "three": ">=0.133", + "vue": ">=3.4" + } + }, "node_modules/@trysound/sax": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz", diff --git a/front/package.json b/front/package.json index dd38b67..09fea1d 100644 --- a/front/package.json +++ b/front/package.json @@ -12,7 +12,7 @@ "dependencies": { "@fireworks-js/vue": "^2.10.7", "@tresjs/cientos": "^3.9.0", - "@tresjs/core": "^3.9.0", + "@tresjs/core": "^4.0.0-rc.0", "@vueuse/components": "^10.9.0", "@vueuse/core": "^10.9.0", "d3": "^7.9.0", diff --git a/front/src/assets/promo/models/rubber_duck (1)/license.txt b/front/src/assets/promo/models/rubber_duck (1)/license.txt new file mode 100644 index 0000000..df176ff --- /dev/null +++ b/front/src/assets/promo/models/rubber_duck (1)/license.txt @@ -0,0 +1,11 @@ +Model Information: +* title: Rubber duck +* source: https://sketchfab.com/3d-models/rubber-duck-09beba2fa834415f89734b21376fd886 +* author: samene (https://sketchfab.com/samene) + +Model License: +* license type: CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/) +* requirements: Author must be credited. Commercial use is allowed. + +If you use this 3D model in your project be sure to copy paste this credit wherever you share it: +This work is based on "Rubber duck" (https://sketchfab.com/3d-models/rubber-duck-09beba2fa834415f89734b21376fd886) by samene (https://sketchfab.com/samene) licensed under CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/) \ No newline at end of file diff --git a/front/src/assets/promo/models/rubber_duck (1)/scene.bin b/front/src/assets/promo/models/rubber_duck (1)/scene.bin new file mode 100644 index 0000000..009c925 Binary files /dev/null and b/front/src/assets/promo/models/rubber_duck (1)/scene.bin differ diff --git a/front/src/assets/promo/models/rubber_duck (1)/scene.gltf b/front/src/assets/promo/models/rubber_duck (1)/scene.gltf new file mode 100644 index 0000000..66f24c3 --- /dev/null +++ b/front/src/assets/promo/models/rubber_duck (1)/scene.gltf @@ -0,0 +1,260 @@ +{ + "accessors": [ + { + "bufferView": 2, + "componentType": 5126, + "count": 3737, + "max": [ + 0.6664810180664063, + 0.8251870274543762, + 1.0 + ], + "min": [ + -0.6664810180664063, + -0.8251870274543762, + -1.0 + ], + "type": "VEC3" + }, + { + "bufferView": 2, + "byteOffset": 44844, + "componentType": 5126, + "count": 3737, + "max": [ + 1.0, + 1.0, + 1.0 + ], + "min": [ + -1.0, + -1.0, + -1.0 + ], + "type": "VEC3" + }, + { + "bufferView": 3, + "componentType": 5126, + "count": 3737, + "max": [ + 1.0, + 0.9991883039474487, + 1.0, + 1.0 + ], + "min": [ + -1.0, + -0.9989029169082642, + -1.0, + -1.0 + ], + "type": "VEC4" + }, + { + "bufferView": 1, + "componentType": 5126, + "count": 3737, + "max": [ + 0.9725810289382935, + 0.9348239898681641 + ], + "min": [ + 0.05584320053458214, + 0.042854998260736465 + ], + "type": "VEC2" + }, + { + "bufferView": 0, + "componentType": 5125, + "count": 18900, + "type": "SCALAR" + } + ], + "asset": { + "extras": { + "author": "samene (https://sketchfab.com/samene)", + "license": "CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)", + "source": "https://sketchfab.com/3d-models/rubber-duck-09beba2fa834415f89734b21376fd886", + "title": "Rubber duck" + }, + "generator": "Sketchfab-12.67.0", + "version": "2.0" + }, + "bufferViews": [ + { + "buffer": 0, + "byteLength": 75600, + "name": "floatBufferViews", + "target": 34963 + }, + { + "buffer": 0, + "byteLength": 29896, + "byteOffset": 75600, + "byteStride": 8, + "name": "floatBufferViews", + "target": 34962 + }, + { + "buffer": 0, + "byteLength": 89688, + "byteOffset": 105496, + "byteStride": 12, + "name": "floatBufferViews", + "target": 34962 + }, + { + "buffer": 0, + "byteLength": 59792, + "byteOffset": 195184, + "byteStride": 16, + "name": "floatBufferViews", + "target": 34962 + } + ], + "buffers": [ + { + "byteLength": 254976, + "uri": "scene.bin" + } + ], + "images": [ + { + "uri": "textures/lambert1_baseColor.jpeg" + }, + { + "uri": "textures/lambert1_metallicRoughness.png" + }, + { + "uri": "textures/lambert1_normal.png" + } + ], + "materials": [ + { + "doubleSided": true, + "name": "lambert1", + "normalTexture": { + "index": 2 + }, + "pbrMetallicRoughness": { + "baseColorTexture": { + "index": 0 + }, + "metallicRoughnessTexture": { + "index": 1 + } + } + } + ], + "meshes": [ + { + "name": "defaultMaterial", + "primitives": [ + { + "attributes": { + "NORMAL": 1, + "POSITION": 0, + "TANGENT": 2, + "TEXCOORD_0": 3 + }, + "indices": 4, + "material": 0, + "mode": 4 + } + ] + } + ], + "nodes": [ + { + "children": [ + 1 + ], + "matrix": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + 2.220446049250313e-16, + -1.0, + 0.0, + 0.0, + 1.0, + 2.220446049250313e-16, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ], + "name": "Sketchfab_model" + }, + { + "children": [ + 2 + ], + "matrix": [ + 1.0, + 0.0, + 0.0, + 0.0, + 0.0, + -4.371139006309477e-08, + 0.999999999999999, + 0.0, + 0.0, + -0.999999999999999, + -4.371139006309477e-08, + 0.0, + 0.0, + 0.0, + 0.0, + 1.0 + ], + "name": "Collada visual scene group" + }, + { + "children": [ + 3 + ], + "name": "patitodegoma2" + }, + { + "mesh": 0, + "name": "defaultMaterial" + } + ], + "samplers": [ + { + "magFilter": 9729, + "minFilter": 9987, + "wrapS": 10497, + "wrapT": 10497 + } + ], + "scene": 0, + "scenes": [ + { + "name": "Sketchfab_Scene", + "nodes": [ + 0 + ] + } + ], + "textures": [ + { + "sampler": 0, + "source": 0 + }, + { + "sampler": 0, + "source": 1 + }, + { + "sampler": 0, + "source": 2 + } + ] +} diff --git a/front/src/assets/promo/models/rubber_duck (1)/textures/lambert1_baseColor.jpeg b/front/src/assets/promo/models/rubber_duck (1)/textures/lambert1_baseColor.jpeg new file mode 100644 index 0000000..5c43b40 Binary files /dev/null and b/front/src/assets/promo/models/rubber_duck (1)/textures/lambert1_baseColor.jpeg differ diff --git a/front/src/assets/promo/models/rubber_duck (1)/textures/lambert1_metallicRoughness.png b/front/src/assets/promo/models/rubber_duck (1)/textures/lambert1_metallicRoughness.png new file mode 100644 index 0000000..bb67f7a Binary files /dev/null and b/front/src/assets/promo/models/rubber_duck (1)/textures/lambert1_metallicRoughness.png differ diff --git a/front/src/assets/promo/models/rubber_duck (1)/textures/lambert1_normal.png b/front/src/assets/promo/models/rubber_duck (1)/textures/lambert1_normal.png new file mode 100644 index 0000000..77c27d2 Binary files /dev/null and b/front/src/assets/promo/models/rubber_duck (1)/textures/lambert1_normal.png differ diff --git a/front/src/components/Promo/item.vue b/front/src/components/Promo/item.vue index be2876f..7c9ad27 100644 --- a/front/src/components/Promo/item.vue +++ b/front/src/components/Promo/item.vue @@ -1,6 +1,12 @@ + diff --git a/front/src/components/Promo/main.vue b/front/src/components/Promo/main.vue index f9ef7d2..18e0266 100644 --- a/front/src/components/Promo/main.vue +++ b/front/src/components/Promo/main.vue @@ -1,12 +1,15 @@