tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,828 Commits 3 Branches 22 Tags
f65a74bbeba9e16fbafb3f479c709f7b4b002df3
Commit Graph

1154 Commits

Author SHA1 Message Date
Leith Bade
aaedd9c83b Remove program binary caching 2015-01-27 12:38:40 +11:00
Leith Bade
8193acdf30 Merge pull request #676 from mapbox/android-mason 
Android GL mega-merge
 2015-01-27 07:23:43 +11:00
Ansis Brammanis
60035d7728 Merge branch 'no-crossfade' 
Conflicts:
	src/mbgl/renderer/painter_line.cpp
 2015-01-26 12:19:40 -08:00
Leith Bade
8c02249324 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 2015-01-27 08:28:51 +13:00
John Firebaugh
7694b0c1ec Merge pull request #771 from mapbox/visibility 
Add visibility property for v7
 2015-01-26 11:09:16 -08:00
Ansis Brammanis
8f620bed8a reduce gamma for dashes to make them sharper 
because the shader uses the range [0.5 - gamma, 0.5 + gamma] gamma
should be half the distance you want to blur, not the full distance.

js: 35b42808922506a6039b8bfd3dc10098692c1268
 2015-01-23 19:56:26 -05:00
Ansis Brammanis
5955ac3493 transition dashes when resetting their stretch 
Dash patterns stretch from one integer zoom until the
next integer zoom where they reset. This transitions
those resets.

js: be5c7184bfd8cc9d47299041eb7fadbd41f6f6f0
 2015-01-23 17:25:31 -05:00
Ansis Brammanis
d0d33a3ee7 don't permanently crossfade line patterns 
js: a2e8527b4023d19fa0c58130a105aaf283f4b152
 2015-01-23 17:12:41 -05:00
Ansis Brammanis
c5d5a799be Don't permanently crossfade fill patterns. 
js: 00e11591106dae7eb02eff0328364d8ec03fdaa5
 2015-01-23 17:05:30 -05:00
Lauren Budorick
66355b7d86 Add visibility property for v7. 2015-01-22 17:11:07 -08:00
Leith Bade
42d1972732 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	src/mbgl/renderer/painter_prerender.cpp
	src/mbgl/renderer/prerendered_texture.cpp
	src/mbgl/renderer/prerendered_texture.hpp
 2015-01-23 11:11:04 +11:00
John Firebaugh
0c2ffc251c Revert "scale dashes by line-gap-width if present" 
This reverts commit 4791bac675.
 2015-01-22 14:05:49 -08:00
John Firebaugh
a8b6e3dc71 Merge remote-tracking branch 'origin/dash-3' into v7 2015-01-22 13:06:30 -08:00
Leith Bade
d2105a1855 Fix terminate crash 2015-01-23 00:26:29 +11:00
John Firebaugh
8e23e3a3e8 Remove support for prerendered layers 
https://github.com/mapbox/mapbox-gl-style-spec/issues/232
 2015-01-21 18:41:17 -08:00
Leith Bade
5feba9ac07 get/setAppliedStyleClasses -> get/setClasses 2015-01-18 17:05:01 +11:00
Leith Bade
016c2948c5 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	src/mbgl/map/map.cpp
 2015-01-18 16:33:39 +11:00
Ansis Brammanis
4791bac675 scale dashes by line-gap-width if present 
https://github.com/mapbox/mapbox-gl-js/pull/860#issuecomment-68788411

js: a5fb9f9fb5c7ea056b6ec228e0b398815cc0d356
 2015-01-16 16:29:58 -05:00
Ansis Brammanis
07e23967d8 eamlessly join odd-length dasharrays 
js: 8314099fa4165714c743ebe891fcff0e618ebcde
 2015-01-16 16:21:14 -05:00
Ansis Brammanis
200b1ce449 remove names to suppress unused warnings 2015-01-16 14:40:30 -05:00
Ansis Brammanis
bf4e9d0862 remove duplicate lineatlas texture update 2015-01-16 14:39:47 -05:00
Ansis Brammanis
1ce0ca0b7a add warning when line atlas is overflowed 2015-01-16 13:37:13 -05:00
Ansis Brammanis
221d256bea remove unused 2015-01-15 20:44:10 -05:00
Leith Bade
d950e986b7 Merge pull request #757 from mapbox/move-terminate 
Move terminate() call to GLFWView to avoid problems with node
 2015-01-16 10:16:30 +11:00
Leith Bade
5e44256fe8 Move terminate() call to GLFWView to avoid problems with node 2015-01-16 09:50:05 +11:00
Ansis Brammanis
c472528f9b support functions of dash arrays 2015-01-15 17:41:55 -05:00
Leith Bade
4540a8ae83 Update to Android NDK r10d in new AMI 2015-01-15 23:17:42 +11:00
Ansis Brammanis
b66f4e2c4b use TexSubImage2D for line atlas updates 2015-01-14 23:09:14 -05:00
Ansis Brammanis
4f827c21c6 implement round dash caps 2015-01-14 22:56:44 -05:00
Ansis Brammanis
2c615b613c support dash arrays that are any length 2015-01-14 22:24:44 -05:00
Ansis Brammanis
84e9dbdc09 remove unused code 2015-01-14 22:02:22 -05:00
Ansis Brammanis
8bfaf12793 remove old dash support from line shader 2015-01-14 21:11:19 -05:00
Ansis Brammanis
2643a0efc7 start porting dash lines from js 
- switches to dash units that are scaled by line width
- adds a lineatlas to store patterns line dashed lines
- adds linesdf shader which renders line fill from the lineatlas

js: 8e83d76af3bd877eb9639c02e296363e2c0186f8
 2015-01-14 20:56:18 -05:00
John Firebaugh
d24b73b1a6 Move class state to map 
https://github.com/mapbox/mapbox-gl-js/pull/936
 2015-01-14 17:43:44 -08:00
Leith Bade
b7cc6bfaa6 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 
Conflicts:
	src/mbgl/shader/shader.cpp
 2015-01-15 11:39:50 +11:00
John Firebaugh
c6ca57045f Merge pull request #744 from mapbox/merge-roads 
merge adjacent roads with the same text for labeling
 2015-01-14 10:12:45 -08:00
Ansis Brammanis
b54c0e2447 simplify erase 
so you don't have to think about whether find might return an end()
iterator (which is invalid for erase).
 2015-01-13 22:26:37 -05:00
Leith Bade
8cca0a27ba Check for IO errors when loading binary shader. Fixes #740 2015-01-14 10:35:33 +13:00
Leith Bade
1daf2207aa Remove coffeecatch 2015-01-13 20:31:24 +11:00
Leith Bade
7cce089d78 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 2015-01-13 19:48:26 +11:00
Leith Bade
aa955171d7 remove extra line 2015-01-13 19:48:00 +11:00
John Firebaugh
bac75f1c7a Allow characters outside \w to be used in token 
https://github.com/mapbox/mapbox-gl-js/pull/926
 2015-01-12 10:17:01 -08:00
Ansis Brammanis
5670fb397f get rid of separate vector for symbol geometries 2015-01-12 12:33:24 -05:00
Ansis Brammanis
e4858b6a02 merge adjacent roads with same text for labelling 
js: https://github.com/mapbox/mapbox-gl-js/pull/683
 2015-01-08 23:44:11 -05:00
Leith Bade
5ed8d4544f Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 2015-01-09 09:30:52 +11:00
Ansis Brammanis
166a3e21fa rephrase line uniform calculations to match js 
js: 359a576471e20373333cae80a5eccda95ee4cdc2
 2015-01-08 14:40:19 -05:00
Ansis Brammanis
59b51f0a9f fix fill pattern spacing 
js: 22e24f7f67c4db89d09c0b65df67d0fcf1c3b614
 2015-01-08 14:00:06 -05:00
John Firebaugh
c32f7dfa88 Merge branch 'master' into shader-performance 2015-01-07 15:15:11 -08:00
Leith Bade
8eceb082ba Add failsafe to program binary loading 2015-01-05 12:28:32 +13:00
Leith Bade
3aaf1f26f3 Missed rename 2014-12-25 18:10:16 +13:00