Commit Graph

54 Commits

Author SHA1 Message Date
Konstantin Käfer
6a78a4763d [iOS] fix benchmarking app and update to style v8 2015-10-02 14:57:26 +02:00
John Firebaugh
028abaab00 Ensure that LiveTileData can be reparsed
Annotation tiles may become partially parsed just like regular tiles,
for example if a point annotation is added to the map before the style's
sprite has been loaded. In such cases, they need to be reparsed or the
annotation will not be rendered. Previously, the code path for reparsing
would be short-circuited by a dynamic_cast<VectorTileData*> followed by
a null check. This commit removes that case and adds (back) a virtual
reparse method to the TileData interface.
2015-09-28 14:10:00 -07:00
Lucas Wojciechowski
f536db3116 Add node_modules to .gitignore 2015-09-17 15:49:54 -07:00
Mike Morris
4694c7b51a fix example, clean up duplicate files 2015-09-01 16:08:46 -04:00
Mike Morris
0e79d56b09 move package.json and binding.gyp to root, drop tiles.tilejson 2015-09-01 15:51:29 -04:00
Mike Morris
3fea9d3878 'make node' compiles! 2015-08-25 14:30:13 -04:00
Konstantin Käfer
e6053aa547 Make build system architecture agnostic to remove Android special case 2015-08-04 14:08:58 +02:00
Brad Leege
641046138c Adding extraneous settings files to gitignore 2015-06-22 13:10:45 -05:00
Thiago Marcos P. Santos
4b061a0588 Add output of RepeatedRender test to .gitignore
Also delete files that are test output but were checked in.
2015-05-15 12:34:57 +03:00
Konstantin Käfer
24083c582c [iOS] add benchmarking application 2015-05-05 11:53:20 +02:00
John Firebaugh
9e4a03fd9d Ignore test generated files 2015-04-28 14:32:23 -04:00
Konstantin Käfer
48c55af5c1 fix sprites for pixel ratios that are not 1 and 2
- OpenGL ES 2 doesn't allow NPOT textures with wrap-around
- The Sprite object reported the map's pixelRatio, even though it loaded @2x assets
- Copying icons from the sprite into the atlas now uses bilinear scaling to scale up to the actual size
2015-03-17 12:30:40 +01:00
Konstantin Käfer
47ede853c4 fixes black flicker on rotating the device
fixes #838

instead of rendering ad libitum on the map thread, we are now driving rendering from the UI thread on iOS via the map.renderSync() function. There are still white bars during the rotation, but the general content of the view is kept visible.

- upgrades GLFW to 3.1
- removes swapped/needsSwap in favor of a more explicit scheme
- View#invalidate() now replaces View#swap() and is called whenever the View needs to trigger a rerender. GLFW and Android to this right away, while iOS goes back to the main thread and does the Map redrawing as part of the GLKView update
- sets all iOS deployment targets to 7.0
- disables SQLite3 version check, since the library version changed on iOS 8.2
2015-03-12 12:16:38 +01:00
Justin R. Miller
d4d4cd4415 move iOS code from gl-cocoa to this project 2015-02-09 18:01:40 -08:00
Konstantin Käfer
da981e7825 move config files to config/ folder 2015-02-04 18:07:32 +01:00
Konstantin Käfer
f66862b422 don't use -schema for building xcode projects 2015-02-04 11:54:02 +01:00
Konstantin Käfer
69975c7094 make different abis for android 2015-02-04 10:49:09 +01:00
Konstantin Käfer
3d51e116a8 use fake linker for merging the standalone static library 2015-02-04 10:49:08 +01:00
Konstantin Käfer
8a1fce547e rearrange tests and add storage tests 2015-02-04 10:49:05 +01:00
Leith Bade
de9eb00276 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	.gitignore
	gyp/mbgl-ios.gypi
	gyp/mbgl-linux.gypi
	gyp/mbgl-osx.gypi
	include/mbgl/map/map.hpp
	src/mbgl/map/map.cpp
	src/mbgl/storage/caching_http_file_source.cpp
2014-12-05 23:16:49 +11:00
Konstantin Käfer
abafb52f37 make most headers private 2014-12-04 20:02:50 +01:00
Leith Bade
16c8b3198a Ignore *~ 2014-11-15 19:50:33 +11:00
Leith Bade
30235e5832 Ignore config-android.gypi 2014-11-04 22:36:19 +11:00
John Firebaugh
551ff954a5 Remove unused 2014-11-01 11:53:04 -04:00
Konstantin Käfer
080c185ea1 remove dependency on node 2014-10-31 16:02:41 -04:00
Dane Springmeyer
46739eb776 remove directories from ignores 2014-10-30 16:06:37 -04:00
Konstantin Käfer
2dbe9edb06 write to correct file and add to gitignore 2014-10-22 12:01:56 +02:00
John Firebaugh
a634605176 Kill config.mk (fixes #456) 2014-09-03 14:59:18 -07:00
Mike Morris
fae1c157f6 build fixes 2014-08-11 13:24:25 -04:00
Mike Morris
54a81d0f9b migrate style_parser tests to use info and style json fixtures 2014-07-18 14:09:33 -04:00
Konstantin Käfer
4ea281c750 rename llmr => mbgl 2014-07-16 18:53:56 -07:00
Konstantin Käfer
ce541a962e fuzzy image comparison + create diff images 2014-07-09 15:07:48 -07:00
Konstantin Käfer
37bd80dd9d add html result table 2014-07-09 13:10:07 -07:00
Konstantin Käfer
d0d68d08f4 fix automated headless testing on travis 2014-07-09 12:37:59 -07:00
Konstantin Käfer
5fe36a3cb0 add node_modules to gitignore 2014-07-09 11:04:44 -07:00
Konstantin Käfer
af69b4fe39 unifiy constants in one place, and allow local override 2014-06-04 11:22:03 +02:00
Justin R. Miller
a81a336638 programmatic styling API 2014-05-31 11:32:42 -07:00
Dane Springmeyer
925c64d906 gitignore cleanup after build improvements 2014-05-30 11:29:47 -07:00
Dane Springmeyer
03a7a7e64a add DS_Store to ignores [skip ci] 2014-05-27 19:25:24 -07:00
Dane Springmeyer
9e7ee02fcd remove generated shaders from git - Closes #241 2014-05-23 16:41:08 -07:00
Konstantin Käfer
662562d9fe use mapnik-packaging to build all dependencies 2014-04-09 15:57:21 -04:00
Konstantin Käfer
249b42a29d move node modules to bin/ folder to fix build 2014-03-26 11:51:05 +01:00
Konstantin Käfer
e427f51dd4 remove generated files 2014-03-25 13:25:35 +01:00
Konstantin Käfer
77f58960c4 build shaders for either desktop gl or gles2 2014-03-25 13:16:48 +01:00
Konstantin Käfer
713acbb4a3 add package.json with reference to shader optimizer 2014-03-25 12:39:51 +01:00
Konstantin Käfer
2d83e89e41 ignore object files 2014-03-05 16:43:58 +01:00
Konstantin Käfer
4e73a4d47c Merge branch 'master' into tessellation
Conflicts:
	include/llmr/renderer/fill_bucket.hpp
	src/renderer/fill_bucket.cpp
	src/renderer/painter.cpp
2014-02-28 12:25:45 +01:00
Konstantin Käfer
4418f2d1c8 remove remnants of emscripten 2014-02-21 12:34:39 +01:00
Justin R. Miller
ca75b2a351 refs #24: Gyp-built iOS test app 2014-02-04 12:10:20 -05:00
Justin R. Miller
2f387bf69f remove old CMake ignore 2014-02-03 17:55:15 -05:00