Commit Graph

184 Commits

Author SHA1 Message Date
Konstantin Käfer
b0ddabd6ac rename Tile to TileData 2014-03-04 17:53:16 +01:00
Konstantin Käfer
ba5070bf52 Port scanline algorithm from _getCoveringTiles()
fixes #22
2014-03-04 14:50:17 +01:00
Konstantin Käfer
ed5e335da1 do not write linejoin fragments to depth buffer 2014-03-04 11:35:37 +01:00
Konstantin Käfer
e85304d510 use depth buffer to avoid writing to opaque fragments 2014-03-04 11:21:42 +01:00
Konstantin Käfer
0a6dbc8064 Merge branch 'nostencil'
Conflicts:
	macosx/main.mm
	src/map/map.cpp
2014-03-03 16:02:13 +01:00
Konstantin Käfer
2e0681e2d6 Merge pull request #49 from mapbox/tessellation
Try out tessellating polygons
2014-03-03 15:08:48 +01:00
Konstantin Käfer
4e73a4d47c Merge branch 'master' into tessellation
Conflicts:
	include/llmr/renderer/fill_bucket.hpp
	src/renderer/fill_bucket.cpp
	src/renderer/painter.cpp
2014-02-28 12:25:45 +01:00
Konstantin Käfer
57dafc6d4c do not clear the stencil buffer 2014-02-27 12:23:04 +01:00
Konstantin Käfer
8d68bd73e7 draw a checkerboard stencil clipping mask initially 2014-02-26 12:24:17 +01:00
Konstantin Käfer
f87e21b6e8 Merge branch 'tessellation' into nostencil
Conflicts:
	include/llmr/renderer/fill_bucket.hpp
	src/renderer/painter.cpp
2014-02-26 10:44:09 +01:00
Justin R. Miller
78ab66b06c rename tile state ready -> parsed 2014-02-25 15:26:12 -08:00
Justin R. Miller
675b8eb1fe refs #60: size POIs properly based on pixel ratio 2014-02-21 16:25:42 -08:00
Konstantin Käfer
e382cab17d make implicit type conversions explicit 2014-02-21 13:08:13 +01:00
Konstantin Käfer
d5c611d707 add timeouts for panning,scaling,rotating 2014-02-21 11:31:24 +01:00
Justin R. Miller
9e762f91eb gl_pointCoord requires GL_POINT_SPRITE on OS X 2014-02-20 15:53:17 -08: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
8880379b31 set the point size 2014-02-19 14:47:58 +01:00
Konstantin Käfer
ea80daa129 allow switching the vao if we switch the style from plain color to pattern fill 2014-02-18 15:56:23 +01:00
Konstantin Käfer
6a982b3934 render lines with the tessellated triangles 2014-02-18 11:59:19 +01:00
Konstantin Käfer
5e129c5f5a add lines 2014-02-18 11:11:46 +01:00
Konstantin Käfer
fc29d2116b render the actual polygons instead of the stencil buffer 2014-02-17 17:49:50 +01:00
Konstantin Käfer
b087c35c98 add tessellation library 2014-02-17 12:45:57 +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
da06a52056 cut down on redundant gl uniform changes 2014-02-13 16:21:51 +01:00
Konstantin Käfer
f5846e1ebb change line_strip drawing for outlines to indexed lines 2014-02-13 15:32:25 +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
f4996046a2 common buffer implementation 2014-02-10 15:14:52 +01:00
artemp
2d3abf36b1 c++
* prefer prefix increment operator unless logically necessary
  (it doesn't make any diff foro built-in type but good practice)
2014-02-06 10:50:31 +00:00
artemp
a8fef83564 c++
* use nullptr instead of NULL
2014-02-06 10:39:10 +00:00
Konstantin Käfer
cf31a80920 textured fills & enforce vao program with templates 2014-02-05 19:03:44 +01:00
Konstantin Käfer
eabd99d8f6 always pass the parameters and verify that they're correct 2014-02-05 18:46:23 +01:00
Konstantin Käfer
e94cb1b00b remove switchShader() 2014-02-05 18:35:19 +01:00
Konstantin Käfer
e30d8eb48f move to vertex array objects 2014-02-05 18:06:16 +01:00
Konstantin Käfer
e97fcda9f3 correctly specify the number of attribute elements 2014-02-05 12:38:04 +01:00
Konstantin Käfer
2df45d0c4a refactor header includes 2014-02-04 14:07:56 +01:00
Dane Springmeyer
f1e74215fd compile fixes on ubuntu precise/g++-4.8 - refs #27 2014-02-03 21:57:46 +00:00
Konstantin Käfer
9ab9eeec13 textured fills
fixes #15
2014-02-03 22:51:21 +01:00
Konstantin Käfer
bc07cb4b26 don't pass the entire tile object to changeMatrix 2014-01-30 12:37:16 +01:00
Konstantin Käfer
2b59dfae63 move static global buffers to RAII 2014-01-29 15:31:22 +01:00
Konstantin Käfer
1233537713 float[16] => std::array<float, 16> 2014-01-29 15:09:00 +01:00
Konstantin Käfer
29f0214eea linear fades 2014-01-29 14:49:11 +01:00
Konstantin Käfer
9fc749eade add matte 2014-01-29 12:43:37 +01:00
Konstantin Käfer
d5cae14770 parse line width function and call tile destructor from main thread 2014-01-29 12:25:50 +01:00
Konstantin Käfer
04e16cf2ca make line drawing work 2014-01-29 11:12:09 +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
4c08a9081b change coordinate to use null struct 2014-01-28 17:27:20 +01:00