tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,720 Commits 3 Branches 22 Tags
15564b81a37e097b52d1751b99dc91d36d37d66e
Commit Graph

226 Commits

Author SHA1 Message Date
Mike Morris
15564b81a3 Merge branch 'fix-context-shutdown-merge' into libuv-0.10-fix-context-shutdown 
Conflicts:
	src/map/map.cpp
 2014-09-10 18:53:20 -04:00
Leith Bade
7a4c914d05 Move notify_map_change() from a global callback, to a callback in 
View.

This allows for their to me more than one Map object alive at a
time.

Fixes mapbox/mapbox-gl-native#346

Conflicts:
	common/glfw_view.hpp
	include/llmr/map/view.hpp
	include/mbgl/map/transform.hpp
	src/map/map.cpp
	src/map/transform.cpp
	test/headless.cpp
 2014-09-10 18:47:13 -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
Leith Bade
c004c03696 Add View::make_inactive() to remove context from rendering thread 
View::make_inactive() is called just before termination of the
rendering thread. The implementation must clear the thread's GL
context.

This ensures there is no context still bound to a thread during
GL shutdown. This is needed as GL will not actually delete a
context until it is not active on any thread.

Fixes mapbox/mapbox-gl-native#340

Conflicts:
	common/glfw_view.hpp
	include/llmr/map/view.hpp
	test/headless.cpp
 2014-09-10 18:21:03 -04:00
Mike Morris
c32bb85248 Merge branch 'master' into libuv010 2014-09-09 17:06:22 -04:00
John Firebaugh
c1280f0b38 Revert "coalesce texture uploads at the beginning of a frame" 
This reverts commit 8c2c7f769f.

See #454

Conflicts:
	src/geometry/glyph_atlas.cpp
	src/geometry/sprite_atlas.cpp
 2014-09-03 18:12:39 -07:00
Mike Morris
a8021e84f8 Merge branch 'master' into libuv010 2014-08-29 15:43:13 -04: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
Mike Morris
050b00cb58 Merge branch 'master' into libuv010 
Conflicts:
	setup-libraries.sh
 2014-08-26 16:55:08 -04: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
Mike Morris
7ae3b8e8ee Merge branch 'master' into libuv010 2014-08-25 16:13:24 -04:00
John Firebaugh
3d9a293258 Support for Mapbox fontstack API 2014-08-22 17:14:51 -07:00
Lauren Budorick
0168612ed3 Load TileJSON; support inline TileJSON sources 
Fixes #412
Refs https://github.com/mapbox/mapbox-gl-style-spec/pull/143
 2014-08-21 16:12:27 -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
Mike Morris
3466f36412 bump mapnik-packaging, conform to libuv 0.10 api 2014-08-20 19:43:29 -04:00
Konstantin Käfer
5a59b5f5fc fix warnings 2014-08-18 14:05:52 +02:00
Ansis Brammanis
32a1711d8c remove support for composite layers 2014-08-15 15:52:53 +02:00
Konstantin Käfer
8c2c7f769f coalesce texture uploads at the beginning of a frame 2014-08-15 15:10:49 +02:00
Konstantin Käfer
18b1469e9e use unified RenderPass type 2014-08-12 15:24:02 +02:00
Konstantin Käfer
213b6ad4dc Merge branch 'master' into rasterize 
[skip ci]
 2014-08-12 15:12:31 +02:00
Konstantin Käfer
6f80264291 remove uv.h dependency from header files 2014-08-12 11:45:30 +02:00
Lauren Budorick
1ad2f26b9d VICTORY 2014-08-11 12:13:23 -07:00
Lauren Budorick
510aaef07f render single tile in source.cpp 2014-08-11 12:13:23 -07:00
Lauren Budorick
4083b534d7 committing so as to be revertable when i accidentally destroy the painter fns 2014-08-11 12:13:23 -07:00
Lauren Budorick
54ed547f90 need to figure out how to use modified matrix in drawing prerendered textures 2014-08-11 12:13:22 -07:00
Lauren Budorick
ec7f7de5c4 still not working 2014-08-11 12:13:22 -07:00
Lauren Budorick
560cc112e1 rm rasterize_properties, should be close to working...doesn't work 2014-08-11 12:13:22 -07:00
Lauren Budorick
9e1156d660 take 2, still not working 2014-08-11 12:13:22 -07:00
Lauren Budorick
df925fe0e5 nonworking prerendering attempts 2014-08-11 12:12:43 -07:00
Konstantin Käfer
225b5e01cb don't automatically move back to main thread 2014-08-11 07:41:52 -07:00
Konstantin Käfer
4657e6e023 use a file source object to abstract loading of resources 2014-08-08 18:25:45 +02:00
Konstantin Käfer
a045d9c9d4 use filesource object for loading all http stuff 2014-08-08 15:08:41 +02:00
John Firebaugh
70a31baf5c Eliminate warnings 2014-08-07 13:02:40 -07:00
Konstantin Käfer
9dc48b773f fix crash bug for styles that have no glyph url specified 2014-08-06 18:33:21 +02:00
Konstantin Käfer
b402d03837 don't require the background layer to be named "background" 2014-08-05 11:58:16 +02:00
Konstantin Käfer
d01b996acd better warning messages 2014-07-31 18:55:48 +02:00
Konstantin Käfer
75c079adb1 move sprite to a use future loading 2014-07-31 18:14:26 +02:00
Konstantin Käfer
fa3a41136c merge text and icon buckets/styles 
(we're not yet placing together!)
 2014-07-29 18:27:59 +02:00
Konstantin Käfer
04bab1af76 more include what you use 2014-07-23 13:18:03 +02:00
Konstantin Käfer
d175d146fb include what you use 2014-07-23 12:53:21 +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
John Firebaugh
86336ed838 Flip name and units and sign of rotation API 
Angle -> Bearing
Radians -> Degrees
Clockwise -> Counterclockwise
 2014-07-21 11:30:51 -07:00
Konstantin Käfer
bcf82bdd01 respect layer min/maxzoom, not source min/maxzoom 2014-07-17 16:20:49 -07:00
Konstantin Käfer
ab045087da skip rendering layer when min/max-zoom condition isn't met 2014-07-17 16:04:17 -07:00
Konstantin Käfer
3141b8b1f7 refactor source information into SourceInfo object 2014-07-17 15:37:18 -07:00
Konstantin Käfer
4ea281c750 rename llmr => mbgl 2014-07-16 18:53:56 -07:00
Justin R. Miller
a902446e7f refs #342 & #346: per-map change callbacks 2014-07-16 18:18:04 -07:00
Konstantin Käfer
682eaec87c add icon render test 2014-07-15 18:08:14 -07:00