Commit Graph

294 Commits

Author SHA1 Message Date
Justin R. Miller
3232ecc94d Merge branch 'master' into tile-cancels 2014-02-21 16:36:15 -08:00
Justin R. Miller
675b8eb1fe refs #60: size POIs properly based on pixel ratio 2014-02-21 16:25:42 -08:00
Justin R. Miller
7a48e8ddce move to linear properties for POI opacity 2014-02-21 16:22:45 -08:00
Justin R. Miller
b6d7169b83 refs #60: add support for point colorization & opacity 2014-02-21 16:00:55 -08:00
Justin R. Miller
495d47ab42 refs #60: add some more point styles 2014-02-21 16:00:01 -08:00
Justin R. Miller
e59a5f1c1a Merge branch 'master' into tile-cancels 2014-02-21 14:18:48 -08:00
Konstantin Käfer
32da0768b7 add missing include for size_t 2014-02-21 13:12:31 +01:00
Konstantin Käfer
54735ddd9e rename -osx project to -x86 2014-02-21 13:08:25 +01:00
Konstantin Käfer
e382cab17d make implicit type conversions explicit 2014-02-21 13:08:13 +01:00
Konstantin Käfer
4418f2d1c8 remove remnants of emscripten 2014-02-21 12:34:39 +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
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
a9198570ea revert shader 2014-02-21 10:41:22 +01:00
Justin R. Miller
49f9439b07 add image debugging 2014-02-20 15:53:46 -08:00
Justin R. Miller
9e762f91eb gl_pointCoord requires GL_POINT_SPRITE on OS X 2014-02-20 15:53:17 -08:00
Justin R. Miller
cfbde82429 only post activity notification once after cancels 2014-02-20 00:16:54 -08:00
Justin R. Miller
eac69ae30c move to cancellable tile-specific fetches on OS X 2014-02-19 23:13:20 -08:00
Justin R. Miller
536e0343c9 only post needs render notification on successful tiles 2014-02-19 23:10:09 -08:00
Justin R. Miller
d94b8bbcec make use of new tile-specific fetches to allow cancellation 2014-02-19 23:09:48 -08:00
Justin R. Miller
fded15dab0 add tile-specific platform HTTP request 2014-02-19 18:40:17 -08:00
Justin R. Miller
2bb6163f64 moves from NSURLConnection to NSURLSession on iOS 2014-02-19 18:38:05 -08:00
Justin R. Miller
66a2c994ac clean up platform comments 2014-02-19 17:54:00 -08:00
Justin R. Miller
1f2150fcd7 add argument clarity to platform::request_http declaration 2014-02-19 17:53:45 -08:00
Justin R. Miller
9fbe5b2ece properly deregister render observers 2014-02-19 17:51:30 -08:00
Justin R. Miller
0f2beb6992 refs #72: clarity around bg/fg functions 2014-02-19 12:45:05 -08:00
Justin R. Miller
cfbb8e9f7d minor objc style stuff 2014-02-19 12:44:47 -08:00
Justin R. Miller
2989b456a4 properly make use of platform::restart on iOS 2014-02-19 12:41:57 -08:00
Justin R. Miller
3a5dbdb5cc iOS stylistic changes 2014-02-19 12:41:35 -08:00
Justin R. Miller
73f06b39bc fixes #72: clean up & make callbacks clearer 2014-02-19 12:41:15 -08:00
Justin R. Miller
cbf96ba1c6 minor formatting 2014-02-19 12:27:23 -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
2602774a9c bind texture 0 2014-02-19 14:48:54 +01:00
Konstantin Käfer
06e23543cb don't use degenerate vertices 2014-02-19 14:48:34 +01:00
Konstantin Käfer
8880379b31 set the point size 2014-02-19 14:47:58 +01:00
Konstantin Käfer
dcb6c2b787 calculate the proper pixelRatio 2014-02-19 14:47:26 +01:00
Konstantin Käfer
504b60b93e don't used element arrays 2014-02-19 14:46:50 +01:00
Konstantin Käfer
420e534306 fix stride to avoid bogus points at 0/0 2014-02-19 14:43:57 +01:00
Ansis Brammanis
baa4981c3b persist settings to /tmp/llmr-native.json 2014-02-18 08:40:14 -05:00
Ansis Brammanis
c4313c25ae async http requests for linux wrapper 2014-02-18 06:40:05 -05: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
d1910f0e04 Merge branch 'master' of https://github.com/mapbox/llmr-native 2014-02-14 11:27:46 +01:00
Justin R. Miller
4ff01fb07f allow for easier editing of style in Xcode
* write protobuf directly to file instead of stdout (for Gyp)
 * add style.js to editable sources
 * add build phases for pbf conversion & resources updates
 * update README style directions
2014-02-13 16:24:00 -08:00
Justin R. Miller
e08b318c59 better spacing in gyp conf 2014-02-13 15:53:02 -08:00