Commit Graph

821 Commits

Author SHA1 Message Date
Leith Bade
14cdd9c96f Rename lots of things 2014-12-04 01:10:43 +11:00
Leith Bade
08ce7157f1 Fix debug build 2014-12-03 22:58:33 +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
9346f6f6bd Remove accidental friend 2014-12-03 20:14:11 +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
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
0935cef9c3 Fix tests when using GL 3.0+ context 2014-12-02 21:40:23 +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
66349e33ab Add GL_ARB_debug_output 2014-12-02 03:09:09 +11:00
Leith Bade
bbfe5d5ce4 Define GL callback func. Improve GL err macro. 2014-12-02 01:21:40 +11:00
Leith Bade
8f60624bec Fix import problem 2014-12-02 00:52:43 +11:00
Leith Bade
759e806516 Add KHR_debug definitions 2014-12-02 00:35:30 +11:00
Leith Bade
634a15332d Fix typo 2014-11-30 19:46:43 +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
Leith Bade
b1c793d1e0 Add fps mode for #646 2014-11-28 00:19:11 +11:00
Vincent Schüßler
49519ba7f3 Fix member shadowing warnings 2014-11-28 00:16:06 +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
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
15973741d5 simplify factory class to not rely on singleton + 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
Leith Bade
fbbcdca235 Perfer 16 bit depth, handle long GL extension strings 2014-11-28 00:11:37 +11:00
Leith Bade
eac887c1b8 Check for packed depth stencil 2014-11-28 00:11:37 +11:00
John Firebaugh
7901706094 Use uv::async 2014-11-26 17:37:13 -08:00
John Firebaugh
703a325518 Introduce uv::async 2014-11-26 17:36:09 -08:00
John Firebaugh
bcc0db3742 Use noncopyable 2014-11-26 17:04:28 -08:00
John Firebaugh
bbb7743463 Remove unused 2014-11-26 16:41:58 -08:00
John Firebaugh
f91322cf4a Remove unused 2014-11-26 16:34:03 -08:00
John Firebaugh
84c3191044 Eliminate Map::getActiveSources() 2014-11-26 16:04:22 -08:00
John Firebaugh
01ecbaf51a Make Map::updateTiles() private 2014-11-26 16:01:51 -08:00
John Firebaugh
4ce94170c1 Remove unused 2014-11-26 16:01:36 -08:00
John Firebaugh
12bf2fd326 Inline Source::updateTiles() 2014-11-26 16:01:15 -08:00
John Firebaugh
fdc988a4a0 Use unique_ptr 2014-11-26 15:13:14 -08:00
John Firebaugh
80df07a5da Remove redundant access specifiers 2014-11-26 15:13:14 -08:00
John Firebaugh
167097936a Store SourceInfo as direct member 2014-11-26 15:13:14 -08:00
John Firebaugh
41e90b4150 Pass SourceInfo as reference 2014-11-26 15:13:14 -08:00
John Firebaugh
23b61f808c Eliminate remaining uses of Map in TileData 2014-11-26 15:13:14 -08:00
John Firebaugh
9af3b033bf Eliminate Map::getStyle() 2014-11-26 15:13:13 -08:00
John Firebaugh
d3ba1071cb Make Map::getSprite() private 2014-11-26 15:13:13 -08:00
John Firebaugh
576533b18c Eliminate Map::getTexturepool() 2014-11-26 15:13:13 -08:00