Commit Graph

193 Commits

Author SHA1 Message Date
Leith Bade
0935cef9c3 Fix tests when using GL 3.0+ context 2014-12-02 21:40:23 +11:00
Leith Bade
d27ede63fe Enable all messages 2014-12-02 01:57:18 +11:00
Leith Bade
2113e27990 Implement debug callback 2014-12-02 01:53:44 +11: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
Konstantin Käfer
dbddd3c904 gyp fixes 2014-10-28 12:47:58 -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
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
Lauren Budorick
71c31cee24 linepattern in progress 2014-09-03 18:12:40 -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
863b4577e4 compute unique clip ids per tile, taking covering children into account
fixes #206
fixes #220
refs #229
2014-08-21 15:02:08 +02:00
Ansis Brammanis
32a1711d8c remove support for composite layers 2014-08-15 15:52:53 +02:00
Konstantin Käfer
a81c2efba2 don't replace shaders on duplicate setup() call
fixes #408
2014-08-15 13:36:14 +02:00
Konstantin Käfer
bfd1281285 only set changed glDepthRange values 2014-08-14 12:58:41 +02:00
Konstantin Käfer
18b1469e9e use unified RenderPass type 2014-08-12 15:24:02 +02:00
Lauren Budorick
0263a9ffb7 minor access changes etc 2014-08-11 15:42:09 -07:00
Lauren Budorick
1ad2f26b9d VICTORY 2014-08-11 12:13:23 -07:00
Lauren Budorick
df925fe0e5 nonworking prerendering attempts 2014-08-11 12:12:43 -07:00
Konstantin Käfer
04bab1af76 more include what you use 2014-07-23 13:18:03 +02:00
Konstantin Käfer
d47f11574e do not explicitly render matte; we already cleared the background with glClear 2014-07-22 17:18:38 +02:00
Konstantin Käfer
4ea281c750 rename llmr => mbgl 2014-07-16 18:53:56 -07:00
Konstantin Käfer
ac57125bd5 fix background painting 2014-07-02 17:31:55 +02:00
Konstantin Käfer
d75f0075f3 even more refactoring 2014-06-27 16:42:44 +02:00
Konstantin Käfer
eb84492556 paint background when clearing 2014-06-24 16:47:55 +02:00
Konstantin Käfer
ba4294ae0c saving current state 2014-06-23 18:05:25 +02:00
Justin R. Miller
30aa378731 use a black matte instead of yellow 2014-06-01 19:37:56 -07:00
Dane Springmeyer
f5394a7638 release mode: silent debug output + ifdef any potentially expensive calls 2014-05-29 18:07:19 -07:00
Konstantin Käfer
e304f6629f only change pass parameters if we actually need to 2014-05-28 09:47:55 +02:00
Konstantin Käfer
889ef68b5b first draft at blurring 2014-05-23 18:30:49 +02:00
Konstantin Käfer
67ab9ff6f5 add cleanup call for destroying framebuffers 2014-05-22 12:41:17 +02:00
Konstantin Käfer
53a6992728 fix alpha blending + add depth/stencil buffers 2014-05-21 18:34:41 +02:00
Konstantin Käfer
13939b26d9 first shot at composited blending
still missing:
- stencil+depth mask
- alpha compositing
2014-05-21 10:55:09 +02:00
Konstantin Käfer
9bb0146875 Merge branch 'master' into outdoors-style
Conflicts:
	bin/style.js
2014-05-19 15:52:42 +02:00
Konstantin Käfer
01183a0a19 fix remaining cases of point => icon 2014-05-15 18:09:00 +02:00