Commit Graph

2256 Commits

Author SHA1 Message Date
Konstantin Käfer
abafb52f37 make most headers private 2014-12-04 20:02:50 +01:00
Leith Bade
20584a57dd Fix debug build 2014-12-04 23:21:23 +11:00
Konstantin Käfer
b449b22abc remove use of std::to_string in favor of boost::lexical_cast
std::to_string calls sprintf() internally, which is really slow
2014-12-04 12:59:09 +01:00
Leith Bade
1c0396690e Fixup after merge 2014-12-04 22:39:38 +11:00
Leith Bade
8f1754cf0a Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	include/mbgl/storage/base_request.hpp
	include/mbgl/storage/file_request_baton.hpp
	include/mbgl/storage/http_request.hpp
	include/mbgl/storage/http_request_baton.hpp
	include/mbgl/util/uv_detail.hpp
	platform/darwin/http_request_baton_cocoa.mm
	platform/default/caching_http_file_source.cpp
	platform/default/http_request_baton_curl.cpp
	src/map/map.cpp
	src/storage/base_request.cpp
	src/storage/file_request.cpp
	src/storage/file_request_baton.cpp
	src/storage/http_request.cpp
	src/storage/http_request_baton.cpp
2014-12-04 22:19:46 +11:00
Konstantin Käfer
65451187f5 [performance] remove use of snprintf in hot path; it's pretty slow on iOS 2014-12-04 12:19:21 +01:00
John Firebaugh
57249ca32c Prefer stdlib to libuv (fixes #688) 2014-12-03 17:38:10 -08:00
Leith Bade
991a74774e Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	gyp/mbgl-ios.gypi
	gyp/mbgl-linux.gypi
	gyp/mbgl-osx.gypi
	platform/default/caching_http_file_source.cpp
2014-12-04 08:02:57 +11:00
Mike Morris
dac76a0f92 break out FileSource as an abstract class
add CachingHTTPFileSource implementation
2014-12-03 12:25:11 -05:00
Leith Bade
772f154e4d Fix Android crash 2014-12-04 01:51:17 +11:00
Leith Bade
14cdd9c96f Rename lots of things 2014-12-04 01:10:43 +11:00
Leith Bade
a26ef7f33d Remove TODOs 2014-12-03 23:22:25 +11:00
Leith Bade
08ce7157f1 Fix debug build 2014-12-03 22:58:33 +11:00
Leith Bade
31077a813c Don't use malloc 2014-12-03 22:17:42 +11:00
Leith Bade
0899b9182a Remove old TODO 2014-12-03 22:12:05 +11:00
Leith Bade
772fe9dcbc Fix make_unique 2014-12-03 22:10:55 +11:00
Leith Bade
94d34ce7ac Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	src/map/map.cpp
2014-12-03 22:02:55 +11:00
Leith Bade
f090d6b264 Use uv::async and various other fixes 2014-12-03 21:57:55 +11:00
Konstantin Käfer
82f3574d09 add array overloads to make_unique and move it to mbgl::util from std 2014-12-03 11:27:24 +01:00
Leith Bade
8208dfaba3 Use std::lock_guard 2014-12-03 20:56:41 +11:00
Leith Bade
35b0e2bfbd Fix names in Map 2014-12-03 20:09:16 +11:00
Leith Bade
8762d5a9b6 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	include/mbgl/map/map.hpp
	src/map/map.cpp
2014-12-03 19:56:20 +11:00
John Firebaugh
50669307c5 Remove unnecessary cast 2014-12-02 12:24:26 -08:00
John Firebaugh
a6522d4a5a Texturepool ⇢ TexturePool (fixes #655) 2014-12-02 12:24:25 -08:00
John Firebaugh
8fdf645e12 Adhere to naming conventions 2014-12-02 12:24:25 -08:00
John Firebaugh
8f1772f18f More complete uv::thread 2014-12-02 12:24:25 -08:00
Leith Bade
6bfc6a2b10 Fix deadlock in tests 2014-12-02 22:13:31 +11:00
Leith Bade
0935cef9c3 Fix tests when using GL 3.0+ context 2014-12-02 21:40:23 +11:00
Leith Bade
cfb6e2752c Fix Linux build 2014-12-02 20:04:12 +11:00
Leith Bade
2b86522412 Share asset_request between platforms 2014-12-02 19:41:50 +11:00
Leith Bade
9a8c018a32 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason 2014-12-02 19:05:05 +11:00
Leith Bade
5ad094e823 Fix iOS compile 2014-12-02 03:43:04 +11:00
Leith Bade
2800f36142 Add debug markers and labels 2014-12-02 03:24:42 +11:00
Leith Bade
204700ff7e Stop mipmap allocation for textures 2014-12-02 02:29:07 +11:00
Leith Bade
763e636fd7 Improve formatting 2014-12-02 02:01:10 +11:00
Leith Bade
d27ede63fe Enable all messages 2014-12-02 01:57:18 +11:00
Leith Bade
2113e27990 Implement debug callback 2014-12-02 01:53:44 +11:00
Leith Bade
bbfe5d5ce4 Define GL callback func. Improve GL err macro. 2014-12-02 01:21:40 +11:00
Leith Bade
759e806516 Add KHR_debug definitions 2014-12-02 00:35:30 +11:00
Leith Bade
8ae2cd3985 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	README.md
	configure
	gyp/mbgl-linux.gypi
	include/mbgl/map/map.hpp
	include/mbgl/platform/default/image_reader.hpp
	include/mbgl/platform/default/jpeg_reader.hpp
	include/mbgl/platform/default/png_reader.hpp
	include/mbgl/util/uv_detail.hpp
	ios/mapbox-gl-cocoa
	platform/default/image.cpp
	platform/default/image_reader.cpp
	platform/default/jpeg_reader.cpp
	platform/default/png_reader.cpp
	src/map/map.cpp
2014-11-28 01:51:21 +11:00
Vincent Schüßler
49519ba7f3 Fix member shadowing warnings 2014-11-28 00:16:06 +11:00
Leith Bade
598df496a7 Log framebuffer errors 2014-11-28 00:11:37 +11:00
Leith Bade
eac887c1b8 Check for packed depth stencil 2014-11-28 00:11:37 +11:00
Leith Bade
705552c26e Quick fix for #608 2014-11-28 00:11:37 +11:00
John Firebaugh
7901706094 Use uv::async 2014-11-26 17:37:13 -08:00
John Firebaugh
f91322cf4a Remove unused 2014-11-26 16:34:03 -08:00
John Firebaugh
0d5e1339ef Remove vague comments 2014-11-26 16:08:10 -08:00
John Firebaugh
84c3191044 Eliminate Map::getActiveSources() 2014-11-26 16:04:22 -08:00
John Firebaugh
12bf2fd326 Inline Source::updateTiles() 2014-11-26 16:01:15 -08:00
John Firebaugh
78f11ae947 Fix destruction order 2014-11-26 15:13:14 -08:00