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

Fixed Hidden Point Primitive Bug #8054

Merged
merged 6 commits into from
Aug 16, 2019
Merged

Fixed Hidden Point Primitive Bug #8054

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
453b3ff
Fixed Hidden Point Primitive Bug
ProjectBarks Aug 13, 2019
6e143a6
Update CHANGES.md & CONTRIBUTORS.md
ProjectBarks Aug 13, 2019
dd35bd7
Zero point size and position for point primitive
ProjectBarks Aug 13, 2019
a7214ed
Update contributors
ProjectBarks Aug 14, 2019
3267f8e
Merge branch 'master' into hidden-point-primitive-fix
ProjectBarks Aug 15, 2019
e1ad91a
Merge branch 'master' into hidden-point-primitive-fix
mramato Aug 16, 2019
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
3 changes: 2 additions & 1 deletion CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ Change Log
* Added optional `index` parameter to `PrimitiveCollection.add`. [#8041](https://github.com/AnalyticalGraphicsInc/cesium/pull/8041)

##### Fixes :wrench:
* Disabled HDR by default to improve visual quality in most standard use cases. Set `viewer.scene.highDynamicRange = true` to re-enable. [#7966](https://github.com/AnalyticalGraphicsInc/cesium/issues/7966)
* Fixed a bug that causes hidden point primitives to still appear on some operating systems. [#8043](https://github.com/AnalyticalGraphicsInc/cesium/issues/8043)
* Disabled HDR by default to improve visual quality in most standard use cases. Set `viewer.scene.highDynamicRange = true` to re-enable it. [#7966](https://github.com/AnalyticalGraphicsInc/cesium/issues/7966)
* Fixed issue where KTX or CRN files would not be properly identified. [#7979](https://github.com/AnalyticalGraphicsInc/cesium/issues/7979)

### 1.60 - 2019-08-01
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to Cesiu
* [Hannah Pinkos](https://github.com/hpinkos)
* [Kangning Li](https://github.com/likangning93)
* [Sean Lilley](https://github.com/lilleyse)
* [Brandon Barker](https://github.com/ProjectBarks)
* [Matthew Amato](https://github.com/mramato)
* [Brandon Barker](https://github.com/ProjectBarks)

## [Individual CLA](Documentation/Contributors/CLAs/individual-contributor-license-agreement-v1.0.pdf)
* [Victor Berchet](https://github.com/vicb)
Expand Down
8 changes: 4 additions & 4 deletions Source/Shaders/PointPrimitiveCollectionVS.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ void main()

vec4 p = czm_translateRelativeToEye(positionHigh, positionLow);
vec4 positionEC = czm_modelViewRelativeToEye * p;
positionEC.xyz *= show;

///////////////////////////////////////////////////////////////////////////

Expand Down Expand Up @@ -167,13 +166,14 @@ void main()
#endif

v_color = color;
v_color.a *= translucency;
v_color.a *= translucency * show;
v_outlineColor = outlineColor;
v_outlineColor.a *= translucency;
v_outlineColor.a *= translucency * show;

v_innerPercent = 1.0 - outlinePercent;
v_pixelDistance = 2.0 / totalSize;
gl_PointSize = totalSize;
gl_PointSize = totalSize * show;
gl_Position *= show;

v_pickColor = pickColor;
}