Commit Graph

350 Commits

Author SHA1 Message Date
Leith Bade
598df496a7 Log framebuffer errors 2014-11-28 00:11:37 +11:00
Leith Bade
eac887c1b8 Check for packed depth stencil 2014-11-28 00:11:37 +11:00
Leith Bade
145296ac11 Actually remove read fill 2014-11-09 23:55:00 +11:00
Leith Bade
70057e1b8e Merge branch 'master' of https://github.com/mapbox/mapbox-gl-native into android-mason
Conflicts:
	gyp/common.gypi
	include/mbgl/geometry/vao.hpp
	include/mbgl/platform/event.hpp
	include/mbgl/platform/gl.hpp
	platform/default/http_request_baton_curl.cpp
	src/storage/response.cpp
2014-11-09 00:35:52 +11:00
Konstantin Käfer
582d616deb load VAO extension 2014-11-07 18:17:24 +01:00
Leith Bade
86f8f626f1 Change clear to red to debug tile loading 2014-11-07 01:40:05 +11:00
Leith Bade
da49d0adb7 Workaround for GL extension. Need to come back to this. 2014-11-05 20:17:28 +11:00
John Firebaugh
051e1c32ae Support compound text-anchor values 2014-11-04 12:26:27 -08:00
John Firebaugh
0790b574b4 Single text positioning property
https://github.com/mapbox/mapbox-gl-style-spec/issues/197
2014-11-04 12:26:27 -08:00
Lauren Budorick
f25cf70689 Reinstate 16px line width limit 2014-11-04 12:26:14 -08:00
Lauren Budorick
37922605f8 Axe the 16-px line width limit 2014-11-04 12:26:14 -08:00
Lauren Budorick
3d18160fe4 More concise 2014-11-04 12:26:14 -08:00
Lauren Budorick
0d6bca0e7e line-offset -> line-gap-width 2014-11-04 12:26:13 -08:00
artemp
92124d3aa1 make util::utf8_to_utf32::convert() static 2014-11-03 15:44:27 +00:00
Dane Springmeyer
761f753cbd merge with mbgl-config 2014-10-29 21:40:02 -04:00
artemp
3b5b15a4e4 store glyphAtlas by value in Map object, pass by ref
change hasData signiture to expect ```StyleLayer const&```
2014-10-29 13:44:26 -04:00
artemp
3723481319 c++ - use const qualifier 2014-10-29 11:57:39 -04:00
John Firebaugh
7caac537b8 Fix variable shadowing 2014-10-29 10:12:41 -04:00
John Firebaugh
da8aa391d0 Render map with a copy of TransformState 2014-10-29 09:58:56 -04:00
John Firebaugh
4f7bc80664 Hold internal reference to Sprite in SpriteAtlas 2014-10-29 09:58:03 -04:00
artemp
14829db508 fix text/icon rendering order (#470) 2014-10-28 15:43:10 -04:00
artemp
0d4f625951 fix 'flip' logic to take into account rotation_alignment and keep_upright (#470) 2014-10-28 14:50:44 -04:00
Konstantin Käfer
dbddd3c904 gyp fixes 2014-10-28 12:47:58 -04:00
artemp
9364fd7322 make addGlyphsToAtlas static method of SymbolBucket + add addGlyphs method to minimise number of mutex locking 2014-10-27 14:18:11 -04:00
Konstantin Käfer
10cb83579f gcc fixes 2014-10-23 02:46:15 -07:00
Konstantin Käfer
214f99673f fix variable shadowing 2014-10-22 18:19:01 +02:00
Konstantin Käfer
087d04292a Merge branch 'master' of github.com:mapbox/mapbox-gl-native 2014-10-22 15:18:30 +02:00
John Firebaugh
4603ca037c background-image support 2014-10-17 10:44:38 -07:00
Mike Morris
2d1219fa51 Merge branch 'master' into libuv-0.10-headless-display
Conflicts:
	common/curl_request.cpp
	common/glfw_view.cpp
	common/glfw_view.hpp
	include/mbgl/platform/request.hpp
	ios/mapbox-gl-cocoa
	setup-libraries.sh
	src/map/map.cpp
	src/platform/request.cpp
	test/fixtures/fixture_request.cpp
2014-10-10 12:24:45 -04:00
Konstantin Käfer
f26bb724dc use util::ptr as a wrapper around std::shared_ptr that asserts nonemptiness 2014-09-24 16:14:09 +02:00
Mike Morris
89f54e8789 update Painter::deleteShaders 2014-09-10 19:00:28 -04:00
Leith Bade
71549e7b93 Adds the function Map::terminate() to allow all GL resources held
by the map to be released immediately.

Map::terminate() will call any GL functions on the current thread
without blocking or defering to the rendering thread.

This function allows a GL context to be destroyed and recreated
safely without having to delete the Map object.

Fixes mapbox/mapbox-gl-native#341

Conflicts:
	include/llmr/renderer/painter.hpp
	test/headless.cpp
2014-09-10 18:31:20 -04:00
John Firebaugh
eb4f53cbed SDF icon support (fixes #404) 2014-09-08 15:12:32 -07:00
John Firebaugh
2033eb9494 Don't overrotate line labels (fixes #462) 2014-09-08 11:22:54 -07:00
John Firebaugh
de720f3515 FrameHistory::getFadeProperties 2014-09-05 14:03:33 -07:00
John Firebaugh
7b9ad022a9 Implement text-rotation-alignment 2014-09-04 18:12:40 -07:00
John Firebaugh
f2391e25ea TextShader ⇢ SDFShader 2014-09-04 17:59:22 -07:00
John Firebaugh
1fedf0918a Less shader boilerplate 2014-09-04 16:22:25 -07:00
John Firebaugh
4694aa40ad Add SpriteAtlas::getPosition() 2014-09-03 18:12:40 -07:00
John Firebaugh
586cb9144a Make renderLine more similar to JS 2014-09-03 18:12:40 -07:00
Lauren Budorick
71c31cee24 linepattern in progress 2014-09-03 18:12:40 -07:00
John Firebaugh
9d6c7685d0 Implement {text,icon}-translate[-anchor] 2014-08-28 17:24:29 -07:00
John Firebaugh
e71a1a9077 Simplify 2014-08-28 17:16:37 -07:00
John Firebaugh
bfa0b7f009 Remove vtxMatrix state 2014-08-28 17:13:55 -07:00
John Firebaugh
c13cc4aa38 Record frame history in the correct place
Fixes numerous issues with rendering tests.
2014-08-28 16:43:03 -07:00
John Firebaugh
9f734ee61d background-opacity support 2014-08-28 10:43:53 -07:00
John Firebaugh
e2c2ab843e Render background with plain shader 2014-08-27 18:22:20 -07:00
Konstantin Käfer
953e5524a9 fix basepath for headless stylesheets 2014-08-27 14:28:56 +02:00
Konstantin Käfer
5b4ad90bac Merge pull request #445 from mapbox/nsstring
Use NSString-specific case change functions on OS X/iOS
2014-08-26 17:43:02 +02:00
Konstantin Käfer
0f73a0192e Merge pull request #439 from mapbox/clipping
Compute unique clip IDSs per tile
2014-08-26 17:42:53 +02:00