Commit Graph

46 Commits

Author SHA1 Message Date
Konstantin Käfer
ea6b24d02d add text rendering code 2014-03-21 17:36:29 +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
be44b6b31f add glyph atlas to map 2014-03-14 11:36:10 +01:00
Konstantin Käfer
a3a1b812c8 don't pass around pointers if all we need is the state 2014-03-05 09:56:36 +01:00
Konstantin Käfer
027c6f33b3 implement tile wrapping
fixes #14
2014-03-05 09:40:32 +01:00
Konstantin Käfer
b0ddabd6ac rename Tile to TileData 2014-03-04 17:53:16 +01:00
Konstantin Käfer
1fb4451192 Merge pull request #68 from mapbox/poi-render
refs #60: first cut of POI rendering
2014-02-21 12:07:46 +01:00
Konstantin Käfer
bd2d865fc4 trigger a bogus mouse move event to interrupt glfwWaitEvents()
see https://github.com/glfw/glfw/issues/218
2014-02-21 12:05:27 +01:00
Konstantin Käfer
d5c611d707 add timeouts for panning,scaling,rotating 2014-02-21 11:31:24 +01:00
Konstantin Käfer
9710fbef99 enable texture interpolation during rotating and scaling 2014-02-19 15:39:44 +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
Justin R. Miller
0005ca4eef fixes #57: flesh out remainder of getters & setters plus animation 2014-02-12 11:20:21 -08:00
Justin R. Miller
f6642766c1 expose transform animations cancel through map 2014-02-07 12:26:39 -05:00
Justin R. Miller
e48207a4ef allow for animated moves 2014-02-06 16:08:44 -05:00
Konstantin Käfer
dd6d040cda render updates if tiles changed after movements 2014-02-06 15:44:50 +01:00
Konstantin Käfer
f756768c18 Merge remote-tracking branch 'origin/animated-scale' 2014-02-06 15:18:17 +01:00
artemp
d6654ccaed c++
* fix typedef's
* fix virtual dtor's
* make ctor's with one argument explicit
* util::noncopyable utility class  ( class my_object : private noncopyable {} )
* update kTileURL
2014-02-06 10:33:46 +00:00
Justin R. Miller
3ae58c53a2 refs #30: animated scaleBy
* add duration argument to scaleBy & setScale
 * add scale center arguments to setScale
 * add animation to Transform::setScale
2014-02-05 15:16:05 -05:00
Justin R. Miller
dbea7937b3 fixes #33: rotate around arbitrary point 2014-02-04 16:01:09 -05:00
Justin R. Miller
ca75b2a351 refs #24: Gyp-built iOS test app 2014-02-04 12:10:20 -05:00
Konstantin Käfer
2df45d0c4a refactor header includes 2014-02-04 14:07:56 +01:00
Konstantin Käfer
9ab9eeec13 textured fills
fixes #15
2014-02-03 22:51:21 +01:00
Konstantin Käfer
a6e464b9a7 add sprite object and parse image
refs #15
2014-02-03 17:38:40 +01:00
Konstantin Käfer
202e0270f7 add rapidjson for parsing sprite json files 2014-02-03 11:36:34 +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
e2dbcc95b5 draw fills according to the style 2014-01-27 14:07:56 +01:00
Konstantin Käfer
2a6e4597e2 pass style into painter 2014-01-23 16:36:04 +01:00
Konstantin Käfer
d153bdeff4 add style object 2014-01-23 15:33:00 +01:00
Konstantin Käfer
474fb42807 make it work on retina screens 2014-01-21 16:16:21 +01:00
Konstantin Käfer
209dd913f9 tile => Tile 2014-01-20 12:03:36 +01:00
Konstantin Käfer
381daf9cae make Map noncopyable 2014-01-20 11:57:30 +01:00
Konstantin Käfer
0922e71f98 transform => Transform 2014-01-20 11:57:24 +01:00
Konstantin Käfer
315efdb7f6 painter => Painter 2014-01-20 11:53:50 +01:00
Konstantin Käfer
66bac4dffd rename map => Map 2014-01-20 11:52:06 +01:00
Konstantin Käfer
22178d6832 rename settings => Settings 2014-01-20 11:50:45 +01:00
Konstantin Käfer
c01719bc04 make bundle on mac os x and persist settings 2014-01-16 13:53:10 +01:00
Konstantin Käfer
a3a5a96bfe add keyboard shortcuts for resetting position 2014-01-16 10:54:02 +01:00
Konstantin Käfer
ad26f67095 change retain algorithm to be the same as in js 2014-01-15 17:19:06 +01:00
Konstantin Käfer
44a0f98fe5 retain child tiles 2014-01-15 11:34:41 +01:00
Konstantin Käfer
60a8fdca57 fix runtime errors 2014-01-14 16:29:20 +01:00
Konstantin Käfer
654972bb3f cmake + tile loading 2014-01-13 18:07:13 +01:00
Konstantin Käfer
16d0c83df2 copy rotation behavior from js version 2014-01-09 11:04:56 +01:00
Konstantin Käfer
04d9d6b9f9 rotation support 2014-01-08 17:31:35 +01:00
Konstantin Käfer
7526d681e2 calculate proper tile position 2014-01-08 14:32:58 +01:00
Konstantin Käfer
44b43fe5a6 glfw version of sample app 2014-01-07 12:10:14 +01:00