Commit Graph

25 Commits

Author SHA1 Message Date
Konstantin Käfer
d5b4c1162d add shader optimizer and reorder components 2014-03-25 12:10:19 +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
8171c7bb43 add empty classes for rendering glyphs 2014-03-14 11:36:10 +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
Konstantin Käfer
54454ed66a optimizations + reorder vertex index 2014-02-13 14:10:04 +01:00
Konstantin Käfer
02f2dea807 get point shader to work on ios 2014-02-11 17:58:33 +01:00
Konstantin Käfer
bec0ad10c4 drawing lines with triangles 2014-02-11 15:51:54 +01:00
Konstantin Käfer
9553bfa159 revert back to 32767 2014-02-06 15:29:23 +01:00
Konstantin Käfer
cf31a80920 textured fills & enforce vao program with templates 2014-02-05 19:03:44 +01:00
Konstantin Käfer
aff6c54c00 remove hardcoded #version 120 2014-02-04 16:46:48 +01:00
Konstantin Käfer
82c79b7bda remove c99 features
fixes #26
2014-02-03 23:21:50 +01:00
Konstantin Käfer
9ab9eeec13 textured fills
fixes #15
2014-02-03 22:51:21 +01:00
Konstantin Käfer
e359d697fb buggy line support 2014-01-28 18:40:17 +01:00
Konstantin Käfer
43ab6732d9 rename shader line -> plain 2014-01-28 17:37:36 +01:00
Konstantin Käfer
5aa22b9c32 move shaders to cpp file 2014-01-20 11:30:06 +01:00