From f9a63902604160f9504129de5e5081e4a45b1cce Mon Sep 17 00:00:00 2001 From: Tom Boullay Date: Mon, 11 May 2026 11:25:17 +0200 Subject: [PATCH] fix: add tracking + add new models --- public/models/cable1/cabledroit_Base_color.png | 3 +++ public/models/cable1/cabledroit_Height.png | 3 +++ public/models/cable1/cabledroit_Metallic.png | 3 +++ public/models/cable1/cabledroit_Mixed_AO.png | 3 +++ public/models/cable1/cabledroit_Normal.png | 3 +++ .../models/cable1/cabledroit_Normal_OpenGL.png | 3 +++ public/models/cable1/cabledroit_Roughness.png | 3 +++ public/models/cable1/model.gltf | 3 +++ public/models/cable2/cablegauche_Base_color.png | 3 +++ public/models/cable2/cablegauche_Height.png | 3 +++ public/models/cable2/cablegauche_Metallic.png | 3 +++ public/models/cable2/cablegauche_Mixed_AO.png | 3 +++ public/models/cable2/cablegauche_Normal.png | 3 +++ .../models/cable2/cablegauche_Normal_OpenGL.png | 3 +++ public/models/cable2/cablegauche_Roughness.png | 3 +++ public/models/cable2/model.gltf | 3 +++ public/models/ebike/Cable 1_baseColor.png | 3 +++ public/models/ebike/Cable 1_normal.png | 3 +++ .../Cable 1_occlusionRoughnessMetallic.png | 3 +++ public/models/ebike/Cable2_baseColor.png | 3 +++ public/models/ebike/Cable2_normal.png | 3 +++ .../ebike/Cable2_occlusionRoughnessMetallic.png | 3 +++ public/models/ebike/Carroserie_baseColor.png | 3 +++ public/models/ebike/Carroserie_normal.png | 3 +++ .../Carroserie_occlusionRoughnessMetallic.png | 3 +++ public/models/ebike/Ferail_baseColor.png | 3 +++ public/models/ebike/Ferail_normal.png | 3 +++ .../ebike/Ferail_occlusionRoughnessMetallic.png | 3 +++ public/models/ebike/Reservoir_baseColor.png | 3 +++ public/models/ebike/Reservoir_normal.png | 3 +++ .../Reservoir_occlusionRoughnessMetallic.png | 3 +++ public/models/ebike/Sac_baseColor.png | 3 +++ public/models/ebike/Sac_normal.png | 3 +++ .../ebike/Sac_occlusionRoughnessMetallic.png | 3 +++ public/models/ebike/Siege_baseColor.png | 3 +++ public/models/ebike/Siege_normal.png | 3 +++ .../ebike/Siege_occlusionRoughnessMetallic.png | 3 +++ public/models/ebike/ebike.bin | 3 +++ public/models/ebike/model.gltf | 3 +++ public/models/ebike/phare_baseColor.png | 3 +++ public/models/ebike/phare_normal.png | 3 +++ .../ebike/phare_occlusionRoughnessMetallic.png | 3 +++ public/models/ebike/pneu_baseColor.png | 3 +++ public/models/ebike/pneu_normal.png | 3 +++ .../ebike/pneu_occlusionRoughnessMetallic.png | 3 +++ public/models/ebike/refroidisseur_baseColor.png | 3 +++ public/models/ebike/refroidisseur_normal.png | 3 +++ ...refroidisseur_occlusionRoughnessMetallic.png | 3 +++ public/models/ebike/resort_baseColor.png | 3 +++ public/models/ebike/resort_normal.png | 3 +++ .../ebike/resort_occlusionRoughnessMetallic.png | 3 +++ public/models/gant_l/model.gltf | 2 +- public/models/puce/model.gltf | 3 +++ public/models/puce/puces_Base_color.png | 3 +++ public/models/puce/puces_Height.png | 3 +++ public/models/puce/puces_Metallic.png | 3 +++ public/models/puce/puces_Mixed_AO.png | 3 +++ public/models/puce/puces_Normal.png | 3 +++ public/models/puce/puces_Normal_OpenGL.png | 3 +++ public/models/puce/puces_Roughness.png | 3 +++ .../three/handTracking/HandTrackingGlove.tsx | 8 +------- .../three/interaction/GrabbableObject.tsx | 17 +++++++++-------- 62 files changed, 188 insertions(+), 16 deletions(-) create mode 100644 public/models/cable1/cabledroit_Base_color.png create mode 100644 public/models/cable1/cabledroit_Height.png create mode 100644 public/models/cable1/cabledroit_Metallic.png create mode 100644 public/models/cable1/cabledroit_Mixed_AO.png create mode 100644 public/models/cable1/cabledroit_Normal.png create mode 100644 public/models/cable1/cabledroit_Normal_OpenGL.png create mode 100644 public/models/cable1/cabledroit_Roughness.png create mode 100644 public/models/cable1/model.gltf create mode 100644 public/models/cable2/cablegauche_Base_color.png create mode 100644 public/models/cable2/cablegauche_Height.png create mode 100644 public/models/cable2/cablegauche_Metallic.png create mode 100644 public/models/cable2/cablegauche_Mixed_AO.png create mode 100644 public/models/cable2/cablegauche_Normal.png create mode 100644 public/models/cable2/cablegauche_Normal_OpenGL.png create mode 100644 public/models/cable2/cablegauche_Roughness.png create mode 100644 public/models/cable2/model.gltf create mode 100644 public/models/ebike/Cable 1_baseColor.png create mode 100644 public/models/ebike/Cable 1_normal.png create mode 100644 public/models/ebike/Cable 1_occlusionRoughnessMetallic.png create mode 100644 public/models/ebike/Cable2_baseColor.png create mode 100644 public/models/ebike/Cable2_normal.png create mode 100644 public/models/ebike/Cable2_occlusionRoughnessMetallic.png create mode 100644 public/models/ebike/Carroserie_baseColor.png create mode 100644 public/models/ebike/Carroserie_normal.png create mode 100644 public/models/ebike/Carroserie_occlusionRoughnessMetallic.png create mode 100644 public/models/ebike/Ferail_baseColor.png create mode 100644 public/models/ebike/Ferail_normal.png create mode 100644 public/models/ebike/Ferail_occlusionRoughnessMetallic.png create mode 100644 public/models/ebike/Reservoir_baseColor.png create mode 100644 public/models/ebike/Reservoir_normal.png create mode 100644 public/models/ebike/Reservoir_occlusionRoughnessMetallic.png create mode 100644 public/models/ebike/Sac_baseColor.png create mode 100644 public/models/ebike/Sac_normal.png create mode 100644 public/models/ebike/Sac_occlusionRoughnessMetallic.png create mode 100644 public/models/ebike/Siege_baseColor.png create mode 100644 public/models/ebike/Siege_normal.png create mode 100644 public/models/ebike/Siege_occlusionRoughnessMetallic.png create mode 100644 public/models/ebike/ebike.bin create mode 100644 public/models/ebike/model.gltf create mode 100644 public/models/ebike/phare_baseColor.png create mode 100644 public/models/ebike/phare_normal.png create mode 100644 public/models/ebike/phare_occlusionRoughnessMetallic.png create mode 100644 public/models/ebike/pneu_baseColor.png create mode 100644 public/models/ebike/pneu_normal.png create mode 100644 public/models/ebike/pneu_occlusionRoughnessMetallic.png create mode 100644 public/models/ebike/refroidisseur_baseColor.png create mode 100644 public/models/ebike/refroidisseur_normal.png create mode 100644 public/models/ebike/refroidisseur_occlusionRoughnessMetallic.png create mode 100644 public/models/ebike/resort_baseColor.png create mode 100644 public/models/ebike/resort_normal.png create mode 100644 public/models/ebike/resort_occlusionRoughnessMetallic.png create mode 100644 public/models/puce/model.gltf create mode 100644 public/models/puce/puces_Base_color.png create mode 100644 public/models/puce/puces_Height.png create mode 100644 public/models/puce/puces_Metallic.png create mode 100644 public/models/puce/puces_Mixed_AO.png create mode 100644 public/models/puce/puces_Normal.png create mode 100644 public/models/puce/puces_Normal_OpenGL.png create mode 100644 public/models/puce/puces_Roughness.png diff --git a/public/models/cable1/cabledroit_Base_color.png b/public/models/cable1/cabledroit_Base_color.png new file mode 100644 index 0000000..17a1e8c --- /dev/null +++ b/public/models/cable1/cabledroit_Base_color.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:613f4ed9175f554bf1ec4b8425ecb2b81fde584414caaaab865bc47582f1ea61 +size 20078 diff --git a/public/models/cable1/cabledroit_Height.png b/public/models/cable1/cabledroit_Height.png new file mode 100644 index 0000000..713980d --- /dev/null +++ b/public/models/cable1/cabledroit_Height.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:208daeea7306a6a576fbe1098c66d59571dd984635d7fb6c017fd767cde531ed +size 3178 diff --git a/public/models/cable1/cabledroit_Metallic.png b/public/models/cable1/cabledroit_Metallic.png new file mode 100644 index 0000000..b46e54a --- /dev/null +++ b/public/models/cable1/cabledroit_Metallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60041773ef2d493f3547aa1b0fbdf5b1bb548a3da39164384293ef5292b2c5b3 +size 1118 diff --git a/public/models/cable1/cabledroit_Mixed_AO.png b/public/models/cable1/cabledroit_Mixed_AO.png new file mode 100644 index 0000000..5addc6e --- /dev/null +++ b/public/models/cable1/cabledroit_Mixed_AO.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4808a2bb7e3ae292484eab89442fe12ec00f0c9e60df1f0a3c0a07cd60d31d92 +size 100286 diff --git a/public/models/cable1/cabledroit_Normal.png b/public/models/cable1/cabledroit_Normal.png new file mode 100644 index 0000000..573e9ce --- /dev/null +++ b/public/models/cable1/cabledroit_Normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2870a832300161a35a832511aa6401a0ef8b301acf79d67eeb8aea6a6f0c6470 +size 144969 diff --git a/public/models/cable1/cabledroit_Normal_OpenGL.png b/public/models/cable1/cabledroit_Normal_OpenGL.png new file mode 100644 index 0000000..5f329f3 --- /dev/null +++ b/public/models/cable1/cabledroit_Normal_OpenGL.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:300804d6b7edc1d1375366f4a88c78d5f5f11bceb404be860144041c638fd0e6 +size 145487 diff --git a/public/models/cable1/cabledroit_Roughness.png b/public/models/cable1/cabledroit_Roughness.png new file mode 100644 index 0000000..ad7f319 --- /dev/null +++ b/public/models/cable1/cabledroit_Roughness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c284c7d004b8ac903385f47bd837da38d89bd62d6cb0ca373d0e7fb13ccebf90 +size 53658 diff --git a/public/models/cable1/model.gltf b/public/models/cable1/model.gltf new file mode 100644 index 0000000..3aa626e --- /dev/null +++ b/public/models/cable1/model.gltf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:facc8c48d1ee272d9fda6e98143c62d9d75302378eaf2e916eebe5493cd1f1d3 +size 372008 diff --git a/public/models/cable2/cablegauche_Base_color.png b/public/models/cable2/cablegauche_Base_color.png new file mode 100644 index 0000000..d9adfcb --- /dev/null +++ b/public/models/cable2/cablegauche_Base_color.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eb15c724f623830d464d72abecd429406c7a4338e6e4a6bf1afd841dbdd0c6f5 +size 31886 diff --git a/public/models/cable2/cablegauche_Height.png b/public/models/cable2/cablegauche_Height.png new file mode 100644 index 0000000..713980d --- /dev/null +++ b/public/models/cable2/cablegauche_Height.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:208daeea7306a6a576fbe1098c66d59571dd984635d7fb6c017fd767cde531ed +size 3178 diff --git a/public/models/cable2/cablegauche_Metallic.png b/public/models/cable2/cablegauche_Metallic.png new file mode 100644 index 0000000..b46e54a --- /dev/null +++ b/public/models/cable2/cablegauche_Metallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60041773ef2d493f3547aa1b0fbdf5b1bb548a3da39164384293ef5292b2c5b3 +size 1118 diff --git a/public/models/cable2/cablegauche_Mixed_AO.png b/public/models/cable2/cablegauche_Mixed_AO.png new file mode 100644 index 0000000..c421b49 --- /dev/null +++ b/public/models/cable2/cablegauche_Mixed_AO.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:daf9d86a1f29600e4af115eb0d3f429240c4f8cdfb773dfc7ce7bff2785b6cd6 +size 98979 diff --git a/public/models/cable2/cablegauche_Normal.png b/public/models/cable2/cablegauche_Normal.png new file mode 100644 index 0000000..816c578 --- /dev/null +++ b/public/models/cable2/cablegauche_Normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:050b424b60d026327146d44bf02cf5f8f3c06525b1ca99b234ade11bc6114ad2 +size 144355 diff --git a/public/models/cable2/cablegauche_Normal_OpenGL.png b/public/models/cable2/cablegauche_Normal_OpenGL.png new file mode 100644 index 0000000..8d99c85 --- /dev/null +++ b/public/models/cable2/cablegauche_Normal_OpenGL.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ab8fd8bff205eea0af8292bc13ba4687b75e140645a654cdb3247c533ab646c +size 144797 diff --git a/public/models/cable2/cablegauche_Roughness.png b/public/models/cable2/cablegauche_Roughness.png new file mode 100644 index 0000000..f90ec1c --- /dev/null +++ b/public/models/cable2/cablegauche_Roughness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a252defdb7a8f50a89c6cdad3937776f4aaf10578a6134b8dc8957b25fced770 +size 53435 diff --git a/public/models/cable2/model.gltf b/public/models/cable2/model.gltf new file mode 100644 index 0000000..e6b1c5e --- /dev/null +++ b/public/models/cable2/model.gltf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d8776e348ee8353a186cf0d1f6c3dbec569068bb6eb669e9469d0e8ad8d85e3b +size 388273 diff --git a/public/models/ebike/Cable 1_baseColor.png b/public/models/ebike/Cable 1_baseColor.png new file mode 100644 index 0000000..3245455 --- /dev/null +++ b/public/models/ebike/Cable 1_baseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3dfa719cde9daa39a0333c8a1b8d0bee72692c69b3bbf1da388df0deb0f4ba0e +size 16904 diff --git a/public/models/ebike/Cable 1_normal.png b/public/models/ebike/Cable 1_normal.png new file mode 100644 index 0000000..a42b114 --- /dev/null +++ b/public/models/ebike/Cable 1_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:afc88d8cbb75c5b4e5761fc40cdb1f937beae4d8483f05ca845ab56e19f15c90 +size 3066150 diff --git a/public/models/ebike/Cable 1_occlusionRoughnessMetallic.png b/public/models/ebike/Cable 1_occlusionRoughnessMetallic.png new file mode 100644 index 0000000..8747c04 --- /dev/null +++ b/public/models/ebike/Cable 1_occlusionRoughnessMetallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:77cf06f5e7e08653f290c353cd4c37ff91c118602436be1256280e13e52cd173 +size 353293 diff --git a/public/models/ebike/Cable2_baseColor.png b/public/models/ebike/Cable2_baseColor.png new file mode 100644 index 0000000..033cb1d --- /dev/null +++ b/public/models/ebike/Cable2_baseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2d414328fbcbd2216d6bb2f3722f4892aa9d004280772b5b2de814335c4fd8b2 +size 16905 diff --git a/public/models/ebike/Cable2_normal.png b/public/models/ebike/Cable2_normal.png new file mode 100644 index 0000000..3679ba1 --- /dev/null +++ b/public/models/ebike/Cable2_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bd3f1dcf7d1309b3e907939fd96fcfb9740fcce0a7755aca372b72297aa17f9d +size 3033832 diff --git a/public/models/ebike/Cable2_occlusionRoughnessMetallic.png b/public/models/ebike/Cable2_occlusionRoughnessMetallic.png new file mode 100644 index 0000000..f0c1d5f --- /dev/null +++ b/public/models/ebike/Cable2_occlusionRoughnessMetallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:937bba888a3f821daba2aec3653bbcc3f393234d51cd604dd9341d6320c92cb2 +size 355460 diff --git a/public/models/ebike/Carroserie_baseColor.png b/public/models/ebike/Carroserie_baseColor.png new file mode 100644 index 0000000..0171d51 --- /dev/null +++ b/public/models/ebike/Carroserie_baseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:957d7b537a82fbdbf1049291af8c36431c4abd4fbd9e94381dbd49215b2b50b2 +size 16905 diff --git a/public/models/ebike/Carroserie_normal.png b/public/models/ebike/Carroserie_normal.png new file mode 100644 index 0000000..dbdd88e --- /dev/null +++ b/public/models/ebike/Carroserie_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c692839659b369d9694709deea005faf71e4b448d24b7bbeec9f8d1c47b94485 +size 2510257 diff --git a/public/models/ebike/Carroserie_occlusionRoughnessMetallic.png b/public/models/ebike/Carroserie_occlusionRoughnessMetallic.png new file mode 100644 index 0000000..05ff7d9 --- /dev/null +++ b/public/models/ebike/Carroserie_occlusionRoughnessMetallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f6abf72de5fcfce9738ac6f49bc3352160b11f1af7680ae5da84266d5fb4aaa2 +size 261088 diff --git a/public/models/ebike/Ferail_baseColor.png b/public/models/ebike/Ferail_baseColor.png new file mode 100644 index 0000000..b2e286e --- /dev/null +++ b/public/models/ebike/Ferail_baseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72fc78eb3273eb8ae80c523319de0e3e69924a5f7ec15d88a6330083ccfffd8f +size 276020 diff --git a/public/models/ebike/Ferail_normal.png b/public/models/ebike/Ferail_normal.png new file mode 100644 index 0000000..2f2b172 --- /dev/null +++ b/public/models/ebike/Ferail_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efb159756d206de812e300c1bc40df771b5cd2606c4d856682af5873584b7761 +size 2554815 diff --git a/public/models/ebike/Ferail_occlusionRoughnessMetallic.png b/public/models/ebike/Ferail_occlusionRoughnessMetallic.png new file mode 100644 index 0000000..52689a4 --- /dev/null +++ b/public/models/ebike/Ferail_occlusionRoughnessMetallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25a3b05c805e06b38fd94bb27eff7c8ae72ce4bf14fbdb15e59366ac2e1f45f1 +size 349895 diff --git a/public/models/ebike/Reservoir_baseColor.png b/public/models/ebike/Reservoir_baseColor.png new file mode 100644 index 0000000..7ec7dac --- /dev/null +++ b/public/models/ebike/Reservoir_baseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81cda14600b32f5ab26e00d9db40924010e1beb1939c5eed0ce6386e358d3b1d +size 53203 diff --git a/public/models/ebike/Reservoir_normal.png b/public/models/ebike/Reservoir_normal.png new file mode 100644 index 0000000..1bfb989 --- /dev/null +++ b/public/models/ebike/Reservoir_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4702cd610157f13b0bf2c4bb04dd40489e80719e90fc7cb57f1c30f6a4cc2658 +size 2272453 diff --git a/public/models/ebike/Reservoir_occlusionRoughnessMetallic.png b/public/models/ebike/Reservoir_occlusionRoughnessMetallic.png new file mode 100644 index 0000000..b46ab8d --- /dev/null +++ b/public/models/ebike/Reservoir_occlusionRoughnessMetallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7aec1cadb1ffd038a54e648b875609458725c1ef652959e252afa0f03a3f7f1e +size 16902 diff --git a/public/models/ebike/Sac_baseColor.png b/public/models/ebike/Sac_baseColor.png new file mode 100644 index 0000000..a5a1f2e --- /dev/null +++ b/public/models/ebike/Sac_baseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4050254074e54089f003380521fac6e72590cd8f0b00be951dfe77bd16fe55b +size 16904 diff --git a/public/models/ebike/Sac_normal.png b/public/models/ebike/Sac_normal.png new file mode 100644 index 0000000..be10189 --- /dev/null +++ b/public/models/ebike/Sac_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9fced262e1eb6b4dfa10bea86eaa2e8c497304fc26f055dffc03e1459588c231 +size 2343888 diff --git a/public/models/ebike/Sac_occlusionRoughnessMetallic.png b/public/models/ebike/Sac_occlusionRoughnessMetallic.png new file mode 100644 index 0000000..45e9c20 --- /dev/null +++ b/public/models/ebike/Sac_occlusionRoughnessMetallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c539f92a27e495d88074dc87f3cd463d66b96b7de73188957b5f6d361b1e7b95 +size 105767 diff --git a/public/models/ebike/Siege_baseColor.png b/public/models/ebike/Siege_baseColor.png new file mode 100644 index 0000000..77303d5 --- /dev/null +++ b/public/models/ebike/Siege_baseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ebe579bfb6a336e8d580323c6ac660e755836d180d5c9ba4276c11c1e44f59d +size 16904 diff --git a/public/models/ebike/Siege_normal.png b/public/models/ebike/Siege_normal.png new file mode 100644 index 0000000..08c1c41 --- /dev/null +++ b/public/models/ebike/Siege_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c813675da9d47425a2cac86909e98646a82c2a42b73378f7eab8a5af79f08f7e +size 2800715 diff --git a/public/models/ebike/Siege_occlusionRoughnessMetallic.png b/public/models/ebike/Siege_occlusionRoughnessMetallic.png new file mode 100644 index 0000000..c6b768c --- /dev/null +++ b/public/models/ebike/Siege_occlusionRoughnessMetallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a11a02281f5443ef44ec0ccb93d4ab1b4972e16e673741834acda5a3b60390c +size 308036 diff --git a/public/models/ebike/ebike.bin b/public/models/ebike/ebike.bin new file mode 100644 index 0000000..30c7a57 --- /dev/null +++ b/public/models/ebike/ebike.bin @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed6d61d76b9acb99c87b45b497dcd0214e2f0c0eb2ab7390e3a14d0debbe26b4 +size 3865056 diff --git a/public/models/ebike/model.gltf b/public/models/ebike/model.gltf new file mode 100644 index 0000000..90c018b --- /dev/null +++ b/public/models/ebike/model.gltf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c63499eef242474ceecaefcd8e242af239d63d77ef6dc854fea19ab802c6e40c +size 311438 diff --git a/public/models/ebike/phare_baseColor.png b/public/models/ebike/phare_baseColor.png new file mode 100644 index 0000000..05209c8 --- /dev/null +++ b/public/models/ebike/phare_baseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91c23d60933bb685bbb96bdae47672f5c7ec1a62552a56d0eeee1b22448cb66d +size 16905 diff --git a/public/models/ebike/phare_normal.png b/public/models/ebike/phare_normal.png new file mode 100644 index 0000000..7919b63 --- /dev/null +++ b/public/models/ebike/phare_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a4a1e9491ca5d182d658a29095d24616f7927b8084a68733f5e2eca638b0e7f +size 2905767 diff --git a/public/models/ebike/phare_occlusionRoughnessMetallic.png b/public/models/ebike/phare_occlusionRoughnessMetallic.png new file mode 100644 index 0000000..b0edb22 --- /dev/null +++ b/public/models/ebike/phare_occlusionRoughnessMetallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:808064a2e6581764a06ead7add5c07bf3d3bd33f3fefb9d76dfe96b8fd3ec3a3 +size 76759 diff --git a/public/models/ebike/pneu_baseColor.png b/public/models/ebike/pneu_baseColor.png new file mode 100644 index 0000000..f0070f9 --- /dev/null +++ b/public/models/ebike/pneu_baseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:66b5bd694173370dad3acaf0b8f51fbb3430aaa8ab485b4e9edda391ceccbd89 +size 16903 diff --git a/public/models/ebike/pneu_normal.png b/public/models/ebike/pneu_normal.png new file mode 100644 index 0000000..36b9922 --- /dev/null +++ b/public/models/ebike/pneu_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39901ec91b5cebd09a5cd47e8113c702639cd4469c0f9163fae482f22ed259d0 +size 2906834 diff --git a/public/models/ebike/pneu_occlusionRoughnessMetallic.png b/public/models/ebike/pneu_occlusionRoughnessMetallic.png new file mode 100644 index 0000000..1c9776d --- /dev/null +++ b/public/models/ebike/pneu_occlusionRoughnessMetallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e148f1d006dbbc26e4e2d846b359c6099a49ceec3fca57373293aad70709257e +size 175094 diff --git a/public/models/ebike/refroidisseur_baseColor.png b/public/models/ebike/refroidisseur_baseColor.png new file mode 100644 index 0000000..d42ddd3 --- /dev/null +++ b/public/models/ebike/refroidisseur_baseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c0a26f992b5a35bb17d7413706137eda6556b1efa06b166d4b304ca779a5e40a +size 16905 diff --git a/public/models/ebike/refroidisseur_normal.png b/public/models/ebike/refroidisseur_normal.png new file mode 100644 index 0000000..2d305a2 --- /dev/null +++ b/public/models/ebike/refroidisseur_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17af9328e0fd9ab1616a4ded1beded04ff74354c94a08353aeeaaa2c1a121088 +size 2681590 diff --git a/public/models/ebike/refroidisseur_occlusionRoughnessMetallic.png b/public/models/ebike/refroidisseur_occlusionRoughnessMetallic.png new file mode 100644 index 0000000..7472735 --- /dev/null +++ b/public/models/ebike/refroidisseur_occlusionRoughnessMetallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:db6b826f7944bebcd541739518eb6f9c4b4fbc2039666f7e09f67c8249e4f42f +size 392559 diff --git a/public/models/ebike/resort_baseColor.png b/public/models/ebike/resort_baseColor.png new file mode 100644 index 0000000..15c01a0 --- /dev/null +++ b/public/models/ebike/resort_baseColor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de9b0d8cdb09ea492a643f3df39485dfa0a079c35d64ce1e9a07f96b13911f77 +size 16906 diff --git a/public/models/ebike/resort_normal.png b/public/models/ebike/resort_normal.png new file mode 100644 index 0000000..d51da9b --- /dev/null +++ b/public/models/ebike/resort_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:51249f7261e440e355c85abc2abc453760f7a51f98e868e3132dbf6431f5b47b +size 2929670 diff --git a/public/models/ebike/resort_occlusionRoughnessMetallic.png b/public/models/ebike/resort_occlusionRoughnessMetallic.png new file mode 100644 index 0000000..106d8d6 --- /dev/null +++ b/public/models/ebike/resort_occlusionRoughnessMetallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a1420af59e0ebc0d2707ca3e5148f4bb621fa73daabff45b6ed723f766836e9 +size 100634 diff --git a/public/models/gant_l/model.gltf b/public/models/gant_l/model.gltf index 8145f42..da03db6 100644 --- a/public/models/gant_l/model.gltf +++ b/public/models/gant_l/model.gltf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e3696880d4654a676341854d33a1a39b6358bd5a6af8e36c92adc8d42101b208 +oid sha256:01cdac724dfe936d112bd19202694a16196f54b6726b9e7e4e5102235fd41980 size 10303 diff --git a/public/models/puce/model.gltf b/public/models/puce/model.gltf new file mode 100644 index 0000000..8be11e4 --- /dev/null +++ b/public/models/puce/model.gltf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ecdc4def45c4fbc8c0b083edd70edac6970602d5a609ac7a1b5e8213272b8833 +size 517383 diff --git a/public/models/puce/puces_Base_color.png b/public/models/puce/puces_Base_color.png new file mode 100644 index 0000000..6c91328 --- /dev/null +++ b/public/models/puce/puces_Base_color.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4945a42ce365fecb6b64549cae5519a141ff9a7e14d1ab834182ac9737c05a82 +size 46976 diff --git a/public/models/puce/puces_Height.png b/public/models/puce/puces_Height.png new file mode 100644 index 0000000..713980d --- /dev/null +++ b/public/models/puce/puces_Height.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:208daeea7306a6a576fbe1098c66d59571dd984635d7fb6c017fd767cde531ed +size 3178 diff --git a/public/models/puce/puces_Metallic.png b/public/models/puce/puces_Metallic.png new file mode 100644 index 0000000..b46e54a --- /dev/null +++ b/public/models/puce/puces_Metallic.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60041773ef2d493f3547aa1b0fbdf5b1bb548a3da39164384293ef5292b2c5b3 +size 1118 diff --git a/public/models/puce/puces_Mixed_AO.png b/public/models/puce/puces_Mixed_AO.png new file mode 100644 index 0000000..e3507ef --- /dev/null +++ b/public/models/puce/puces_Mixed_AO.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4e9cd7f981995050b483e59ac123b397d7ec5ca3d30d10215b4a9ec01a27a69 +size 222566 diff --git a/public/models/puce/puces_Normal.png b/public/models/puce/puces_Normal.png new file mode 100644 index 0000000..fd77f2d --- /dev/null +++ b/public/models/puce/puces_Normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9be38b03c2aa41d54235e0bf6fa491c13a24ff2ecb4db609ce62c2e83fbf6c19 +size 149845 diff --git a/public/models/puce/puces_Normal_OpenGL.png b/public/models/puce/puces_Normal_OpenGL.png new file mode 100644 index 0000000..aa432ed --- /dev/null +++ b/public/models/puce/puces_Normal_OpenGL.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b991ea9ce0ec7d61e33bafdae0526a0f9285777685a8e98b4e69fd22234a67a6 +size 152096 diff --git a/public/models/puce/puces_Roughness.png b/public/models/puce/puces_Roughness.png new file mode 100644 index 0000000..0855db0 --- /dev/null +++ b/public/models/puce/puces_Roughness.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4d89d63628794f450ce8f6503010aaf9e257b3839242a41f92a472a9ca75a3af +size 101983 diff --git a/src/components/three/handTracking/HandTrackingGlove.tsx b/src/components/three/handTracking/HandTrackingGlove.tsx index 1158b6d..ed6faef 100644 --- a/src/components/three/handTracking/HandTrackingGlove.tsx +++ b/src/components/three/handTracking/HandTrackingGlove.tsx @@ -32,7 +32,6 @@ const GLOVE_CONFIGS: Record< const GLOVE_MODEL_SCALE = 0.33; const HAND_SPACE_DISTANCE = 0.5; -const HAND_DEPTH_SCALE = 0.5; const HAND_TRACKING_HIDE_DELAY_MS = 250; const FINGER_LANDMARK_CHAINS = [ @@ -126,12 +125,7 @@ function landmarkToWorldPoint( target.unproject(camera); _direction.copy(target).sub(_cameraPosition).normalize(); - target - .copy(_cameraPosition) - .addScaledVector( - _direction, - HAND_SPACE_DISTANCE - landmark.z * HAND_DEPTH_SCALE, - ); + target.copy(_cameraPosition).addScaledVector(_direction, HAND_SPACE_DISTANCE); return target; } diff --git a/src/components/three/interaction/GrabbableObject.tsx b/src/components/three/interaction/GrabbableObject.tsx index c3dcf03..62821da 100644 --- a/src/components/three/interaction/GrabbableObject.tsx +++ b/src/components/three/interaction/GrabbableObject.tsx @@ -25,10 +25,7 @@ import { INTERACTION_RADIUS } from "@/data/interaction/interactionConfig"; import { useDebugFolder } from "@/hooks/debug/useDebugFolder"; import { useHandTrackingSnapshot } from "@/hooks/handTracking/useHandTrackingSnapshot"; import { InteractionManager } from "@/managers/InteractionManager"; -import type { - HandTrackingHand, - HandTrackingLandmark, -} from "@/types/handTracking/handTracking"; +import type { HandTrackingHand } from "@/types/handTracking/handTracking"; import type { ColliderShape, Vector3Tuple } from "@/types/three/three"; interface GrabbableObjectProps { @@ -44,6 +41,11 @@ interface GrabbableObjectProps { snapTargets?: readonly Vector3Tuple[]; } +interface HandScreenPoint { + x: number; + y: number; +} + const grabDebugParams = { stiffness: GRAB_STIFFNESS_DEFAULT, throwBoost: GRAB_THROW_BOOST_DEFAULT, @@ -74,10 +76,10 @@ const HAND_HIT_OFFSETS: Array<[number, number]> = [ [0, -HAND_GRAB_SCREEN_RADIUS], ]; -function getHandCenterPoint(hand: HandTrackingHand): HandTrackingLandmark { +function getHandCenterPoint(hand: HandTrackingHand): HandScreenPoint { const landmarks = hand.landmarks; if (landmarks.length === 0) { - return { x: hand.x, y: hand.y, z: hand.z }; + return { x: hand.x, y: hand.y }; } let minX = landmarks[0]!.x; @@ -95,7 +97,6 @@ function getHandCenterPoint(hand: HandTrackingHand): HandTrackingLandmark { return { x: (minX + maxX) / 2, y: (minY + maxY) / 2, - z: hand.z, }; } @@ -103,7 +104,7 @@ function getHandHit( group: THREE.Group | null, camera: THREE.Camera, cameraPos: THREE.Vector3, - handCenter: HandTrackingLandmark, + handCenter: HandScreenPoint, ): THREE.Intersection | null { if (!group) return null;