From 809fa27f91fd8f387884cdc74b619cc802449325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florent=20Cayr=C3=A9?= Date: Fri, 25 Aug 2017 11:59:14 +0200 Subject: [PATCH 1/4] Fix PolylineCollection indices arrays (#5538) A 64K buffer limit overflow test was wrong, leading to out-of range vertice indices. --- Source/Scene/PolylineCollection.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Scene/PolylineCollection.js b/Source/Scene/PolylineCollection.js index c35652348eba..c8149202879a 100644 --- a/Source/Scene/PolylineCollection.js +++ b/Source/Scene/PolylineCollection.js @@ -1457,7 +1457,7 @@ define([ for ( var j = 0; j < numberOfSegments; ++j) { var segmentLength = segments[j] - 1.0; for ( var k = 0; k < segmentLength; ++k) { - if (indicesCount + 4 >= CesiumMath.SIXTY_FOUR_KILOBYTES - 2) { + if (indicesCount + 4 > CesiumMath.SIXTY_FOUR_KILOBYTES) { polyline._locatorBuckets.push({ locator : bucketLocator, count : segmentIndexCount @@ -1489,7 +1489,7 @@ define([ count : segmentIndexCount }); - if (indicesCount + 4 >= CesiumMath.SIXTY_FOUR_KILOBYTES - 2) { + if (indicesCount + 4 > CesiumMath.SIXTY_FOUR_KILOBYTES) { vertexBufferOffset.push(0); indices = []; totalIndices.push(indices); From 81f8a42d064b496056bca222061017a3dd58a39f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florent=20Cayr=C3=A9?= Date: Fri, 25 Aug 2017 14:32:05 +0200 Subject: [PATCH 2/4] Added fcayre as a contributor --- CONTRIBUTORS.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 089f762d9b52..a7edd86e3f82 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -152,4 +152,5 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu * [Rishabh Shah](https://github.com/rms13) * [Rudraksha Shah](https://github.com/Rudraksha20) * [Cody Guldner](https://github.com/burn123) +* [Florent Cayré](https://github.com/fcayre) From 10636bcb32cb0f1e00bdde8c17a3936b50c77267 Mon Sep 17 00:00:00 2001 From: fcayre Date: Mon, 25 Sep 2017 09:21:52 +0200 Subject: [PATCH 3/4] Add Logilab to corporate contributors --- CONTRIBUTORS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index a7edd86e3f82..f1baf4e5bd31 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -86,6 +86,8 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu * [Jason Crow](https://github.com/jason-crow) * [Flightradar24 AB](https://www.flightradar24.com) * [Aleksei Kalmykov](https://github.com/kalmykov) +* [Logilab](https://www.logilab.fr/) + * [Florent Cayré](https://github.com/fcayre/) ## [Individual CLA](Documentation/Contributors/CLAs/individual-cla-agi-v1.0.txt) * [Victor Berchet](https://github.com/vicb) From 246969bd40f6b1a79d36183a4e85c87184856be5 Mon Sep 17 00:00:00 2001 From: fcayre Date: Tue, 26 Sep 2017 13:25:09 +0200 Subject: [PATCH 4/4] Updated CHANGES.md for #5538 and pull #5782 --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 6a04cd71c154..594ad6939969 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,7 @@ Change Log * Added ability to add an animation to `ModelAnimationCollection` by its index. [#5815](https://github.com/AnalyticalGraphicsInc/cesium/pull/5815) * Fixed a bug in `ModelAnimationCollection` that caused adding an animation by its name to throw an error. [#5815](https://github.com/AnalyticalGraphicsInc/cesium/pull/5815) * Zoom about mouse now maintains camera heading, pitch, and roll [#4639](https://github.com/AnalyticalGraphicsInc/cesium/pull/5603) +* Fixed a bug in `PolylineCollection` preventing the display of more than 16K points in a single collection [#5538](https://github.com/AnalyticalGraphicsInc/cesium/pull/5782) ### 1.37 - 2017-09-01