Commit Graph

801 Commits

Author SHA1 Message Date
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
John Firebaugh
3aa15306f6 Map Map::getWorker() private 2014-11-26 15:13:13 -08:00
John Firebaugh
8c3e39a516 Eliminate Map::getGlyphStore() 2014-11-26 15:13:13 -08:00
John Firebaugh
8e33076bf1 Eliminate Map::getSpriteAtlas() 2014-11-26 15:13:13 -08:00
John Firebaugh
a5fe8ec3dc Eliminate Map::getGlyphAtlas() 2014-11-26 15:13:13 -08: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
Vincent Schüßler
2b0cb4a518 Fix member shadowing warnings 2014-11-25 14:10:59 -08:00
artemp
deb9665cc9 Merge branch 'master' into image-readers 2014-11-24 09:30:59 +01:00
Leith Bade
bc7e97f37e Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	src/map/source.cpp
2014-11-23 09:45:17 +11:00
Leith Bade
a438459e3b Rewrite EGL config choosing 2014-11-22 21:40:49 +11:00
Leith Bade
78a667762a Swtitch to stdlib mutex and cond vars 2014-11-22 13:14:22 +11:00
John Firebaugh
a3ec4cf17e Use noncopyable 2014-11-21 14:25:12 -08:00
John Firebaugh
c3940cf082 Eliminate Map::getFileSource 2014-11-21 14:25:12 -08:00
John Firebaugh
9e971095d3 Pass FileSource by reference 2014-11-21 14:25:11 -08:00
artemp
4af232dcf3 image_readers: premultiply alpha 2014-11-21 11:28:56 +01:00
artemp
1e9b6611cc Merge branch 'master' into image-readers 2014-11-21 11:17:18 +01:00
Leith Bade
5b718d7fc9 Merge branch 'master' of github.com:mapbox/mapbox-gl-native into android-mason
Conflicts:
	ios/mapbox-gl-cocoa
2014-11-21 20:36:55 +11:00
John Firebaugh
aaa1e3a6f1 Remove rotation constraints
This should be an iOS SDK option, not hard coded into
low-level renderering.

Fixes #458
2014-11-20 15:13:23 -08:00
Jordan Hollinger
4e3ae54062 Add functionality to get default transition duration from native code. Use it to save and restore state. #617 2014-11-19 17:24:49 -08:00
Jordan Hollinger
a888e9b7f3 Add temporary applied classes list in map, in case they are set before style is loaded. #620 2014-11-19 15:17:38 -08:00
artemp
f89c9753dd image-readers: move concrete implementations headers into platform/default 2014-11-19 16:56:53 +01:00