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
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
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
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
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
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
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
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
0771e50460
Rename View functions to match conventions. Also tidy up view classes and remove C style casts. Closes #656
2014-12-23 09:29:45 +13:00
Leith Bade
15b47197a7
Use iostream for saving GL program binary. Also check for GL_NUM_PROGRAM_BINARY_FORMATS > 0.
2014-12-20 15:08:06 +13:00
John Firebaugh
4a2cf4aa62
Merge pull request #718 from mapbox/cli-render
...
CLI render
2014-12-18 18:00:33 -08:00
Konstantin Käfer
b5e9998b15
change file:// to asset:// to indicate that they aren't arbitrary files
...
refs #579
2014-12-17 14:59:05 +01:00
Konstantin Käfer
936e096514
Make file request overridable by platform implementations
...
refs #579 : Android can now rename AssetRequest to FileRequest and implement it differently
2014-12-17 12:14:32 +01:00
Mike Morris
3a8036413f
fix CachingHTTPFileSource::clearLoop
2014-12-15 14:32:48 -05:00
Konstantin Käfer
57e6bc6e1b
fix error in non-debug builds
2014-12-15 14:16:30 +01:00
Konstantin Käfer
21e9e0a5ea
set rendering mode so that we can skip intermediate renders for static images
2014-12-12 15:01:09 +01:00
Konstantin Käfer
6cabaf0230
provide explicit constructor to appease GCC
2014-12-12 12:37:55 +01:00
Konstantin Käfer
bec97a3d40
warp in MBGL_CHECK_ERROR() call
2014-12-12 12:37:55 +01:00
Konstantin Käfer
febfb7ac09
fix rendering errors
2014-12-12 12:37:55 +01:00
Konstantin Käfer
f8ba23377d
[performance] remove glFlush()
2014-12-12 12:37:55 +01:00
Konstantin Käfer
2648e6a964
add debug line for showing the sprite atlas
2014-12-12 12:37:55 +01:00
Konstantin Käfer
5b14c85b78
use 4-byte aligned vertex attributes for performance reason
...
reverts 9d5f02ccaa4c0b4a7901
2014-12-12 12:37:54 +01:00
Konstantin Käfer
1fe545aee4
fix crashes when running in non-continuous mode
2014-12-11 18:32:25 +01:00
Konstantin Käfer
a81e822ef0
add cli tool for rendering a map to an image
2014-12-11 17:58:36 +01:00
Konstantin Käfer
4ad28c931a
only report STACK_OVERFLOW/STACK_UNDERFLOW when the GL implementation has them
2014-12-10 13:46:26 +01:00
Konstantin Käfer
93d56294cf
update error reporting function
2014-12-10 13:21:08 +01:00
Leith Bade
127600ef8c
Fix unused param
2014-12-10 22:23:53 +11:00
Leith Bade
08b07c30a7
Reduce GL log spew
2014-12-10 22:15:41 +11:00
