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

Polyline Materials #578

Merged
merged 140 commits into from
Apr 11, 2013
Merged

Polyline Materials #578

Show file tree
Hide file tree
Changes from 129 commits
Commits
Show all changes
140 commits
Select commit Hold shift + click to select a range
bbafe3e
Render polylines in a single pass (no outline).
bagnell Feb 15, 2013
19cfc47
Start adding polyline width.
bagnell Feb 19, 2013
91120e6
Polyline width tweaks.
bagnell Feb 19, 2013
b7b9177
Displace polyline vertices in the vertex shader to add width.
bagnell Feb 20, 2013
5777de1
Merge branch 'master' into polylineMaterials
bagnell Feb 20, 2013
50ef16e
Tweak displacement magnitude in polyline vertex shader.
bagnell Feb 20, 2013
9e635ca
Fix polyline endpoints.
bagnell Feb 20, 2013
1c21139
Fix line flickering across the viewport.
bagnell Feb 20, 2013
712e347
Update buffers instead of creating new ones.
bagnell Feb 20, 2013
3e09b85
Tweak polyline position direction. Move function to convert from sphe…
bagnell Feb 21, 2013
ad35a79
Modify polyline vertex position in eye coordinates instead of window …
bagnell Feb 21, 2013
3fc3ce6
Add doc. Fix/add tests.
bagnell Feb 21, 2013
e4fa590
Start adding encoded colors to polylines. There is still an issue wit…
bagnell Feb 22, 2013
45a16fd
Merge branch 'master' into polylineMaterials
bagnell Feb 22, 2013
b63067b
A 32 bit floating point can only encode the 8 bits for the red, green…
bagnell Feb 22, 2013
959ae9f
Encode polyline color alphas separately.
bagnell Feb 22, 2013
c9105e6
Add another Color test.
bagnell Feb 22, 2013
6c090ee
Add per-vertex color and outline color to polylines.
bagnell Feb 22, 2013
f8eee70
Add a per-vertex color polyline example to the Sandcastle.
bagnell Feb 22, 2013
62570ef
Re-add polyline picking.
bagnell Feb 22, 2013
4497c01
Add polyline highlighting to the Sandcastle.
bagnell Feb 22, 2013
3ab92fb
Merge branch 'master' into polylineMaterials
bagnell Feb 25, 2013
7f20f75
Fix array indexing in color update.
bagnell Feb 25, 2013
58d82e1
Change polyline color when highlighting a polyline with per-vertex co…
bagnell Feb 25, 2013
d402f19
Start adding polyline materials.
bagnell Feb 25, 2013
8dafc6d
Merge branch 'master' into polylineMaterials
bagnell Feb 25, 2013
da1fa0e
Displace polyline vertices in screen space. Add outline example to th…
bagnell Feb 26, 2013
bd235f3
Add polyline glow material.
bagnell Feb 26, 2013
f31cf55
Update DynamicPathVisualizer and DynamicPolylineVisualizer.
bagnell Feb 26, 2013
4cd211d
Tweak glow material shader.
bagnell Feb 27, 2013
982e5d3
Tweak polyline VS and outline material shader. Remove unused function…
bagnell Feb 27, 2013
f6a1884
Fix polyline flicker caused by dividing by a number close to zero.
bagnell Feb 27, 2013
e21021d
Fix polyline outline material at the end points.
bagnell Feb 28, 2013
7c12b59
Fix polyline color update.
bagnell Feb 28, 2013
a705d27
Add anti-aliasing to polyline outline material.
bagnell Feb 28, 2013
7c9e2d1
Add anti-aliasing to the polyline glow material.
bagnell Feb 28, 2013
31c7c36
Merge branch 'master' into polylineMaterials
bagnell Feb 28, 2013
b6e2fd0
Make polyline glow brighter.
bagnell Feb 28, 2013
22e96ac
Start adding polyline arrow material.
bagnell Feb 28, 2013
1dd02c6
Tweak polyline arrow material.
bagnell Feb 28, 2013
c2842e8
Tweak polyline arrow shader.
bagnell Mar 1, 2013
efd3c51
Add anti-aliasing to polyline arrow material.
bagnell Mar 1, 2013
ca90e23
Merge branch 'master' into polylineMaterials
bagnell Mar 1, 2013
974873a
Start adding fade material.
bagnell Mar 1, 2013
ff7decc
Merge branch 'master' into polylineMaterials
bagnell Mar 1, 2013
9afd1f9
Do not request stencil buffer by default when creating a context or p…
bagnell Mar 2, 2013
dd1b6cc
Fix polyline flickering and vertex expansion at end points.
bagnell Mar 4, 2013
79d05d4
Tweak fade material.
bagnell Mar 4, 2013
6ea64b9
Change fade material to use fade in and out colors instead of alpha v…
bagnell Mar 4, 2013
c571aad
Tweak fade material lighting.
bagnell Mar 4, 2013
78f10ec
Enable standard derivatives extension in polyline arrow shader.
bagnell Mar 6, 2013
517e152
Modify polyline vertex shader to make triangles front facing.
bagnell Mar 6, 2013
c092829
Fix line expansion in 2D and Columbus view.
bagnell Mar 6, 2013
49f1e45
Merge branch 'master' into polylineMaterials
bagnell Mar 7, 2013
071a8ea
Merge branch 'master' into polylineMaterials
bagnell Mar 12, 2013
7f8e6db
Fix offscreen rendering artifact.
bagnell Mar 13, 2013
c6d0360
Merge branch 'master' into polylineMaterials
bagnell Mar 13, 2013
9490a25
Remove glow material.
bagnell Mar 14, 2013
bab3c9b
Clean up polyline.
bagnell Mar 14, 2013
5cf7d3b
Minor polyline collection clean up.
bagnell Mar 14, 2013
e89c947
Merge branch 'master' into polylineMaterials
bagnell Mar 14, 2013
a98a332
Merge branch 'master' into polylineMaterials
bagnell Mar 18, 2013
b39c8f7
Adjust polyline width in VS.
bagnell Mar 18, 2013
1998e9a
Sort polylines by material.
bagnell Mar 18, 2013
a538e34
Fix tests.
bagnell Mar 18, 2013
322bd2c
Fix more tests.
bagnell Mar 18, 2013
79f8db2
Some polyline collection clean up.
bagnell Mar 18, 2013
0a6b67f
Some minor clean up to the polyline collection.
bagnell Mar 19, 2013
fbbd638
Release polyline shaders when removed, vertex arrays are (re)created,…
bagnell Mar 19, 2013
028cb4b
Merge branch 'master' into polylineMaterials
bagnell Mar 19, 2013
0f78d24
Update doc.
bagnell Mar 19, 2013
861191e
Some more polyline collection clean up.
bagnell Mar 19, 2013
7ba8eba
Fix broken test.
bagnell Mar 19, 2013
ea4bddc
Fix endpoints at IDL.
bagnell Mar 19, 2013
3d4c8a6
Create polyline draw commands grouped by material.
bagnell Mar 19, 2013
0de7f81
Finish sorting polyline commands by material.
bagnell Mar 20, 2013
8501915
Fix error when creating commands.
bagnell Mar 20, 2013
f4a0140
Remove per-vertex color and outline color.
bagnell Mar 20, 2013
f0a1237
Remove unused code.
bagnell Mar 20, 2013
cb852da
Update dynamic scene path and polyline.
bagnell Mar 20, 2013
c53347a
Update tests.
bagnell Mar 20, 2013
9f6e636
Merge branch 'master' into polylineMaterials
bagnell Mar 20, 2013
1ee20fb
Update polyline arrow material shader.
bagnell Mar 20, 2013
40f6392
Fix polylines in 2D.
bagnell Mar 20, 2013
e7fe99c
Update CHANGES.md
bagnell Mar 20, 2013
7a6ebca
Update DynamicScene to use new Polyline materials.
mramato Mar 21, 2013
dcf94d8
Merge branch 'master' into polylineMaterials
bagnell Mar 21, 2013
a6f5e61
Rename czm_pixelSize to czm_pixelSizeInMeters. Update CHANGES.md.
bagnell Mar 21, 2013
493f755
Update Material doc and tests.
bagnell Mar 21, 2013
9bb855e
Remove Polyline equals method. Change default outline width.
bagnell Mar 21, 2013
debe70a
Rename maxDistance uniform of the Fade material to maximumDistance.
bagnell Mar 21, 2013
d7b7583
Rename everything that was associated the 'misc' vertex attribute to …
bagnell Mar 21, 2013
1e1f17b
Merge branch 'master' into polylineMaterials
bagnell Mar 21, 2013
ce5ae32
Update visualizers to set CZML defaults.
mramato Mar 22, 2013
304ebc4
Fix line clipping issue. Remove phong lighting.
bagnell Mar 22, 2013
646ed33
Merge branch 'master' into polylineMaterials
bagnell Mar 22, 2013
5b796e7
Fix apparent z-fighting shown in the Client CZML sandcastle example.
bagnell Mar 26, 2013
b3fd893
Merge branch 'master' into polylineMaterials
bagnell Mar 26, 2013
05a1c80
Modify the current material color when highlighting objects.
bagnell Mar 26, 2013
5c2d7bf
Cache draw commands.
bagnell Mar 26, 2013
c5b89f1
Merge branch 'master' into polylineMaterials
bagnell Mar 26, 2013
278045b
Add czm_antialias GLSL function.
bagnell Mar 26, 2013
acd1a79
Fix crash on scene mode change.
bagnell Mar 26, 2013
77c938e
Add polyline material examples to Sandcastle.
bagnell Mar 27, 2013
2382707
Update the vertex arrays when the segment lengths change to update th…
bagnell Mar 27, 2013
9d09337
Merge branch 'master' into polylineMaterials
bagnell Mar 27, 2013
ede6963
Remove extra polyline update.
bagnell Mar 27, 2013
67d36c5
Use a spheremap transform to encode normals instead of converting to …
bagnell Mar 28, 2013
e3af822
Improve polyline vertex shader performance by removing the inverse co…
bagnell Mar 28, 2013
79424d8
Add comments with links.
bagnell Mar 28, 2013
f20efe5
Merge branch 'master' into polylineMaterials
bagnell Mar 28, 2013
19a0ed2
Update simple.czml to reflect lastest converter changes.
mramato Mar 28, 2013
f17c399
Modify command creation and caching.
bagnell Mar 28, 2013
dfc293f
Fix error found in test czml file.
bagnell Mar 28, 2013
ac15fda
Final tweak to simple.czml
mramato Mar 28, 2013
8953a39
Revert last change and update polyline segments when positions are ch…
bagnell Mar 28, 2013
ef74966
Fix line width issue.
bagnell Mar 29, 2013
2452897
Update simple.czml
mramato Mar 29, 2013
bd12915
Merge branch 'master' into polylineMaterials
bagnell Apr 2, 2013
d9fcfbf
Update CHANGES.md after merge.
bagnell Apr 2, 2013
e600997
Add polyline segment length and which direction to use for clipping.
bagnell Apr 3, 2013
f95b260
Modify polyline vertex shader to clip line segments to the near plane.
bagnell Apr 4, 2013
f5ad60d
Merge branch 'master' into polylineMaterials
bagnell Apr 4, 2013
1601a31
Fix multi-frustum polyline issue.
bagnell Apr 5, 2013
76dfac0
Fix clipping at last end point.
bagnell Apr 5, 2013
b8f9da6
Fix expand direction when clipping.
bagnell Apr 5, 2013
87e01ef
Simplify the polyline vertex shader.
bagnell Apr 5, 2013
5bce46d
Fix segment lengths in 2D/Columbus view that where off by two at the …
bagnell Apr 8, 2013
d9f15d6
Merge branch 'master' into polylineMaterials
bagnell Apr 8, 2013
90add05
Subdivide polylines.
bagnell Apr 9, 2013
98e5819
Merge branch 'master' into polylineMaterials
bagnell Apr 9, 2013
b6f91e4
Add adjacent polyline positions as vertex attributes.
bagnell Apr 9, 2013
ab88720
Update after merge.
bagnell Apr 9, 2013
09cff09
Update polyline VS to use the new attributes.
bagnell Apr 9, 2013
9961525
Tweak the polyline subdivision distance.
bagnell Apr 10, 2013
8a23273
Merge branch 'polyline16Attribs' into polylineMaterials
bagnell Apr 10, 2013
101fd06
Fix tests.
bagnell Apr 10, 2013
45bb0d8
Update polyline segment end points. Update vertex shader. Updates bas…
bagnell Apr 10, 2013
f156a22
Update Sancastle polyline example image.
bagnell Apr 11, 2013
79e3aab
Add czm_antialias test.
bagnell Apr 11, 2013
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
104 changes: 52 additions & 52 deletions Apps/CesiumViewer/Gallery/simple.czml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
"number":1.0
}
],
"resolution":10.0,
"resolution":60.0,
"show":[
{
"interval":"2012-03-15T10:00:00Z/2012-03-16T10:00:00Z",
Expand All @@ -157,8 +157,8 @@
"interpolationDegree":1,
"epoch":"2012-03-15T10:00:00Z",
"number":[
0.0,2370.575224321001,
2370.575224321001,0.0
0.0,5903.376977238004,
5903.376977238004,0.0
]
},
{
Expand Down Expand Up @@ -292,7 +292,7 @@
]
},
{
"interval":"2012-03-16T07:58:35.1683124770061Z/2012-03-16T09:36:58.6038607679948Z",
"interval":"2012-03-16T07:58:35.1683124770061Z/2012-03-16T08:21:36.5644517090113Z",
"interpolationAlgorithm":"LINEAR",
"interpolationDegree":1,
"epoch":"2012-03-16T07:58:35.1683124770061Z",
Expand All @@ -302,13 +302,13 @@
]
},
{
"interval":"2012-03-16T09:36:58.6038607679948Z/2012-03-16T10:00:00Z",
"interval":"2012-03-16T08:21:36.5644517090113Z/2012-03-16T10:00:00Z",
"interpolationAlgorithm":"LINEAR",
"interpolationDegree":1,
"epoch":"2012-03-16T09:36:58.6038607679948Z",
"epoch":"2012-03-16T08:21:36.5644517090113Z",
"number":[
0.0,1381.3961392320052,
1381.3961392320052,0.0
0.0,5903.435548290989,
5903.435548290989,0.0
]
}
],
Expand All @@ -320,7 +320,7 @@
"epoch":"2012-03-15T10:00:00Z",
"number":[
0.0,0.0,
2370.575224321001,2370.575224321001
5903.376977238004,5903.376977238004
]
},
{
Expand Down Expand Up @@ -454,7 +454,7 @@
]
},
{
"interval":"2012-03-16T07:58:35.1683124770061Z/2012-03-16T09:36:58.6038607679948Z",
"interval":"2012-03-16T07:58:35.1683124770061Z/2012-03-16T08:21:36.5644517090113Z",
"interpolationAlgorithm":"LINEAR",
"interpolationDegree":1,
"epoch":"2012-03-16T07:58:35.1683124770061Z",
Expand All @@ -464,13 +464,13 @@
]
},
{
"interval":"2012-03-16T09:36:58.6038607679948Z/2012-03-16T10:00:00Z",
"interval":"2012-03-16T08:21:36.5644517090113Z/2012-03-16T10:00:00Z",
"interpolationAlgorithm":"LINEAR",
"interpolationDegree":1,
"epoch":"2012-03-16T09:36:58.6038607679948Z",
"epoch":"2012-03-16T08:21:36.5644517090113Z",
"number":[
0.0,0.0,
1381.3961392320052,1381.3961392320052
5903.435548290989,5903.435548290989
]
}
]
Expand Down Expand Up @@ -852,7 +852,7 @@
"number":1.0
}
],
"resolution":10.0,
"resolution":60.0,
"show":[
{
"interval":"2012-03-15T10:00:00Z/2012-03-16T10:00:00Z",
Expand All @@ -866,8 +866,8 @@
"interpolationDegree":1,
"epoch":"2012-03-15T10:00:00Z",
"number":[
0.0,2696.103115773003,
2696.103115773003,0.0
0.0,5537.546684141998,
5537.546684141998,0.0
]
},
{
Expand Down Expand Up @@ -1011,7 +1011,7 @@
]
},
{
"interval":"2012-03-16T08:17:01.17765616998076Z/2012-03-16T09:49:18.6175852820161Z",
"interval":"2012-03-16T08:17:01.17765616998076Z/2012-03-16T08:27:42.5600708879647Z",
"interpolationAlgorithm":"LINEAR",
"interpolationDegree":1,
"epoch":"2012-03-16T08:17:01.17765616998076Z",
Expand All @@ -1021,13 +1021,13 @@
]
},
{
"interval":"2012-03-16T09:49:18.6175852820161Z/2012-03-16T10:00:00Z",
"interval":"2012-03-16T08:27:42.5600708879647Z/2012-03-16T10:00:00Z",
"interpolationAlgorithm":"LINEAR",
"interpolationDegree":1,
"epoch":"2012-03-16T09:49:18.6175852820161Z",
"epoch":"2012-03-16T08:27:42.5600708879647Z",
"number":[
0.0,641.3824147179839,
641.3824147179839,0.0
0.0,5537.439929112035,
5537.439929112035,0.0
]
}
],
Expand All @@ -1039,7 +1039,7 @@
"epoch":"2012-03-15T10:00:00Z",
"number":[
0.0,0.0,
2696.103115773003,2696.103115773003
5537.546684141998,5537.546684141998
]
},
{
Expand Down Expand Up @@ -1183,7 +1183,7 @@
]
},
{
"interval":"2012-03-16T08:17:01.17765616998076Z/2012-03-16T09:49:18.6175852820161Z",
"interval":"2012-03-16T08:17:01.17765616998076Z/2012-03-16T08:27:42.5600708879647Z",
"interpolationAlgorithm":"LINEAR",
"interpolationDegree":1,
"epoch":"2012-03-16T08:17:01.17765616998076Z",
Expand All @@ -1193,13 +1193,13 @@
]
},
{
"interval":"2012-03-16T09:49:18.6175852820161Z/2012-03-16T10:00:00Z",
"interval":"2012-03-16T08:27:42.5600708879647Z/2012-03-16T10:00:00Z",
"interpolationAlgorithm":"LINEAR",
"interpolationDegree":1,
"epoch":"2012-03-16T09:49:18.6175852820161Z",
"epoch":"2012-03-16T08:27:42.5600708879647Z",
"number":[
0.0,0.0,
641.3824147179839,641.3824147179839
5537.439929112035,5537.439929112035
]
}
]
Expand Down Expand Up @@ -1587,7 +1587,7 @@
"number":1.0
}
],
"resolution":10.0,
"resolution":60.0,
"show":[
{
"interval":"2012-03-15T10:00:00Z/2012-03-16T10:00:00Z",
Expand All @@ -1601,8 +1601,8 @@
"interpolationDegree":1,
"epoch":"2012-03-15T10:00:00Z",
"number":[
0.0,4025.3874546559964,
4025.3874546559964,0.0
0.0,5933.062741324,
5933.062741324,0.0
]
},
{
Expand Down Expand Up @@ -1726,7 +1726,7 @@
]
},
{
"interval":"2012-03-16T06:53:42.1819449639879Z/2012-03-16T08:32:35.2452977779903Z",
"interval":"2012-03-16T06:53:42.1819449639879Z/2012-03-16T08:21:06.93664718599757Z",
"interpolationAlgorithm":"LINEAR",
"interpolationDegree":1,
"epoch":"2012-03-16T06:53:42.1819449639879Z",
Expand All @@ -1736,13 +1736,13 @@
]
},
{
"interval":"2012-03-16T08:32:35.2452977779903Z/2012-03-16T10:00:00Z",
"interval":"2012-03-16T08:21:06.93664718599757Z/2012-03-16T10:00:00Z",
"interpolationAlgorithm":"LINEAR",
"interpolationDegree":1,
"epoch":"2012-03-16T08:32:35.2452977779903Z",
"epoch":"2012-03-16T08:21:06.93664718599757Z",
"number":[
0.0,5244.75470222201,
5244.75470222201,0.0
0.0,5933.063352814002,
5933.063352814002,0.0
]
}
],
Expand All @@ -1754,7 +1754,7 @@
"epoch":"2012-03-15T10:00:00Z",
"number":[
0.0,0.0,
4025.3874546559964,4025.3874546559964
5933.062741324,5933.062741324
]
},
{
Expand Down Expand Up @@ -1878,7 +1878,7 @@
]
},
{
"interval":"2012-03-16T06:53:42.1819449639879Z/2012-03-16T08:32:35.2452977779903Z",
"interval":"2012-03-16T06:53:42.1819449639879Z/2012-03-16T08:21:06.93664718599757Z",
"interpolationAlgorithm":"LINEAR",
"interpolationDegree":1,
"epoch":"2012-03-16T06:53:42.1819449639879Z",
Expand All @@ -1888,13 +1888,13 @@
]
},
{
"interval":"2012-03-16T08:32:35.2452977779903Z/2012-03-16T10:00:00Z",
"interval":"2012-03-16T08:21:06.93664718599757Z/2012-03-16T10:00:00Z",
"interpolationAlgorithm":"LINEAR",
"interpolationDegree":1,
"epoch":"2012-03-16T08:32:35.2452977779903Z",
"epoch":"2012-03-16T08:21:06.93664718599757Z",
"number":[
0.0,0.0,
5244.75470222201,5244.75470222201
5933.063352814002,5933.063352814002
]
}
]
Expand Down Expand Up @@ -2276,7 +2276,7 @@
"number":1.0
}
],
"resolution":10.0,
"resolution":60.0,
"show":[
{
"interval":"2012-03-15T10:00:00Z/2012-03-16T10:00:00Z",
Expand All @@ -2290,12 +2290,12 @@
"interpolationDegree":1,
"epoch":"2012-03-15T10:00:00Z",
"number":[
0.0,11502.060721728994,
11502.060721728994,0.0
0.0,43058.246637085,
43058.246637085,0.0
]
},
{
"interval":"2012-03-15T13:11:42.0607217289944Z/2012-03-16T01:09:20.307358813996Z",
"interval":"2012-03-15T13:11:42.0607217289944Z/2012-03-15T22:02:21.7533629149984Z",
"interpolationAlgorithm":"LINEAR",
"interpolationDegree":1,
"epoch":"2012-03-15T13:11:42.0607217289944Z",
Expand All @@ -2305,13 +2305,13 @@
]
},
{
"interval":"2012-03-16T01:09:20.307358813996Z/2012-03-16T10:00:00Z",
"interval":"2012-03-15T22:02:21.7533629149984Z/2012-03-16T10:00:00Z",
"interpolationAlgorithm":"LINEAR",
"interpolationDegree":1,
"epoch":"2012-03-16T01:09:20.307358813996Z",
"epoch":"2012-03-15T22:02:21.7533629149984Z",
"number":[
0.0,31839.692641186004,
31839.692641186004,0.0
0.0,43058.246637085,
43058.246637085,0.0
]
}
],
Expand All @@ -2323,11 +2323,11 @@
"epoch":"2012-03-15T10:00:00Z",
"number":[
0.0,0.0,
11502.060721728994,11502.060721728994
43058.246637085,43058.246637085
]
},
{
"interval":"2012-03-15T13:11:42.0607217289944Z/2012-03-16T01:09:20.307358813996Z",
"interval":"2012-03-15T13:11:42.0607217289944Z/2012-03-15T22:02:21.7533629149984Z",
"interpolationAlgorithm":"LINEAR",
"interpolationDegree":1,
"epoch":"2012-03-15T13:11:42.0607217289944Z",
Expand All @@ -2337,13 +2337,13 @@
]
},
{
"interval":"2012-03-16T01:09:20.307358813996Z/2012-03-16T10:00:00Z",
"interval":"2012-03-15T22:02:21.7533629149984Z/2012-03-16T10:00:00Z",
"interpolationAlgorithm":"LINEAR",
"interpolationDegree":1,
"epoch":"2012-03-16T01:09:20.307358813996Z",
"epoch":"2012-03-15T22:02:21.7533629149984Z",
"number":[
0.0,0.0,
31839.692641186004,31839.692641186004
43058.246637085,43058.246637085
]
}
]
Expand Down
Loading