Many changes

SystemDiagnosticss · Apr 23, 2020 · b856bc8 · b856bc8
1 parent b0b8980
commit b856bc8
Show file tree

Hide file tree

Showing 16 changed files with 1,842 additions and 4 deletions.
diff --git a/scene.bin → 17_3dior2/scene.bin b/scene.bin → 17_3dior2/scene.bin
diff --git a/scene.gltf → 17_3dior2/scene.gltf b/scene.gltf → 17_3dior2/scene.gltf
diff --git a/textures/Material_27down_baseColor.jpeg → ...2/textures/Material_27down_baseColor.jpeg b/textures/Material_27down_baseColor.jpeg → ...2/textures/Material_27down_baseColor.jpeg
diff --git a/...res/Material_27down_metallicRoughness.png → ...res/Material_27down_metallicRoughness.png b/...res/Material_27down_metallicRoughness.png → ...res/Material_27down_metallicRoughness.png
diff --git a/textures/Material_27down_normal.png → ...dior2/textures/Material_27down_normal.png b/textures/Material_27down_normal.png → ...dior2/textures/Material_27down_normal.png
diff --git a/textures/Material_5top_baseColor.jpeg → ...or2/textures/Material_5top_baseColor.jpeg b/textures/Material_5top_baseColor.jpeg → ...or2/textures/Material_5top_baseColor.jpeg
diff --git a/textures/Material_5top_metallicRoughness.png → ...tures/Material_5top_metallicRoughness.png b/textures/Material_5top_metallicRoughness.png → ...tures/Material_5top_metallicRoughness.png
diff --git a/textures/Material_5top_normal.png → 17_3dior2/textures/Material_5top_normal.png b/textures/Material_5top_normal.png → 17_3dior2/textures/Material_5top_normal.png
diff --git a/index.html b/index.html
@@ -29,21 +29,21 @@
 
       <!-- use rawgithack to retrieve the correct url for nft marker (see 'pinball' below) -->
       <a-nft
-          type='nft' url='https://arjs-cors-proxy.herokuapp.com/https://raw.githack.com/AR-js-org/AR.js/master/data/dataNFT/pinball'
+          type='nft' url='/book2/book2'
           smooth='true' smoothCount='10' smoothTolerance='0.01' smoothThreshold='5'>
           <a-entity
-              gltf-model='https://arjs-cors-proxy.herokuapp.com/https://raw.githack.com/AR-js-org/AR.js/master/aframe/examples/image-tracking/nft/trex/trex-image/trex'
+              gltf-model='/suvoi2_gltf/scene.gltf'
               position='75 150 0'
               rotation='90 90 90'
               scale='5 5 5'
               >
           </a-entity>
       </a-nft>
       <a-nft
-          type='nft' url='https://arjs-cors-proxy.herokuapp.com/https://raw.githack.com/AR-js-org/AR.js/master/aframe/examples/image-tracking/nft/trex/trex-image/trex'
+          type='nft' url='/label-wine2/label-wine2'
           smooth='true' smoothCount='10' smoothTolerance='0.01' smoothThreshold='5'>
           <a-entity
-              gltf-model='./scene.gltf'
+              gltf-model='/17_3dior2/scene.gltf'
               position='75 150 0'
               rotation='90 90 90'
               scale='30 30 30'

diff --git a/label-wine2/label-wine2.fset b/label-wine2/label-wine2.fset
diff --git a/label-wine2/label-wine2.fset3 b/label-wine2/label-wine2.fset3
diff --git a/label-wine2/label-wine2.iset b/label-wine2/label-wine2.iset
diff --git a/suvoi2_gltf/scene.bin b/suvoi2_gltf/scene.bin