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.

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

Globe show skirts option #8489

Merged
merged 25 commits into from
Jan 6, 2020
Merged
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
1db6aff
Added terrain skirts
lilleyse Dec 17, 2019
2943bfb
Reorder heightmap terrain skirt indices
lilleyse Dec 18, 2019
01854af
Doc edit [skip ci]
lilleyse Dec 19, 2019
807f961
Move skirtIndex and vertexCountWithoutSkirts to TerrainMesh
lilleyse Dec 20, 2019
eae6437
Cleanup
lilleyse Dec 20, 2019
7a23ad3
Implement caching for new function
lilleyse Dec 20, 2019
bc6016e
Rename skirtIndex to indexCountWithoutSkirts
lilleyse Dec 20, 2019
ed185e6
Merge branch 'master' into show-skirts
lilleyse Dec 20, 2019
e12ee3a
Added globe test
lilleyse Dec 20, 2019
e3f5237
Cleanup
lilleyse Dec 20, 2019
ec75210
Merge branch 'master' into show-skirts
lilleyse Dec 20, 2019
4b5e25e
Fix when skirtHeight is 0.0
lilleyse Dec 20, 2019
ee3b739
Improve comments [skip ci]
lilleyse Dec 20, 2019
7448a11
Fix HeightmapTessellatorSpec
lilleyse Dec 20, 2019
036c78c
Cleanup
lilleyse Dec 21, 2019
e17ebf4
Compute min/max height without skirt
lilleyse Dec 21, 2019
33e35d7
Add back face culling and skirts to terrain clipping demo
lilleyse Dec 21, 2019
88d6d85
Update CHANGES.md [skip ci]
lilleyse Dec 22, 2019
9a7a392
Update cartographic limit rectangle example
lilleyse Dec 25, 2019
e3a7d68
Updated CHANGES.md
lilleyse Dec 30, 2019
ebea106
Merge branch 'master' into show-skirts
lilleyse Dec 30, 2019
8de5e6f
restructured skirt logic in HeightmapTessellator and other minor chan…
IanLilleyT Dec 31, 2019
8805276
Merge branch 'master' into show-skirts
IanLilleyT Dec 31, 2019
dfd3462
Update CHANGES.md [skip ci]
lilleyse Jan 2, 2020
3dfd484
Merge branch 'master' into show-skirts
IanLilleyT Jan 6, 2020
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
2 changes: 1 addition & 1 deletion Source/Core/HeightmapTessellator.js
Original file line number Diff line number Diff line change
@@ -235,7 +235,7 @@ import WebMercatorProjection from './WebMercatorProjection.js';
var hMin = Number.POSITIVE_INFINITY;

var gridVertexCount = width * height;
var edgeVertexCount = width * 2 + height * 2;
var edgeVertexCount = skirtHeight > 0.0 ? (width * 2 + height * 2) : 0;
var vertexCount = gridVertexCount + edgeVertexCount;

var positions = new Array(vertexCount);