Commit Graph

66 Commits

Author SHA1 Message Date
Dane Springmeyer
f5394a7638 release mode: silent debug output + ifdef any potentially expensive calls 2014-05-29 18:07:19 -07:00
Konstantin Käfer
4ad3a1ee76 Merge branch 'master' into blur
Conflicts:
	src/shader/shaders_gl.cpp
	src/shader/shaders_gles2.cpp
2014-05-26 17:30:31 +02:00
Konstantin Käfer
6ed5c0ddf3 use sigma 1 for blur by default 2014-05-26 15:35:08 +02:00
Dane Springmeyer
9e7ee02fcd remove generated shaders from git - Closes #241 2014-05-23 16:41:08 -07:00
Konstantin Käfer
889ef68b5b first draft at blurring 2014-05-23 18:30:49 +02:00
Nicki Dlugash
2ecf410504 playing around with road and poi label strokes, to match updated icons 2014-05-22 18:50:05 -04:00
Konstantin Käfer
53a6992728 fix alpha blending + add depth/stencil buffers 2014-05-21 18:34:41 +02:00
Konstantin Käfer
13939b26d9 first shot at composited blending
still missing:
- stencil+depth mask
- alpha compositing
2014-05-21 10:55:09 +02:00
Konstantin Käfer
de149b0543 optimized shaders 2014-05-21 10:53:12 +02:00
Eden Halperin
9e49dedc28 night styles first pass 2014-05-20 15:52:57 -07:00
Konstantin Käfer
a6cb3d8402 fix label display
refs #217
2014-05-20 11:10:27 +02:00
Ansis Brammanis
2b348ccfd4 Merge branch 'master' of github.com:mapbox/llmr-native 2014-05-19 17:36:50 -04:00
Ansis Brammanis
4d38e4eb15 fix rotation range check in text shader
fixes #215
2014-05-19 17:35:55 -04:00
Konstantin Käfer
a33d334169 incorporate the color and draw circle dots if we don't have an icon
Conflicts:
	bin/style.js
2014-05-19 16:20:51 +02:00
Konstantin Käfer
898c6d6714 fix for retina screens 2014-05-19 11:13:22 +02:00
Konstantin Käfer
13575330f7 use sprite atlas 2014-05-19 10:48:36 +02:00
Konstantin Käfer
27f8ed29e4 encode icon texture coordinate in buffer so we can render all pois with 1 draw call 2014-05-19 10:48:36 +02:00
Konstantin Käfer
01183a0a19 fix remaining cases of point => icon 2014-05-15 18:09:00 +02:00
Konstantin Käfer
4c99014a13 don't use fractional texture coordiantes in the shader 2014-05-15 15:16:34 +02:00
Konstantin Käfer
fda64b67af rename point => icon 2014-05-15 14:51:02 +02:00
Konstantin Käfer
aeae6248ad simplify point shader in preparation for #196 2014-05-15 14:27:49 +02:00
Justin R. Miller
2b9fbb0731 squashed stylequest merge
* uses OSM Bright style
 * adds dot shader
 * adds layer translation
 * adds dashed line support
 * adds style array parsing
 * improves background layer parsing
 * improves style constant parsing
 * fixes sprite JSON pixel ratio parsing
2014-05-07 10:37:25 -07:00
Konstantin Käfer
ddc359f006 add more timers to headless test 2014-04-25 17:04:22 +02:00
Konstantin Käfer
2e4637ea1d remove opacity (use color instead) 2014-04-15 18:42:23 -04:00
Konstantin Käfer
78c10c0701 Merge remote-tracking branch 'remotes/origin/pr/127'
Conflicts:
	include/llmr/map/map.hpp
	src/map/map.cpp
	src/platform/platform.cpp
2014-04-15 12:46:19 -04:00
Konstantin Käfer
ebc9a0a0d7 add xcode project builds 2014-04-11 15:13:55 -04:00
Konstantin Käfer
320bb0b131 prebuild shaders 2014-04-11 10:49:51 -04:00
Justin R. Miller
bd23f21293 remove log line 2014-04-02 16:13:42 -07:00
Justin R. Miller
2eca1c419b add support for background opacity in style 2014-04-02 16:09:31 -07:00
Konstantin Käfer
77f58960c4 build shaders for either desktop gl or gles2 2014-03-25 13:16:48 +01:00
Konstantin Käfer
25e2d8504b debug changes 2014-03-25 12:24:56 +01:00
Konstantin Käfer
3a9a904378 reorder vertices 2014-03-25 12:14:33 +01:00
Konstantin Käfer
d5b4c1162d add shader optimizer and reorder components 2014-03-25 12:10:19 +01:00
Konstantin Käfer
af8c936c10 fix color parsing 2014-03-24 10:55:05 +01:00
Konstantin Käfer
ea6b24d02d add text rendering code 2014-03-21 17:36:29 +01:00
Konstantin Käfer
a7b9b96d4d add textshader 2014-03-21 14:26:25 +01:00
Konstantin Käfer
3413ee536d Merge branch 'master' into sdf
Conflicts:
	include/llmr/map/tile_data.hpp
	include/llmr/shader/shaders.hpp
	src/map/map.cpp
	src/map/tile_data.cpp
	src/platform/platform.cpp
	src/shader/shaders.cpp
2014-03-21 13:36:32 +01:00
Justin R. Miller
00a3245ce8 fixes #70: raster tile rendering as toggleable mode from vector 2014-03-18 16:57:17 -07:00
Konstantin Käfer
168ee4659e rename text shader file 2014-03-17 12:31:13 +01:00
Konstantin Käfer
8171c7bb43 add empty classes for rendering glyphs 2014-03-14 11:36:10 +01:00
Konstantin Käfer
8fd4d855d5 move shader classes to separate folder 2014-03-12 15:25:39 +01:00
Konstantin Käfer
b7b2812d30 remove debug uniform 2014-03-11 12:09:39 +01:00
Justin R. Miller
b6d7169b83 refs #60: add support for point colorization & opacity 2014-02-21 16:00:55 -08:00
Konstantin Käfer
a9198570ea revert shader 2014-02-21 10:41:22 +01:00
Konstantin Käfer
7f5a674a91 add texture settings 2014-02-19 18:14:42 +01:00
Konstantin Käfer
9710fbef99 enable texture interpolation during rotating and scaling 2014-02-19 15:39:44 +01:00
Konstantin Käfer
06e23543cb don't use degenerate vertices 2014-02-19 14:48:34 +01:00
Justin R. Miller
828d8ba26f refs #60: first cut of POI rendering
* add basic marker style to stylesheet
 * pass through marker style to PBF conversion
 * marker/point tile parsing, bucket, buffer, shaders, etc.
 * new sprite hosting for 1x/2x variants
 * sprite load accepts screen scale argument
2014-02-14 18:13:12 -08:00
Konstantin Käfer
1cab7f07bd remove all mentions of degenerate things 2014-02-13 16:37:16 +01:00
Konstantin Käfer
da06a52056 cut down on redundant gl uniform changes 2014-02-13 16:21:51 +01:00