Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add clearer error message #6405

Merged
merged 4 commits into from
Apr 2, 2018
Merged

Add clearer error message #6405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee302bc
Add clearer error message
ggetz Apr 2, 2018
0be4188
Error message wording
ggetz Apr 2, 2018
cd87631
Update CHANGES.md
ggetz Apr 2, 2018
eb48534
Runtime error
Apr 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 6 additions & 0 deletions Source/Scene/DracoLoader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ define([
'../Core/ComponentDatatype',
'../Core/defined',
'../Core/FeatureDetection',
'../Core/RuntimeError',
'../Core/TaskProcessor',
'../Renderer/Buffer',
'../Renderer/BufferUsage',
Expand All @@ -13,6 +14,7 @@ define([
ComponentDatatype,
defined,
FeatureDetection,
RuntimeError,
TaskProcessor,
Buffer,
BufferUsage,
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Source/Scene/Model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down