From 85dceae91191cef71637b285711674c6cac70b61 Mon Sep 17 00:00:00 2001 From: Sean Lilley Date: Wed, 6 Jun 2018 21:34:37 -0400 Subject: [PATCH 1/3] Fix uint32 BATCH_ID --- Source/Scene/PointCloud3DTileContent.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/Scene/PointCloud3DTileContent.js b/Source/Scene/PointCloud3DTileContent.js index 69399320687e..4bb1850225ae 100644 --- a/Source/Scene/PointCloud3DTileContent.js +++ b/Source/Scene/PointCloud3DTileContent.js @@ -374,7 +374,10 @@ define([ var batchIds; if (defined(featureTableJson.BATCH_ID)) { batchIds = featureTable.getPropertyArray('BATCH_ID', ComponentDatatype.UNSIGNED_SHORT, 1); - + if (ComponentDatatype.fromTypedArray(batchIds) === ComponentDatatype.UNSIGNED_INT) { + // WebGL does not support UNSIGNED_INT vertex attributes. Convert these to FLOAT. + batchIds = new Float32Array(batchIds); + } var batchLength = featureTable.getGlobalProperty('BATCH_LENGTH'); if (!defined(batchLength)) { throw new RuntimeError('Global property: BATCH_LENGTH must be defined when BATCH_ID is defined.'); From bd5e320108b38dabeb38a604ee4be6b7eb6a9a19 Mon Sep 17 00:00:00 2001 From: Sean Lilley Date: Wed, 6 Jun 2018 21:41:41 -0400 Subject: [PATCH 2/3] Updated CHANGES.md --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index bb1826a35bc4..91e9fd38705f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,6 +9,7 @@ Change Log ##### Fixes :wrench: * Fixed a bug causing crashes with custom vertex attributes on `Geometry` crossing the IDL. Attributes will be barycentrically interpolated. [#6644](https://github.com/AnalyticalGraphicsInc/cesium/pull/6644) +* Fixed a bug causing Point Cloud tiles with unsigned int batch-ids to not load. [#6664](https://github.com/AnalyticalGraphicsInc/cesium/pull/6664) ### 1.46.1 - 2018-06-01 From 6c038ad3df988da21901872c19768c76a01533db Mon Sep 17 00:00:00 2001 From: Sean Lilley Date: Wed, 6 Jun 2018 21:42:45 -0400 Subject: [PATCH 3/3] Update CHANGES.md --- CHANGES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 91e9fd38705f..b05e337de856 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -9,7 +9,7 @@ Change Log ##### Fixes :wrench: * Fixed a bug causing crashes with custom vertex attributes on `Geometry` crossing the IDL. Attributes will be barycentrically interpolated. [#6644](https://github.com/AnalyticalGraphicsInc/cesium/pull/6644) -* Fixed a bug causing Point Cloud tiles with unsigned int batch-ids to not load. [#6664](https://github.com/AnalyticalGraphicsInc/cesium/pull/6664) +* Fixed a bug causing Point Cloud tiles with unsigned int batch-ids to not load. [#6666](https://github.com/AnalyticalGraphicsInc/cesium/pull/6666) ### 1.46.1 - 2018-06-01