Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a bunch of weird entity show problems #6835

Merged
merged 2 commits into from
Jul 25, 2018
+15 −14
Merged

Fix a bunch of weird entity show problems #6835

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d11d0f
fix a bunch of weird entity problems
Jul 24, 2018
826514a
CHANGES.md
Jul 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.md
View file
Original file line number Diff line number Diff line change
@@ -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)
6 changes: 3 additions & 3 deletions Source/DataSources/StaticGeometryColorBatch.js
View file
Original file line number Diff line number Diff line change
@@ -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;
}
}
}
6 changes: 3 additions & 3 deletions Source/DataSources/StaticGeometryPerMaterialBatch.js
View file
Original file line number Diff line number Diff line change
@@ -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;
}
}
}
4 changes: 2 additions & 2 deletions Source/DataSources/StaticGroundGeometryColorBatch.js
View file
Original file line number Diff line number Diff line change
@@ -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;
}
}
}
4 changes: 2 additions & 2 deletions Source/DataSources/StaticGroundGeometryPerMaterialBatch.js
View file
Original file line number Diff line number Diff line change
@@ -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;
}
}
}
4 changes: 2 additions & 2 deletions Source/DataSources/StaticGroundPolylinePerMaterialBatch.js
View file
Original file line number Diff line number Diff line change
@@ -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;
}
}
}
4 changes: 2 additions & 2 deletions Source/DataSources/StaticOutlineGeometryBatch.js
View file
Original file line number Diff line number Diff line change
@@ -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;
}
}
}