Merge branch 'reference-viewer' into cleanup/extract_image_post-proce…

…ssing
KhronosGroup · Dec 12, 2018 · e2cbd86 · e2cbd86
2 parents f0bce8c + 2550824
commit e2cbd86
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 65 deletions.
diff --git a/index.html b/index.html
@@ -21,7 +21,7 @@
 </head>
 
 <!-- Just create a rendering canvas like below and call gltf_rv! -->
-<body onload="viewer = gltf_rv.gltf_rv('canvas', 'assets/models/2.0/model-index.json', false, undefined, '', 'BoomBox', 'papermill');">
+<body onload="viewer = gltf_rv.gltf_rv('canvas', 'assets/models/2.0/model-index.json', false);">
     <div id="gltf-rv-model-spinner"> </div>
     <canvas id="canvas">No Canvas!</canvas>
 </body>

diff --git a/index_doge2.html b/index_doge2.html
@@ -14,44 +14,14 @@
     <link rel="icon" href="assets/images/gltf.png">
 
     <script src="libs/dat.gui.min.js"></script>
-    <script src="libs/gl-matrix-min.js"></script>
     <script src="libs/axios.min.js"></script>
     <script src="libs/stats.min.js"></script>
-    <script src="libs/hdrpng.js"></script>
 
-    <script src="src/utils.js"></script>
-    <script src="src/rendering_parameters.js"></script>
-    <script src="src/glbParser.js"></script>
-    <script src="src/loader.js"></script>
-    <script src="src/image.js"></script>
-    <script src="src/texture.js"></script>
-    <script src="src/sampler.js"></script>
-    <script src="src/material.js"></script>
-    <script src="src/webgl.js"></script>
-    <script src="src/shader.js"></script>
-    <script src="src/shader_cache.js"></script>
-    <script src="src/camera.js"></script>
-    <script src="src/user_camera.js"></script>
-    <script src="src/light.js"></script>
-    <script src="src/primitive.js"></script>
-    <script src="src/buffer.js"></script>
-    <script src="src/buffer_view.js"></script>
-    <script src="src/accessor.js"></script>
-    <script src="src/mesh.js"></script>
-    <script src="src/node.js"></script>
-    <script src="src/scene.js"></script>
-    <script src="src/gltf.js"></script>
-    <script src="src/user_interface.js"></script>
-    <script src="src/model_path_provider.js"></script>
-    <script src="src/image_processor.js"></script>
-
-    <script src="src/viewer.js"></script>
-    <script src="src/renderer.js"></script>
-    <script src="src/main.js"></script>
+    <script src="dist/gltf-reference-viewer.umd.js"></script>
 </head>
 
 <!-- Just create a rendering canvas like below and call gltf_rv! -->
-<body onload="viewer = gltf_rv('canvas', 'assets/models/2.0/model-index.json', false, undefined, '', 'BoomBox', 'doge2');">
+<body onload="viewer = gltf_rv.gltf_rv('canvas', 'assets/models/2.0/model-index.json', false, undefined, '', 'BoomBox', 'doge2');">
     <div id="gltf-rv-model-spinner"> </div>
     <canvas id="canvas">No Canvas!</canvas>
 </body>

diff --git a/index_field.html b/index_field.html
@@ -14,44 +14,14 @@
     <link rel="icon" href="assets/images/gltf.png">
 
     <script src="libs/dat.gui.min.js"></script>
-    <script src="libs/gl-matrix-min.js"></script>
     <script src="libs/axios.min.js"></script>
     <script src="libs/stats.min.js"></script>
-    <script src="libs/hdrpng.js"></script>
 
-    <script src="src/utils.js"></script>
-    <script src="src/rendering_parameters.js"></script>
-    <script src="src/glbParser.js"></script>
-    <script src="src/loader.js"></script>
-    <script src="src/image.js"></script>
-    <script src="src/texture.js"></script>
-    <script src="src/sampler.js"></script>
-    <script src="src/material.js"></script>
-    <script src="src/webgl.js"></script>
-    <script src="src/shader.js"></script>
-    <script src="src/shader_cache.js"></script>
-    <script src="src/camera.js"></script>
-    <script src="src/user_camera.js"></script>
-    <script src="src/light.js"></script>
-    <script src="src/primitive.js"></script>
-    <script src="src/buffer.js"></script>
-    <script src="src/buffer_view.js"></script>
-    <script src="src/accessor.js"></script>
-    <script src="src/mesh.js"></script>
-    <script src="src/node.js"></script>
-    <script src="src/scene.js"></script>
-    <script src="src/gltf.js"></script>
-    <script src="src/user_interface.js"></script>
-    <script src="src/model_path_provider.js"></script>
-    <script src="src/image_processor.js"></script>
-
-    <script src="src/viewer.js"></script>
-    <script src="src/renderer.js"></script>
-    <script src="src/main.js"></script>
+    <script src="dist/gltf-reference-viewer.umd.js"></script>
 </head>
 
 <!-- Just create a rendering canvas like below and call gltf_rv! -->
-<body onload="viewer = gltf_rv('canvas', 'assets/models/2.0/model-index.json', false, undefined, '', 'BoomBox', 'field');">
+<body onload="viewer = gltf_rv.gltf_rv('canvas', 'assets/models/2.0/model-index.json', false, undefined, '', 'BoomBox', 'field');">
     <div id="gltf-rv-model-spinner"> </div>
     <canvas id="canvas">No Canvas!</canvas>
 </body>