diff --git a/CHANGES.md b/CHANGES.md index c1ff6d39b89b..f5ab92e39f2a 100644 --- 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 index d7b71a0d8b3e..2951bbcb862c 100644 --- 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 index ac7b387aa1e3..57c931ef4b53 100644 --- a/Source/Scene/Model.js +++ b/Source/Scene/Model.js @@ -248,7 +248,7 @@ define([ *