Konstantin Käfer
bff6aeb4da
switch to plain file streams rather than JSON
2014-12-04 20:00:41 +01: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
John Firebaugh
57249ca32c
Prefer stdlib to libuv ( fixes #688 )
2014-12-03 17:38:10 -08:00
John Firebaugh
10ebcbca93
Remove unused
2014-12-03 13:42:02 -08:00
Mike Morris
e87a6d1871
Merge branch 'master' 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-03 13:07:49 -05:00
Mike Morris
dac76a0f92
break out FileSource as an abstract class
...
add CachingHTTPFileSource implementation
2014-12-03 12:25:11 -05:00
Leith Bade
14cdd9c96f
Rename lots of things
2014-12-04 01:10:43 +11:00
Leith Bade
6be8c840bb
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
2014-12-03 23:03:14 +11:00
Leith Bade
08ce7157f1
Fix debug build
2014-12-03 22:58:33 +11:00
Leith Bade
9db5d2ac55
Remove boost::make_unique
2014-12-03 22:27:40 +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
Konstantin Käfer
dbdc64592c
don't set the window title on every frame
...
this is a significant performance penalty, at least on OS X, and drops our frame rate below 60fps on even simple scenes. instead of showing the position of the map in the window, we should display it elsewhere
2014-12-03 11:59:39 +01: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
e16f9cb291
Fix accidentally commented code
2014-12-03 20:47:05 +11:00
Leith Bade
3058cd2d60
Remove old TODO
2014-12-03 20:43:36 +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
42966004f3
Merge pull request #670 from mapbox/gl-debug
...
Use GL debug callbacks
2014-12-02 19:02:16 +11:00
Mike Morris
7e7b85e132
fix memcpy includes/namespace
2014-12-01 13:49:47 -08:00
Mike Morris
0fd7f26533
move pixel flip from headless test into HeadlessView::readPixels
2014-12-01 16:36:11 -05:00
Leith Bade
2800f36142
Add debug markers and labels
2014-12-02 03:24:42 +11:00
Leith Bade
66349e33ab
Add GL_ARB_debug_output
2014-12-02 03:09:09 +11:00
Leith Bade
6998c6ecb9
Load KHR_debug on Linux
2014-12-02 00:44:08 +11:00
Leith Bade
c8552e1b28
Fix VAOs on Linux
2014-12-02 00:05:45 +11:00
Leith Bade
e5317b5237
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
2014-11-30 12:17:52 +11:00
artemp
2586cfb9e3
use ``const var&`` notation in public interface
2014-11-27 18:11:18 +01: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
artemp
6d62aad0ed
image_readers: premultiply alpha
2014-11-28 00:15:05 +11:00
artemp
fc805cc41c
image-readers: move concrete implementations headers into platform/default
2014-11-28 00:15:04 +11:00
artemp
3f8efa6985
move std.hpp include into image_reader.hpp (g++)
2014-11-28 00:15:04 +11:00
artemp
8c524e1ac6
return unique_ptr from get_image_reader
2014-11-28 00:15:04 +11:00
artemp
a2a303a1d1
ensure all exceptions are caught in Image ctor
2014-11-28 00:15:04 +11:00
artemp
fcebd44571
simplify image_readers creation implementation
...
* remove static callbacks registration
* link png_reader/jpeg_reader into mbgl-linux lib
2014-11-28 00:15:04 +11:00
artemp
33cc51c1d2
image-readers: only register readers that are used
...
create_png_reader(char const* data, size_t size)
create_jpeg_reader(char const* data, size_t size)
2014-11-28 00:15:04 +11:00
artemp
34d9d55846
fix png_reader
2014-11-28 00:15:04 +11:00
artemp
15973741d5
simplify factory class to not rely on singleton + cleanups
2014-11-28 00:14:15 +11:00
artemp
46e9d46028
remove unused pragmas
2014-11-28 00:14:15 +11:00
artemp
447bec6281
fix linux build
2014-11-28 00:14:15 +11:00
artemp
0a532cc420
cleanups
2014-11-28 00:14:15 +11:00
artemp
ae2d4e740e
add image_reader abstraction layer to hanfle multiple image formats
...
(work-in-progress)
2014-11-28 00:14:11 +11:00
artemp
8f3d2d4a45
Merge branch 'master' into nunicode
2014-11-27 11:43:13 +01:00
artemp
84551d9349
convert image_reader public interface to use CamelCase to match the rest of codebase
2014-11-26 17:50:12 +01:00
Leith Bade
a438459e3b
Rewrite EGL config choosing
2014-11-22 21:40:49 +11:00
artemp
4af232dcf3
image_readers: premultiply alpha
2014-11-21 11:28:56 +01:00
artemp
f89c9753dd
image-readers: move concrete implementations headers into platform/default
2014-11-19 16:56:53 +01:00
