Skip to content
New issue

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

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

Already on GitHub? # to your account

Add Material Support to Globe #5919

Merged
merged 35 commits into from
Nov 25, 2017
Merged
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
24ff46b
Added material support to the globe
jasonbeverage Oct 20, 2017
4e3ae37
Removed SlopeMaterial shader in favor of the SlopeRampMaterial which …
jasonbeverage Oct 20, 2017
6c2d17c
Got rid of multiple enableLighting calls
jasonbeverage Oct 20, 2017
ce71917
Unsetting uniformMap if there is no material
jasonbeverage Oct 20, 2017
a2152cc
Updated CHANGES.md
jasonbeverage Oct 20, 2017
5139bad
Updated CHANGES.md with PR reference
jasonbeverage Oct 20, 2017
29d4ae2
Fix eslint warning
jasonbeverage Oct 20, 2017
11325f2
Merge remote-tracking branch 'upstream/master' into globematerials
jasonbeverage Oct 20, 2017
9b7f7d9
Merge branch 'master' into globematerials
jasonbeverage Nov 1, 2017
60c0121
Style tweaks
lilleyse Nov 3, 2017
46d1a17
Merge branch 'master' into globematerials
lilleyse Nov 3, 2017
3ba02db
Merge branch 'master' into globematerials
lilleyse Nov 3, 2017
cbcaea1
Setting initial time in Globe Materials demo to make lighting look de…
jasonbeverage Nov 13, 2017
cff763d
Using defined to check for material in Globe
jasonbeverage Nov 13, 2017
5c619a9
Using defined to check for uniformMap
jasonbeverage Nov 13, 2017
7493d7c
Wrapping slope and height and globe shaders with APPLY_MATERIAL ifdef.
jasonbeverage Nov 13, 2017
5e4aab6
Renamed minHeight/maxHeight => minimumHeight/maximumHeight in Elevati…
jasonbeverage Nov 13, 2017
c045a6c
Added lineThickness uniform to ElevationContourMaterial
jasonbeverage Nov 13, 2017
8f4a8a1
fancy sandcastle demo
Nov 17, 2017
e8f9b04
Removed trailing whitespace to fix travis
jasonbeverage Nov 21, 2017
8ca9ac9
Changed link in CHANGES.md to Globe Material sandcastle demo
jasonbeverage Nov 25, 2017
0697c45
Changed dirtyShaders to makeShadersDirty and made it a file level fun…
jasonbeverage Nov 25, 2017
83dedf0
Remove comment
jasonbeverage Nov 25, 2017
a5fd43f
Formatting
jasonbeverage Nov 25, 2017
e469dd7
Renamed lineThickness to width for ElevationContourMaterial
jasonbeverage Nov 25, 2017
560caa5
Clarification of height in materialInput
jasonbeverage Nov 25, 2017
cc77f3a
Commenting slope in materialInput
jasonbeverage Nov 25, 2017
8c30e90
Not normalizing v_normalMC in GlobeVS.glsl
jasonbeverage Nov 25, 2017
5bd104f
Not reading varying values in GlobeVS
jasonbeverage Nov 25, 2017
a71d73a
Changed default viewpoint of GlobeMaterials to the Himalayas
jasonbeverage Nov 25, 2017
b42d079
Added unit tests for rendering a globe with materials
jasonbeverage Nov 25, 2017
0264ab1
Added sets material test for Globe
jasonbeverage Nov 25, 2017
8eb3bd4
Tweak CHANGES.md
pjcozzi Nov 25, 2017
217ce3a
Whitespace
pjcozzi Nov 25, 2017
fc88b02
Default Globe Material Sandcastle example to elevation shading
pjcozzi Nov 25, 2017
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/Shaders/Builtin/Structs/materialInput.glsl
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
* @property {mat3} tangentToEyeMatrix Matrix for converting a tangent space normal to eye space.
* @property {vec3} positionToEyeEC Vector from the fragment to the eye in eye coordinates. The magnitude is the distance in meters from the fragment to the eye.
* @property {float} height The height of the terrain in meters above or below the WGS84 ellipsoid. Only available for globe materials.
* @property {float} slope The slope of the terrain normalized from 0 to 1. Only available for globe materials.
* @property {float} slope The slope of the terrain normalized from 0 to 1. 0 is completely vertical, 1 is completely flat. Only available for globe materials.
*/
struct czm_materialInput
{