From 6d11d0fdf5c8e4474a46d7d7665d2a6527df8263 Mon Sep 17 00:00:00 2001 From: hpinkos Date: Tue, 24 Jul 2018 13:29:14 -0400 Subject: [PATCH 1/2] fix a bunch of weird entity problems --- Source/DataSources/StaticGeometryColorBatch.js | 6 +++--- Source/DataSources/StaticGeometryPerMaterialBatch.js | 6 +++--- Source/DataSources/StaticGroundGeometryColorBatch.js | 4 ++-- Source/DataSources/StaticGroundGeometryPerMaterialBatch.js | 4 ++-- Source/DataSources/StaticGroundPolylinePerMaterialBatch.js | 4 ++-- Source/DataSources/StaticOutlineGeometryBatch.js | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Source/DataSources/StaticGeometryColorBatch.js b/Source/DataSources/StaticGeometryColorBatch.js index 7f87f7a1f69..9296b520d4a 100644 --- a/Source/DataSources/StaticGeometryColorBatch.js +++ b/Source/DataSources/StaticGeometryColorBatch.js @@ -139,13 +139,13 @@ define([ if (defined(attributes)) { if (defined(originalAttributes.show)) { - originalAttributes.show.value = attributes.show; + attributes.show = originalAttributes.show.value; } if (defined(originalAttributes.color)) { - originalAttributes.color.value = attributes.color; + attributes.color = originalAttributes.color.value; } if (defined(originalAttributes.depthFailColor)) { - originalAttributes.depthFailColor.value = attributes.depthFailColor; + attributes.depthFailColor = originalAttributes.depthFailColor.value; } } } diff --git a/Source/DataSources/StaticGeometryPerMaterialBatch.js b/Source/DataSources/StaticGeometryPerMaterialBatch.js index 0fd9eed26e2..c11ba307793 100644 --- a/Source/DataSources/StaticGeometryPerMaterialBatch.js +++ b/Source/DataSources/StaticGeometryPerMaterialBatch.js @@ -136,13 +136,13 @@ define([ if (defined(attributes)) { if (defined(originalAttributes.show)) { - originalAttributes.show.value = attributes.show; + attributes.show = originalAttributes.show.value; } if (defined(originalAttributes.color)) { - originalAttributes.color.value = attributes.color; + attributes.color = originalAttributes.color.value; } if (defined(originalAttributes.depthFailColor)) { - originalAttributes.depthFailColor.value = attributes.depthFailColor; + attributes.depthFailColor = originalAttributes.depthFailColor.value; } } } diff --git a/Source/DataSources/StaticGroundGeometryColorBatch.js b/Source/DataSources/StaticGroundGeometryColorBatch.js index f6cde3b3a27..8c4ca9e648b 100644 --- a/Source/DataSources/StaticGroundGeometryColorBatch.js +++ b/Source/DataSources/StaticGroundGeometryColorBatch.js @@ -106,10 +106,10 @@ define([ if (defined(attributes)) { if (defined(originalAttributes.show)) { - originalAttributes.show.value = attributes.show; + attributes.show = originalAttributes.show.value; } if (defined(originalAttributes.color)) { - originalAttributes.color.value = attributes.color; + attributes.color = originalAttributes.color.value; } } } diff --git a/Source/DataSources/StaticGroundGeometryPerMaterialBatch.js b/Source/DataSources/StaticGroundGeometryPerMaterialBatch.js index 7db3d742a34..889aeb9ea29 100644 --- a/Source/DataSources/StaticGroundGeometryPerMaterialBatch.js +++ b/Source/DataSources/StaticGroundGeometryPerMaterialBatch.js @@ -140,10 +140,10 @@ define([ if (defined(attributes)) { if (defined(originalAttributes.show)) { - originalAttributes.show.value = attributes.show; + attributes.show = originalAttributes.show.value; } if (defined(originalAttributes.color)) { - originalAttributes.color.value = attributes.color; + attributes.color = originalAttributes.color.value; } } } diff --git a/Source/DataSources/StaticGroundPolylinePerMaterialBatch.js b/Source/DataSources/StaticGroundPolylinePerMaterialBatch.js index af3e4dfafe1..c3da5fdcae1 100644 --- a/Source/DataSources/StaticGroundPolylinePerMaterialBatch.js +++ b/Source/DataSources/StaticGroundPolylinePerMaterialBatch.js @@ -134,10 +134,10 @@ define([ if (defined(attributes)) { if (defined(originalAttributes.show)) { - originalAttributes.show.value = attributes.show; + attributes.show = originalAttributes.show.value; } if (defined(originalAttributes.color)) { - originalAttributes.color.value = attributes.color; + attributes.color = originalAttributes.color.value; } } } diff --git a/Source/DataSources/StaticOutlineGeometryBatch.js b/Source/DataSources/StaticOutlineGeometryBatch.js index def326371c7..635e048437c 100644 --- a/Source/DataSources/StaticOutlineGeometryBatch.js +++ b/Source/DataSources/StaticOutlineGeometryBatch.js @@ -109,10 +109,10 @@ define([ if (defined(attributes)) { if (defined(originalAttributes.show)) { - originalAttributes.show.value = attributes.show; + attributes.show = originalAttributes.show.value; } if (defined(originalAttributes.color)) { - originalAttributes.color.value = attributes.color; + attributes.color = originalAttributes.color.value; } } } From 826514a892b7b62245b9b32dec7131d9b45b01b5 Mon Sep 17 00:00:00 2001 From: hpinkos Date: Tue, 24 Jul 2018 13:33:52 -0400 Subject: [PATCH 2/2] CHANGES.md --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index c5323b39591..f3391554812 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -18,6 +18,7 @@ Change Log * Fixed `PolygonGeometry` when using `VertexFormat.POSITION_ONLY`, `perPositionHeight` and `extrudedHeight` [#6790](expect(https://github.com/AnalyticalGraphicsInc/cesium/pull/6790) * Fixed a bug that was preventing 3D Tilesets on the opposite side of the globe from being occluded [#6714](https://github.com/AnalyticalGraphicsInc/cesium/issues/6714) * Fixed a bug where 3D Tilesets using the `region` bounding volume don't get transformed when the tileset's `modelMatrix` changes. [#6755](https://github.com/AnalyticalGraphicsInc/cesium/pull/6755) +* Fixed issues related to updating entity show and geometry color [#6835](https://github.com/AnalyticalGraphicsInc/cesium/pull/6835) * Fixed `PolygonGeometry` and `EllipseGeometry` tangent and bitangent attributes when a texture rotation is used [#6788](https://github.com/AnalyticalGraphicsInc/cesium/pull/6788) * Fixed an issue where tiles were missing in VR mode. [#6612](https://github.com/AnalyticalGraphicsInc/cesium/issues/6612) * Fixed an issue where glTF 2.0 models sometimes wouldn't be centered in the view after putting the camera on them. [#6784](https://github.com/AnalyticalGraphicsInc/cesium/issues/6784)