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

Jump to bottom

Update MIME type for glb files #5420

Merged
merged 5 commits into from
Jun 9, 2017
Merged

Update MIME type for glb files #5420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3d91e19
Update MIME type for glb files, and fix an eslint warning.
emackey Jun 5, 2017
e89b942
Update default model accept header.
emackey Jun 5, 2017
37b63d5
Merge remote-tracking branch 'origin/master' into glb-mime-type
emackey Jun 6, 2017
a3e0e91
Tweak comment, and update CHANGES.md
emackey Jun 6, 2017
ccc94b3
Merge remote-tracking branch 'origin/master' into glb-mime-type
emackey Jun 9, 2017
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
3 changes: 2 additions & 1 deletion CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ Change Log
### 1.35 - 2017-07-05

* Deprecated
* `GoogleEarthImageryProvider` has been deprecated and will be removed in Cesium 1.37, use `GoogleEarthEnterpriseMapsProvider` instead.
* `GoogleEarthImageryProvider` has been deprecated and will be removed in Cesium 1.37, use `GoogleEarthEnterpriseMapsProvider` instead.
* Fixed bug where if polylines were set to follow the surface of an undefined globe, Cesium would crash [#5413] https://github.com/AnalyticalGraphicsInc/cesium/pull/5413
* Fixed a bug where picking clusters would return undefined instead of a list of the clustered entities. [#5286](https://github.com/AnalyticalGraphicsInc/cesium/issues/5286)
* Reduced the amount of Sun bloom post-process effect near the horizon. [#5381](https://github.com/AnalyticalGraphicsInc/cesium/issues/5381)
* Updated glTF/glb MIME types. [#5420](https://github.com/AnalyticalGraphicsInc/cesium/issues/5420)
* Fixed a bug where camera zooming worked incorrectly when the display height was greater than the display width [#5421] (https://github.com/AnalyticalGraphicsInc/cesium/pull/5421)
* Added Sandcastle demo for ArcticDEM data. [#5224](https://github.com/AnalyticalGraphicsInc/cesium/issues/5224)
* `CzmlDataSource` and `KmlDataSource` load functions now take an optional `query` object, which will append query parameters to all network requests. [#5419](https://github.com/AnalyticalGraphicsInc/cesium/pull/5419), [#5434](https://github.com/AnalyticalGraphicsInc/cesium/pull/5434)
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 @@ -154,8 +154,8 @@ define([
FAILED : 3
};

// GLTF_SPEC: Figure out correct mime types (https://github.com/KhronosGroup/glTF/issues/412)
var defaultModelAccept = 'model/vnd.gltf.binary,model/vnd.gltf+json,model/gltf.binary,model/gltf+json;q=0.8,application/json;q=0.2,*/*;q=0.01';
// glTF MIME types discussed in https://github.com/KhronosGroup/glTF/issues/412 and https://github.com/KhronosGroup/glTF/issues/943
var defaultModelAccept = 'model/gltf-binary,model/gltf+json;q=0.8,application/json;q=0.2,*/*;q=0.01';

function LoadResources() {
this.vertexBuffersToCreate = new Queue();
Expand Down
5 changes: 2 additions & 3 deletions server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/*eslint-env node*/
'use strict';
(function() {
'use strict';

var express = require('express');
var compression = require('compression');
var url = require('url');
Expand Down Expand Up @@ -43,7 +42,7 @@
'image/crn' : ['crn'],
'image/ktx' : ['ktx'],
'model/gltf+json' : ['gltf'],
'model/gltf.binary' : ['bgltf', 'glb'],
'model/gltf-binary' : ['bgltf', 'glb'],
'text/plain' : ['glsl']
});

Expand Down
4 changes: 2 additions & 2 deletions web.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<remove fileExtension=".gltf" />
<mimeMap fileExtension=".gltf" mimeType="model/gltf+json" />
<remove fileExtension=".bgltf" />
<mimeMap fileExtension=".bgltf" mimeType="model/gltf.binary" />
<mimeMap fileExtension=".bgltf" mimeType="model/gltf-binary" />
<remove fileExtension=".glb" />
<mimeMap fileExtension=".glb" mimeType="model/gltf.binary" />
<mimeMap fileExtension=".glb" mimeType="model/gltf-binary" />
<remove fileExtension=".json" />
<mimeMap fileExtension=".json" mimeType="application/json" />
<remove fileExtension=".geojson" />
Expand Down