Commit Graph

74 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
3c5bac0f6b add debug window showing the glyph atlas 2014-03-14 12:43:42 +01:00
Konstantin Käfer
be44b6b31f add glyph atlas to map 2014-03-14 11:36:10 +01:00
Konstantin Käfer
86e6e6bed8 use a custom struct for Tile IDs 2014-03-12 16:42:37 +01:00
Konstantin Käfer
91d42911fb parse the json stylesheet 2014-03-12 11:23:01 +01:00
Konstantin Käfer
f04f42df8f load new tile if it's marked as obsolete 2014-03-11 12:18:47 +01:00
Konstantin Käfer
420cb58a5d fix pedantic warnings 2014-03-11 12:10:07 +01:00
Konstantin Käfer
69a5c0e15f better support for gles2 2014-03-05 16:58:46 +01:00
Konstantin Käfer
1fbaa95b02 fix tile loading 2014-03-05 16:40:07 +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
ba5070bf52 Port scanline algorithm from _getCoveringTiles()
fixes #22
2014-03-04 14:50:17 +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
8d68bd73e7 draw a checkerboard stencil clipping mask initially 2014-02-26 12:24:17 +01:00
Justin R. Miller
78ab66b06c rename tile state ready -> parsed 2014-02-25 15:26:12 -08:00
Konstantin Käfer
0306e77ff0 remove void* parameter from platform::restart() 2014-02-21 12:18:11 +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
257ccd16bb clean up settings mechanism (fixes #9 & #62)
* init, load, persist, sync, clear
 * clean up frequent disk syncs which impacted iOS performance
 * insert disk sync into various iOS/OS X lifecycle events
 * implement clear
 * implement save on iOS
 * cleaner dictionary syntax
2014-02-13 12:21:35 -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
0ae3d3926b always rerender when calling update() 2014-02-06 16:13:41 +01: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
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
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
Konstantin Käfer
f738a9e19e initialize variables 2014-02-05 13:59:02 +01: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
Justin R. Miller
2b2ff9fb3f abstract hardcoded URLs for now 2014-02-04 11:46:06 -05:00
Konstantin Käfer
d77e3b6285 add <algorithm> headers 2014-02-04 14:14:20 +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
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
c7b012ba42 create async() function 2014-01-31 13:40:38 +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
a8b1df403c fix errors from rename of style.hpp to resources.hpp 2014-01-30 11:24:39 +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
e359d697fb buggy line support 2014-01-28 18:40:17 +01:00
Konstantin Käfer
1538ebaf22 cascade styles 2014-01-27 17:21:48 +01:00