Commit Graph

138 Commits

Author SHA1 Message Date
Minh Nguyễn
f7a598139f Fixed test breakage from 501f9701cd
Unlike iOS, OS X does not consider OpenGL.framework to be a standard library, so LINK_WITH_STANDARD_LIBRARIES does not pull it in.

Ref #1099, #1105
2015-03-27 15:44:06 -07:00
Minh Nguyễn
32aa865f14 Merge branch 'ios-unused'
Left in MGLTypes.h, which is now a platform-neutral (iOS + OS X) place for MGLUserTrackingMode.
2015-03-26 15:12:15 -07:00
Minh Nguyễn
501f9701cd Merge pull request #1105 from mapbox/1099-gyp-deps
Enable modules in iOS demo app
2015-03-26 10:35:34 -07:00
Justin R. Miller
f3058dbc9a closes #1082, refs #756: user dot on map in iOS 2015-03-25 17:48:22 -07:00
Minh Nguyễn
de9255f002 Enabled modules in iOS demo app
No longer need to explicitly link system frameworks like UIKit.
2015-03-25 15:07:35 -07:00
Justin R. Miller
10a30daed6 refs #894, fixes #1074: callout views for iOS 2015-03-24 18:43:24 -07:00
Brad Leege
044d1fc3c2 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into 1033-metrics
Conflicts:
	gyp/platform-ios.gypi
	platform/ios/MGLMapView.mm
	styles
2015-03-23 10:52:27 -05:00
Justin R. Miller
0e2d6c8277 fixes #1053: umbrella Cocoa header 2015-03-22 12:25:10 -07:00
Justin R. Miller
ecb8e2800d Cocoa annotations API 2015-03-22 00:53:36 -07:00
Brad Leege
8a73f2186a #1033 - Adding CoreTelephony dependency and fixing access token setting method name. 2015-03-20 16:37:49 -05:00
Brad Leege
ec304d37ac #1033 - Integrating MapboxEvents class. 2015-03-20 16:01:52 -05:00
Brad Leege
253643f57d #1033 - Renaming MBLocationManager to MGLMetricsLocationManager to better comply with naming scheme. 2015-03-20 11:37:50 -05:00
Brad Leege
c42e83fcc6 #1033 - Moving MBLocationManager to Core GL from app specific instance. 2015-03-20 11:11:06 -05:00
John Firebaugh
645d1f3857 Delete unused code
This code appears to be unused and has not been kept in sync with style
spec changes.
2015-03-19 14:45:59 -07: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
5e40f72b7c scripts for running linux tests with docker 2015-03-13 12:06:11 +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
Konstantin Käfer
9781785ab7 scope Requests to an Environment object for easier cancelation
we are now scoping all file requests to an environment object. The FileSource implementation treats
this as an opaque pointer, but allows canceling all Requests that are associated with that pointer.
This is necessary to abort all file requests that originated from a particular Map object. Aborting
a file request is different from canceling a file request: A canceled request doesn't have its
callback called, while an aborted request will have its callback called with an error, indicating
that the environment is going to be shut down.
2015-03-06 08:21:47 -08:00
Konstantin Käfer
b29bce0936 add ca bundle loading back to CURL 2015-02-17 11:42:47 -08:00
Konstantin Käfer
fe0baffe0d update uv_zip and add tests 2015-02-16 18:30:19 -08:00
Leith Bade
8f416ee2d5 Add assetRoot for Android 2015-02-10 19:33:22 -08:00
Mike Morris
eaef4c0874 chmod +x python builds scripts, run directly instead of with python gyp var 2015-02-10 14:09:32 -08: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
73f7db9af2 cleanup makefiles 2015-02-04 11:54:01 +01:00
Mike Morris
f987166ee8 don't drop -L flags 2015-02-04 10:49:09 +01:00
Konstantin Käfer
69975c7094 make different abis for android 2015-02-04 10:49:09 +01:00
Konstantin Käfer
50d78fde85 fix install script 2015-02-04 10:49:09 +01:00
Mike Morris
4b3689d18e fix install.gypi deps 2015-02-04 10:49:09 +01:00
Konstantin Käfer
29baacf3a5 refactor makefile 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
46553ff00c rework linux gyp files 2015-02-04 10:49:08 +01:00
Konstantin Käfer
704b3719f5 use standard DEBUG macro rather than NDEBUG 2015-02-04 10:49:07 +01:00
Konstantin Käfer
8730120054 move variables to their own file 2015-02-04 10:49:07 +01:00
Konstantin Käfer
272fa8935e make storage lib separate so we can build without storage libs 2015-02-04 10:49:07 +01:00
Konstantin Käfer
fbe30e04c4 move ios-specific configuration to common.gypi 2015-02-04 10:49:07 +01:00
Konstantin Käfer
9a549094e0 make ios compile 2015-02-04 10:49:06 +01:00
Konstantin Käfer
4cbe665f7d add symbols to Release builds for easier debugging 2015-02-04 10:49:06 +01:00
Konstantin Käfer
8a1fce547e rearrange tests and add storage tests 2015-02-04 10:49:05 +01:00
Konstantin Käfer
31a0d18ca1 remove circular shared_ptr and a few other memory leaks 2015-02-04 10:49:05 +01:00
Konstantin Käfer
b9bf66e67e rewrite storage layer to be independent of the Map's event loop 2015-02-04 10:46:37 +01:00
Leith Bade
33f611cdf8 Fix -W flags for boost
Fixes #801
2015-02-03 11:38:43 -08:00
Dane Springmeyer
33b4922220 Adapt to c104c2f972 and 49fd477740 2015-02-02 15:18:01 -08:00
Leith Bade
aaedd9c83b Remove program binary caching 2015-01-27 12:38:40 +11:00
Leith Bade
b7cc6bfaa6 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	src/mbgl/shader/shader.cpp
2015-01-15 11:39:50 +11:00
Mike Morris
1b2f38d330 pass sqlite3_static_libs in install.gypi 2015-01-13 14:31:50 -05:00
Mike Morris
f1609ef329 include sqlite3_static_libs in linker flags 2015-01-13 14:31:50 -05:00
Mike Morris
fa0d20194e break out version.hpp copy task into a separate gyp target to eliminate a possible race condition in parallel builds 2015-01-13 14:15:48 -05:00
Leith Bade
1dd3ad8e64 Fix build 2014-12-18 20:35:55 +11:00
Leith Bade
40f859e482 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	gyp/mbgl-ios.gypi
	gyp/mbgl-osx.gypi
	platform/default/asset_request_libuv.cpp
	src/mbgl/storage/caching_http_file_source.cpp
	src/mbgl/storage/file_request.cpp
	src/mbgl/storage/file_request.hpp
	src/mbgl/storage/file_request_baton.hpp
2014-12-18 12:39:36 +11:00
Konstantin Käfer
b5e9998b15 change file:// to asset:// to indicate that they aren't arbitrary files
refs #579
2014-12-17 14:59:05 +01:00