revert

madjin · Aug 9, 2020 · b6761f1 · b6761f1
1 parent 24255c3
commit b6761f1
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 3 deletions.
diff --git a/index.html b/index.html
@@ -15,7 +15,7 @@
   <AssetImage id="cv" src="img/cv.jpg" />
   <AssetImage id="nsl-logo2" src="img/nsl2.jpg" />
   <AssetImage id="podium-logo" src="https://i.imgur.com/bOUKujF.png" />
-  <AssetObject id="nslv3" src="models/inside/v3/nsl.gltf"/>
+  <AssetObject id="nslv3" src="models/inside/v3/nsl-matterport.gltf"/>
   <AssetObject id="boombox" src="models/boombox.obj.gz" mtl="models/boombox.mtl" />
   <AssetObject id="monitor" src="models/BigFloor.dae.gz"/>
   <AssetObject id="podium" mtl="models/podium/podium.mtl" src="models/podium/podium.obj"/>

diff --git a/models/inside/v3/nsl.bin → models/inside/v3/nsl-matterport.bin b/models/inside/v3/nsl.bin → models/inside/v3/nsl-matterport.bin
diff --git a/models/inside/v3/nsl.gltf → models/inside/v3/nsl-matterport.gltf b/models/inside/v3/nsl.gltf → models/inside/v3/nsl-matterport.gltf
@@ -11,7 +11,9 @@
                 0,
                 1,
                 2,
-                3
+                3,
+                4,
+                5
             ]
         }
     ],
@@ -31,6 +33,34 @@
         {
             "mesh" : 3,
             "name" : "chunk054_group000_sub002.003"
+        },
+        {
+            "name" : "Light",
+            "rotation" : [
+                0.16907575726509094,
+                0.7558803558349609,
+                -0.27217137813568115,
+                0.570947527885437
+            ],
+            "translation" : [
+                4.076245307922363,
+                5.903861999511719,
+                -1.0054539442062378
+            ]
+        },
+        {
+            "name" : "Camera",
+            "rotation" : [
+                0.483536034822464,
+                0.33687159419059753,
+                -0.20870360732078552,
+                0.7804827094078064
+            ],
+            "translation" : [
+                7.358891487121582,
+                4.958309173583984,
+                6.925790786743164
+            ]
         }
     ],
     "materials" : [
@@ -420,7 +450,7 @@
     "buffers" : [
         {
             "byteLength" : 18086096,
-            "uri" : "nsl.bin"
+            "uri" : "nsl-matterport.bin"
         }
     ]
 }