From 3d91e190de1d8e2138efd17ee588ff0ec58d9c21 Mon Sep 17 00:00:00 2001 From: Ed Mackey Date: Mon, 5 Jun 2017 10:00:14 -0400 Subject: [PATCH 1/3] Update MIME type for glb files, and fix an eslint warning. --- server.js | 5 ++--- web.config | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/server.js b/server.js index 99db4c78ef51..8ce9725e8996 100644 --- 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 index 78ae51dd8fce..5adcfa772328 100644 --- a/web.config +++ b/web.config @@ -9,9 +9,9 @@ - + - + From e89b942e3b4250bcd29c5d4643d991aa5fa8536d Mon Sep 17 00:00:00 2001 From: Ed Mackey Date: Mon, 5 Jun 2017 14:30:34 -0400 Subject: [PATCH 2/3] Update default model accept header. --- Source/Scene/Model.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Scene/Model.js b/Source/Scene/Model.js index 56c96a28e101..6780afde6ec6 100644 --- 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_SPEC: Figure out correct mime types (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(); From a3e0e91411e7eceee607d769ce378e04590066e1 Mon Sep 17 00:00:00 2001 From: Ed Mackey Date: Tue, 6 Jun 2017 10:38:33 -0400 Subject: [PATCH 3/3] Tweak comment, and update CHANGES.md --- CHANGES.md | 3 ++- Source/Scene/Model.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 8eb64f656a97..0fc81b7df66f 100644 --- 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) * Added Sandcastle demo for ArcticDEM data. [#5224](https://github.com/AnalyticalGraphicsInc/cesium/issues/5224) ### 1.34 - 2017-06-01 diff --git a/Source/Scene/Model.js b/Source/Scene/Model.js index 6780afde6ec6..065408ca19fd 100644 --- a/Source/Scene/Model.js +++ b/Source/Scene/Model.js @@ -154,7 +154,7 @@ define([ FAILED : 3 }; - // GLTF_SPEC: Figure out correct mime types (https://github.com/KhronosGroup/glTF/issues/412 and https://github.com/KhronosGroup/glTF/issues/943) + // 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() {