diff --git a/model-viewer/back_arrow.png b/model-viewer/back_arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d1d15988e2f2a754d64cf07fdd1575b084988aa
Binary files /dev/null and b/model-viewer/back_arrow.png differ
diff --git a/model-viewer/herisson/herisson.gltf b/model-viewer/herisson/herisson.gltf
deleted file mode 100644
index 0a0e46fb65a1cfa5065a4509c0872409016f03b7..0000000000000000000000000000000000000000
--- a/model-viewer/herisson/herisson.gltf
+++ /dev/null
@@ -1,209 +0,0 @@
-{
- "asset":{
- "generator":"Khronos glTF Blender I/O v3.5.30",
- "version":"2.0"
- },
- "scene":0,
- "scenes":[
- {
- "name":"Scene",
- "nodes":[
- 0,
- 1
- ]
- }
- ],
- "nodes":[
- {
- "mesh":0,
- "name":"Downloads\\Align_03_mesh",
- "rotation":[
- 0.6800981163978577,
- 0,
- 0,
- 0.7331210970878601
- ],
- "translation":[
- -49.82083511352539,
- 36.19061279296875,
- 197.40335083007812
- ]
- },
- {
- "mesh":1,
- "name":"Cube"
- }
- ],
- "materials":[
- {
- "doubleSided":true,
- "name":"Material",
- "pbrMetallicRoughness":{
- "baseColorFactor":[
- 0.800000011920929,
- 0.800000011920929,
- 0.800000011920929,
- 1
- ],
- "metallicFactor":0,
- "roughnessFactor":0.5
- }
- }
- ],
- "meshes":[
- {
- "name":"Downloads\\Align_03_mesh",
- "primitives":[
- {
- "attributes":{
- "COLOR_0":0,
- "POSITION":1,
- "NORMAL":2
- },
- "indices":3
- }
- ]
- },
- {
- "name":"Cube",
- "primitives":[
- {
- "attributes":{
- "POSITION":4,
- "TEXCOORD_0":5,
- "NORMAL":6
- },
- "indices":7,
- "material":0
- }
- ]
- }
- ],
- "accessors":[
- {
- "bufferView":0,
- "componentType":5123,
- "count":2981931,
- "normalized":true,
- "type":"VEC4"
- },
- {
- "bufferView":1,
- "componentType":5126,
- "count":2981931,
- "max":[
- 97.93450164794922,
- -155.93739318847656,
- 23.98272705078125
- ],
- "min":[
- -4.306197643280029,
- -226.98580932617188,
- -39.60851287841797
- ],
- "type":"VEC3"
- },
- {
- "bufferView":2,
- "componentType":5126,
- "count":2981931,
- "type":"VEC3"
- },
- {
- "bufferView":3,
- "componentType":5125,
- "count":2981931,
- "type":"SCALAR"
- },
- {
- "bufferView":4,
- "componentType":5126,
- "count":24,
- "max":[
- 1,
- 1,
- 1
- ],
- "min":[
- -1,
- -1,
- -1
- ],
- "type":"VEC3"
- },
- {
- "bufferView":5,
- "componentType":5126,
- "count":24,
- "type":"VEC2"
- },
- {
- "bufferView":6,
- "componentType":5126,
- "count":24,
- "type":"VEC3"
- },
- {
- "bufferView":7,
- "componentType":5123,
- "count":36,
- "type":"SCALAR"
- }
- ],
- "bufferViews":[
- {
- "buffer":0,
- "byteLength":23855448,
- "byteOffset":0,
- "target":34962
- },
- {
- "buffer":0,
- "byteLength":35783172,
- "byteOffset":23855448,
- "target":34962
- },
- {
- "buffer":0,
- "byteLength":35783172,
- "byteOffset":59638620,
- "target":34962
- },
- {
- "buffer":0,
- "byteLength":11927724,
- "byteOffset":95421792,
- "target":34963
- },
- {
- "buffer":0,
- "byteLength":288,
- "byteOffset":107349516,
- "target":34962
- },
- {
- "buffer":0,
- "byteLength":192,
- "byteOffset":107349804,
- "target":34962
- },
- {
- "buffer":0,
- "byteLength":288,
- "byteOffset":107349996,
- "target":34962
- },
- {
- "buffer":0,
- "byteLength":72,
- "byteOffset":107350284,
- "target":34963
- }
- ],
- "buffers":[
- {
- "byteLength":107350356,
- "uri":"herisson.bin"
- }
- ]
-}
diff --git a/model-viewer/index.html b/model-viewer/index.html
index 961738fb1b061628208b254f28b617318b2d6934..db8f296bb18b7cdd05debbc7b4a1afbf7e3fcae4 100644
--- a/model-viewer/index.html
+++ b/model-viewer/index.html
@@ -88,31 +88,61 @@
</style>
</head>
<body>
- <template id="statut1">
+ <template id="template-one">
<model-viewer
- src="./statut1/jambe_gauche_comp_10.gltf"
+ src="./statut1/jambe_gauche.gltf"
+ id="model-one"
ar
shadow-intensity="1"
camera-controls
autoplay
>
+ <img
+ id="back-one"
+ src="back_arrow.png"
+ alt="back"
+ height="100"
+ width="100"
+ />
<div class="go-button" slot="ar-button">
<span class="label">Accéder à l'AR</span>
</div>
</model-viewer>
+ <script>
+ const back1 = document.getElementById("back-one");
+ back1.addEventListener("click", () => {
+ document.querySelector("#welcome-page").style.display = "flex";
+ document.querySelector("#model-one").remove();
+ });
+ </script>
</template>
- <template id="statut2">
+ <template id="template-two">
<model-viewer
- src="./statut2/jambe_gauche.gltf"
+ src="./statut2/Sculpture2_test.glb"
+ id="model-two"
ar
shadow-intensity="1"
camera-controls
autoplay
>
+ <img
+ src="back_arrow.png"
+ id="back-two"
+ alt="back"
+ height="100"
+ width="100"
+ />
<div class="go-button" slot="ar-button">
<span class="label">Accéder à l'AR</span>
</div>
</model-viewer>
+ <script>
+ const back2 = document.getElementById("back-two");
+ back2.addEventListener("click", () => {
+ document.querySelector("#welcome-page").style.display = "flex";
+ document.querySelector("#model-two").remove();
+ });
+ </script>
</template>
<div class="container background" id="welcome-page">
<div class="titre">
@@ -122,10 +152,10 @@
Viser une sculpture MOLDED/MOLTED avec la camera de votre téléphone
</p>
<div class="buttons">
- <div class="ar-button model-one">
+ <div class="ar-button button-one">
<span class="label">Premier modèle 3D</span>
</div>
- <div class="ar-button model-two">
+ <div class="ar-button button-two">
<span class="label">Second modèle 3D</span>
</div>
</div>
@@ -133,23 +163,23 @@
</body>
<footer>
<script>
- const button1 = document.querySelector(".model-one");
- const button2 = document.querySelector(".model-two");
+ const button1 = document.querySelector(".button-one");
+ const button2 = document.querySelector(".button-two");
button1.addEventListener("click", () => {
- const template = document.getElementById("statut1");
+ const template = document.getElementById("template-one");
document
.querySelector("body")
.appendChild(template.content.cloneNode(true));
- document.querySelector("#welcome-page").remove();
+ document.querySelector("#welcome-page").style.display = "none";
});
button2.addEventListener("click", () => {
- const template = document.getElementById("statut2");
+ const template = document.getElementById("template-two");
document
.querySelector("body")
.appendChild(template.content.cloneNode(true));
- document.querySelector("#welcome-page").remove();
+ document.querySelector("#welcome-page").style.display = "none";
});
</script>
</footer>
diff --git a/model-viewer/herisson/herisson.bin b/model-viewer/statut1/Sculpture1_test.glb
similarity index 54%
rename from model-viewer/herisson/herisson.bin
rename to model-viewer/statut1/Sculpture1_test.glb
index 3c8e712a2616520fd58380b6a52c69380d2a3379..2de8570dd050bcc86590cc24bc0da6b82deb57c9 100644
Binary files a/model-viewer/herisson/herisson.bin and b/model-viewer/statut1/Sculpture1_test.glb differ
diff --git a/model-viewer/statut2/jambe_gauche.bin b/model-viewer/statut1/jambe_gauche.bin
similarity index 100%
rename from model-viewer/statut2/jambe_gauche.bin
rename to model-viewer/statut1/jambe_gauche.bin
diff --git a/model-viewer/statut2/jambe_gauche.gltf b/model-viewer/statut1/jambe_gauche.gltf
similarity index 100%
rename from model-viewer/statut2/jambe_gauche.gltf
rename to model-viewer/statut1/jambe_gauche.gltf
diff --git a/model-viewer/statut1/jambe_gauche_comp_10.bin b/model-viewer/statut1/jambe_gauche_comp_10.bin
deleted file mode 100644
index 2c5f101f5233891a25c7a7073eb6b8392d9654df..0000000000000000000000000000000000000000
Binary files a/model-viewer/statut1/jambe_gauche_comp_10.bin and /dev/null differ
diff --git a/model-viewer/statut1/jambe_gauche_comp_10.gltf b/model-viewer/statut1/jambe_gauche_comp_10.gltf
deleted file mode 100644
index 152bd161be74de82998a5cac2ef6c6e07bf3ad41..0000000000000000000000000000000000000000
--- a/model-viewer/statut1/jambe_gauche_comp_10.gltf
+++ /dev/null
@@ -1,104 +0,0 @@
-{
- "asset":{
- "generator":"Khronos glTF Blender I/O v3.6.27",
- "version":"2.0"
- },
- "extensionsUsed":[
- "KHR_draco_mesh_compression"
- ],
- "extensionsRequired":[
- "KHR_draco_mesh_compression"
- ],
- "scene":0,
- "scenes":[
- {
- "name":"Scene",
- "nodes":[
- 0
- ]
- }
- ],
- "nodes":[
- {
- "mesh":0,
- "name":"Jungling_Vom_Magdalensberg",
- "rotation":[
- 0.7071068286895752,
- 0,
- 0,
- 0.7071068286895752
- ]
- }
- ],
- "meshes":[
- {
- "name":"Jungling_Vom_Magdalensberg",
- "primitives":[
- {
- "attributes":{
- "COLOR_0":0,
- "POSITION":1,
- "NORMAL":2
- },
- "extensions":{
- "KHR_draco_mesh_compression":{
- "bufferView":0,
- "attributes":{
- "COLOR_0":0,
- "POSITION":1,
- "NORMAL":2
- }
- }
- },
- "indices":3,
- "mode":4
- }
- ]
- }
- ],
- "accessors":[
- {
- "componentType":5126,
- "count":642850,
- "type":"VEC4"
- },
- {
- "componentType":5126,
- "count":642850,
- "max":[
- 520.5945434570312,
- 316.06463623046875,
- 1.436126947402954
- ],
- "min":[
- 111.76576232910156,
- 9.455382347106934,
- -777.7801513671875
- ],
- "type":"VEC3"
- },
- {
- "componentType":5126,
- "count":642850,
- "type":"VEC3"
- },
- {
- "componentType":5125,
- "count":643254,
- "type":"SCALAR"
- }
- ],
- "bufferViews":[
- {
- "buffer":0,
- "byteLength":2867965,
- "byteOffset":0
- }
- ],
- "buffers":[
- {
- "byteLength":2867968,
- "uri":"jambe_gauche_comp_10.bin"
- }
- ]
-}
diff --git a/model-viewer/statut2/Sculpture2_test.glb b/model-viewer/statut2/Sculpture2_test.glb
new file mode 100644
index 0000000000000000000000000000000000000000..25dc43a3b7fd7367e0b4706111818188ed3375b7
Binary files /dev/null and b/model-viewer/statut2/Sculpture2_test.glb differ