John Firebaugh
c32f7dfa88
Merge branch 'master' into shader-performance
2015-01-07 15:15:11 -08:00
Leith Bade
ff3ea3e20b
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
...
Conflicts:
platform/default/glfw_view.cpp
platform/default/headless_view.cpp
src/mbgl/map/map.cpp
2014-12-23 11:33:26 +13:00
Leith Bade
0771e50460
Rename View functions to match conventions. Also tidy up view classes and remove C style casts. Closes #656
2014-12-23 09:29:45 +13:00
Leith Bade
df19683b6a
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
...
Conflicts:
Makefile
platform/default/headless_view.cpp
src/mbgl/map/map.cpp
2014-12-21 15:02:47 +13:00
Leith Bade
15b47197a7
Use iostream for saving GL program binary. Also check for GL_NUM_PROGRAM_BINARY_FORMATS > 0.
2014-12-20 15:08:06 +13:00
John Firebaugh
4a2cf4aa62
Merge pull request #718 from mapbox/cli-render
...
CLI render
2014-12-18 18:00:33 -08:00
Leith Bade
1dd3ad8e64
Fix build
2014-12-18 20:35:55 +11:00
Leith Bade
f73eebe47c
Add run to AssetRequest
2014-12-18 18:41:44 +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
abcf978174
change comment and cache value
2014-12-17 15:01:15 +01: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
Konstantin Käfer
936e096514
Make file request overridable by platform implementations
...
refs #579 : Android can now rename AssetRequest to FileRequest and implement it differently
2014-12-17 12:14:32 +01:00
Konstantin Käfer
40a5bcd7d3
never create core profile contexts; their API is subtly different
...
(e.g. glGetString(GL_EXTENSIONS) doesn't work, you'd have to use glGetStringi(GL_EXTENSIONS, ...);)
2014-12-16 11:10:41 +00:00
Konstantin Käfer
9082a83d6a
don't assing nullptr to std::string
2014-12-16 11:42:58 +01:00
Konstantin Käfer
abf702046b
use correct enum
2014-12-12 12:37:55 +01:00
Leith Bade
d599fc5504
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
...
Conflicts:
platform/default/glfw_view.cpp
platform/default/headless_view.cpp
src/mbgl/renderer/painter.cpp
src/mbgl/renderer/prerendered_texture.cpp
2014-12-11 00:09:26 +11:00
Konstantin Käfer
93d56294cf
update error reporting function
2014-12-10 13:21:08 +01:00
Leith Bade
0808485453
Use CHECK_ERROR on every GL call
2014-12-10 21:57:34 +11:00
Leith Bade
6bb1a5a146
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
...
Conflicts:
include/mbgl/platform/default/headless_view.hpp
platform/default/glfw_view.cpp
platform/default/headless_view.cpp
2014-12-10 19:22:25 +11:00
Leith Bade
69cd7268d7
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
...
Conflicts:
platform/default/http_request_baton_curl.cpp
2014-12-10 19:13:21 +11:00
Konstantin Käfer
5ccc988ff7
fix typo
2014-12-09 14:55:32 +01:00
Leith Bade
d2792e2987
Tidy up HeadlessView
2014-12-09 21:47:30 +11:00
Konstantin Käfer
e11c073e51
report version number in user agent string
...
refs #628
2014-12-08 16:21:15 +01:00
Konstantin Käfer
1f91be988b
add user agent header
...
fixes #628
2014-12-08 11:04:08 +01:00
Leith Bade
886b622a92
Add pakced depth stencil to GLFWView and HeadlessView
2014-12-07 00:40:44 +11:00
Leith Bade
b534520d6c
Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
...
Conflicts:
include/mbgl/platform/gl.hpp
src/mbgl/platform/gl.cpp
src/mbgl/shader/shader.cpp
2014-12-07 00:29:20 +11:00
Leith Bade
6df4e4a52c
Load program binary extension on Linux
2014-12-06 14:21:08 +11:00
Leith Bade
93ab4036e9
Fix commit
2014-12-06 00:50:23 +11: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
John Firebaugh
0a942b6f14
Change Map::stop to use std::function<void()>
...
Fixes #685
2014-12-04 15:58:04 -08:00
John Firebaugh
9aff2c386c
Remove invalid map->terminate()
...
Map has already been destroyed by this point, so the
call is invalid. The work that terminate() would do
has already been done.
2014-12-04 14:31:29 -08:00
Konstantin Käfer
abafb52f37
make most headers private
2014-12-04 20:02:50 +01:00
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
0935cef9c3
Fix tests when using GL 3.0+ context
2014-12-02 21:40:23 +11:00
