Merge pull request #5420 from AnalyticalGraphicsInc/glb-mime-type

Update MIME type for glb files
CesiumGS · Jun 9, 2017 · 6dad54e · 6dad54e
2 parents 1b92f28 + ccc94b3
commit 6dad54e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -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)

diff --git a/Source/Scene/Model.js b/Source/Scene/Model.js
@@ -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();

diff --git a/server.js b/server.js
@@ -1,7 +1,6 @@
 /*eslint-env node*/
+'use strict';
 (function() {
-    'use strict';
-
     var express = require('express');
     var compression = require('compression');
     var url = require('url');
@@ -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']
     });
 

diff --git a/web.config b/web.config
@@ -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" />