Commit Graph

23 Commits

Author SHA1 Message Date
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
74768abeb8 make sure we call the sprite load callback 2014-04-30 12:58:38 +02:00
Konstantin Käfer
1216a061d3 move to libuv for the rendering loop 2014-04-30 12:01:26 +02:00
Konstantin Käfer
666f593803 use an event loop per map that is not the render thread 2014-04-25 14:26:59 +02:00
Konstantin Käfer
305e688a3a clean up os x + ios request code
fixes #129
2014-04-14 11:47:57 -04:00
Konstantin Käfer
eb499e77c1 fix linejoin drawing on retina 2014-04-10 11:49:43 -04: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
50d4c97b64 whitespace + comments 2014-03-11 12:09:23 +01:00
Konstantin Käfer
e382cab17d make implicit type conversions explicit 2014-02-21 13:08:13 +01:00
Konstantin Käfer
5f64ecc3cc Merge branch 'master' into linux-wrapper
Conflicts:
	include/llmr/style/sprite.hpp
2014-02-21 12:26:16 +01:00
Konstantin Käfer
0306e77ff0 remove void* parameter from platform::restart() 2014-02-21 12:18:11 +01:00
Konstantin Käfer
2602774a9c bind texture 0 2014-02-19 14:48:54 +01:00
Konstantin Käfer
c0997961aa don't use std::string to hold the image 2014-02-17 17:58:34 +01:00
Konstantin Käfer
9fb05741d6 make sure that mapView is initialized before referencing into it 2014-02-17 17:55:47 +01:00
Ansis Brammanis
9d89bc0909 first attempt at linux wrapper 2014-02-17 10:27:31 -05: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
9553bfa159 revert back to 32767 2014-02-06 15:29:23 +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
Dane Springmeyer
5b783f4eb1 fix sprite.cpp compile on linux - refs #27 2014-02-03 23:02:02 +00:00
Konstantin Käfer
e478ae2a2d allow binding the sprite object
refs #15
2014-02-03 17:44:12 +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