Commit Graph

2311 Commits

Author SHA1 Message Date
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
f20a17a291 Merge pull request #748 from mapbox/fix-swap
Correctly handle swapping
2015-01-13 09:23:28 +11:00
John Firebaugh
bac75f1c7a Allow characters outside \w to be used in token
https://github.com/mapbox/mapbox-gl-js/pull/926
2015-01-12 10:17:01 -08:00
John Firebaugh
ab7122831a Merge pull request #747 from mapbox/fix-resize
Correctly call resize with width and height
2015-01-12 10:15:31 -08:00
Leith Bade
f05a530529 Correctly handle swapping. Fixes #666 2015-01-12 13:50:00 +11:00
Leith Bade
6aee86d5ff Correctly call resize with width and height. Fixes #746 2015-01-12 13:30:40 +11:00
Ansis Brammanis
166a3e21fa rephrase line uniform calculations to match js
js: 359a576471e20373333cae80a5eccda95ee4cdc2
2015-01-08 14:40:19 -05:00
Ansis Brammanis
59b51f0a9f fix fill pattern spacing
js: 22e24f7f67c4db89d09c0b65df67d0fcf1c3b614
2015-01-08 14:00:06 -05:00
John Firebaugh
c32f7dfa88 Merge branch 'master' into shader-performance 2015-01-07 15:15:11 -08:00
John Firebaugh
7eaa4fabde Merge pull request #731 from mapbox/view-rename
Rename View functions to match conventions
2014-12-22 13:14:44 -08: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
2731b582f2 Merge pull request #729 from mapbox/shader-iostream
Use iostream for saving GL program binary + check GL_NUM_PROGRAM_BINARY_FORMATS  > 0
2014-12-20 15:15:43 +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
Konstantin Käfer
a8dec01230 Merge pull request #723 from mapbox/overridable-file-request
Make FileRequest overridable by platform implementations
2014-12-17 15:12:34 +01: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
Jon Rowe
02e43c6d30 Update READMD.md for OS X Yosemite 2014-12-16 11:51:19 -08:00
Justin R. Miller
c3d2f3e664 indicate submodule setup in common header of install info 2014-12-16 11:47:29 -08:00
Konstantin Käfer
e57c57516f automatically copy the certificate bundle 2014-12-16 12:17:40 +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
Mike Morris
b5ed45a6f6 Merge pull request #721 from mapbox/clear-loop
fix CachingHTTPFileSource::clearLoop
2014-12-15 15:12:48 -05:00
Mike Morris
3a8036413f fix CachingHTTPFileSource::clearLoop 2014-12-15 14:32:48 -05:00
Konstantin Käfer
57e6bc6e1b fix error in non-debug builds 2014-12-15 14:16:30 +01:00
Konstantin Käfer
21e9e0a5ea set rendering mode so that we can skip intermediate renders for static images 2014-12-12 15:01:09 +01:00
Konstantin Käfer
abf702046b use correct enum 2014-12-12 12:37:55 +01:00
Konstantin Käfer
6cabaf0230 provide explicit constructor to appease GCC 2014-12-12 12:37:55 +01:00
Konstantin Käfer
bec97a3d40 warp in MBGL_CHECK_ERROR() call 2014-12-12 12:37:55 +01:00
Konstantin Käfer
febfb7ac09 fix rendering errors 2014-12-12 12:37:55 +01:00
Konstantin Käfer
f8ba23377d [performance] remove glFlush() 2014-12-12 12:37:55 +01:00
Konstantin Käfer
2648e6a964 add debug line for showing the sprite atlas 2014-12-12 12:37:55 +01:00
Konstantin Käfer
06735c6544 depend on mbgl-core instead of -standalone so we don't have to run the packaging script every time
(this speeds up the build slightly)
2014-12-12 12:37:55 +01:00
Konstantin Käfer
5b14c85b78 use 4-byte aligned vertex attributes for performance reason
reverts 9d5f02ccaa and 4c0b4a7901
2014-12-12 12:37:54 +01:00
Konstantin Käfer
1fe545aee4 fix crashes when running in non-continuous mode 2014-12-11 18:32:25 +01:00
Konstantin Käfer
a4ce5152e8 don't provide a default value for the stylesheet file 2014-12-11 18:32:09 +01:00
Konstantin Käfer
343fd4bcac allow setting the cache database 2014-12-11 18:31:56 +01:00
Konstantin Käfer
41d9e7730f add xcode project for render cli util 2014-12-11 18:31:32 +01:00
Konstantin Käfer
8b5bba08b3 show default values and allow setting the output filename 2014-12-11 18:02:24 +01:00
Konstantin Käfer
a81e822ef0 add cli tool for rendering a map to an image 2014-12-11 17:58:36 +01:00
Konstantin Käfer
0c62cd0655 Merge pull request #711 from mapbox/check-gl-error
Use CHECK_ERROR on every GL call
2014-12-10 13:55:39 +01:00
Konstantin Käfer
4ad28c931a only report STACK_OVERFLOW/STACK_UNDERFLOW when the GL implementation has them 2014-12-10 13:46:26 +01:00
Konstantin Käfer
93d56294cf update error reporting function 2014-12-10 13:21:08 +01:00
Leith Bade
127600ef8c Fix unused param 2014-12-10 22:23:53 +11:00
Leith Bade
08b07c30a7 Reduce GL log spew 2014-12-10 22:15:41 +11:00
Leith Bade
0808485453 Use CHECK_ERROR on every GL call 2014-12-10 21:57:34 +11:00
Mike Morris
392150dd48 Merge pull request #707 from mapbox/start-group
wrap mbgl-core and mbgl-linux in -Wl,--start-group/-Wl,--end-group
2014-12-09 12:11:12 -05:00
Mike Morris
538120bb7f wrap mbgl-core and mbgl-linux in -Wl,--start-group/-Wl,--end-group 2014-12-09 12:09:22 -05:00
Konstantin Käfer
bb0e57b838 Merge pull request #708 from mapbox/headless-tidy
Tidy up HeadlessView
2014-12-09 15:08:21 +01:00