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
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
Justin R. Miller
4f9b0e2109
only run shader rebuild when files are changed
2014-02-13 15:48:18 -08:00
Justin R. Miller
1424634659
automatically build shaders during Xcode builds
2014-02-13 15:34:22 -08:00
Justin R. Miller
f887025b1d
add shader sources to project for easier editing
2014-02-13 15:24:39 -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
62c79e05cd
refs #43 : rename render methods for clarity
2014-02-13 11:27:22 -08:00
Justin R. Miller
1c6e16c0bb
s/view/mapView/ as on iOS for clarity
2014-02-13 10:53:49 -08:00
Justin R. Miller
6a6118f66b
update iOS hardware target note
2014-02-13 09:03:45 -08:00
Konstantin Käfer
a868602069
use proper tile size
2014-02-13 17:37:32 +01:00
Konstantin Käfer
b0357e8ea7
move tile size to constants.hpp
2014-02-13 17:34:08 +01:00
Konstantin Käfer
2f32d1585d
make sure we don't encode the first vertex twice
2014-02-13 17:19:49 +01:00
Konstantin Käfer
1cab7f07bd
remove all mentions of degenerate things
2014-02-13 16:37:16 +01:00
Konstantin Käfer
51f526dd6a
remove addDegenerate()
2014-02-13 16:36:30 +01: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
1a05832a93
Merge branch 'master' of https://github.com/mapbox/llmr-native
2014-02-13 12:15:27 +01:00
