Merge pull request #6405 from AnalyticalGraphicsInc/draco-check-ie

Add clearer error message
CesiumGS · Apr 2, 2018 · df71a53 · df71a53
2 parents 3802acf + eb48534
commit df71a53
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -20,6 +20,7 @@ Change Log
 * Fix Cesium ion browser caching [#6353](https://github.com/AnalyticalGraphicsInc/cesium/pull/6353).
 * Added support for glTF models with [Draco geometry compression](https://github.com/fanzhanggoogle/glTF/blob/KHR_mesh_compression/extensions/Khronos/KHR_draco_mesh_compression/README.md).
   * Added `dequantizeInShader` option parameter to `Model` and `Model.fromGltf` to specify if Draco compressed glTF assets should be dequantized on the GPU.
+  * Decoding is currently not supported in Internet Explorer, adding support is planned [#6404](https://github.com/AnalyticalGraphicsInc/cesium/issues/6404).
 * `ClippingPlaneCollection` updates [#6201](https://github.com/AnalyticalGraphicsInc/cesium/pull/6201)
   * Removed the 6-clipping-plane limit.
   * Added support for Internet Explorer.

diff --git a/Source/Scene/DracoLoader.js b/Source/Scene/DracoLoader.js
@@ -3,6 +3,7 @@ define([
         '../Core/ComponentDatatype',
         '../Core/defined',
         '../Core/FeatureDetection',
+        '../Core/RuntimeError',
         '../Core/TaskProcessor',
         '../Renderer/Buffer',
         '../Renderer/BufferUsage',
@@ -13,6 +14,7 @@ define([
         ComponentDatatype,
         defined,
         FeatureDetection,
+        RuntimeError,
         TaskProcessor,
         Buffer,
         BufferUsage,
@@ -177,6 +179,10 @@ define([
             return when.resolve();
         }
 
+        if (FeatureDetection.isInternetExplorer()) {
+            return when.reject(new RuntimeError('Draco decoding is not currently supported in Internet Explorer.'));
+        }
+
         var loadResources = model._loadResources;
         if (loadResources.primitivesToDecode.length === 0) {
             // No more tasks to schedule

diff --git a/Source/Scene/Model.js b/Source/Scene/Model.js
@@ -248,7 +248,7 @@ define([
      * </li><li>
      * {@link https://github.com/KhronosGroup/glTF/blob/master/extensions/1.0/Vendor/WEB3D_quantized_attributes/README.md|WEB3D_quantized_attributes}
      * </li><li>
-     * {@link https://github.com/KhronosGroup/glTF/blob/master/extensions/2.0/Khronos/KHR_draco_mesh_compression/README.md|KHR_draco_mesh_compression}
+     * {@link https://github.com/KhronosGroup/glTF/blob/master/extensions/2.0/Khronos/KHR_draco_mesh_compression/README.md|KHR_draco_mesh_compression} (Not supported in Internet Explorer)
      * </li>
      * </ul>
      * </p>
@@ -1096,7 +1096,7 @@ define([
      * </li><li>
      * {@link https://github.com/KhronosGroup/glTF/blob/master/extensions/1.0/Vendor/WEB3D_quantized_attributes/README.md|WEB3D_quantized_attributes}
      * </li><li>
-     * {@link https://github.com/KhronosGroup/glTF/blob/master/extensions/2.0/Khronos/KHR_draco_mesh_compression/README.md|KHR_draco_mesh_compression}
+     * {@link https://github.com/KhronosGroup/glTF/blob/master/extensions/2.0/Khronos/KHR_draco_mesh_compression/README.md|KHR_draco_mesh_compression} (Not supported in Internet Explorer)
      * </li>
      * </ul>
      * </p>