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

58 Commits

Author SHA1 Message Date
John Firebaugh
fd58861fcd Change StyleBucket::source to indirect reference 
This eliminates a reference loop: VectorTileData holds StyleLayers which
hold StyleBuckets which held Sources which hold VectorTileDatas. This
breaks the StyleBucket -> Source link in favor of manually resolving the
reference where necessary.
 2015-06-17 17:07:16 -07:00
Ansis Brammanis
9c03b396c0 Merge remote-tracking branch 'origin/master' into HEAD 
Conflicts:
	src/mbgl/renderer/painter_fill.cpp
 2015-06-03 19:20:41 -04:00
John Firebaugh
ec06bb7e3c Merge ResourceLoader into Style and move atlas ownership 2015-06-01 13:22:02 -07:00
Ansis Brammanis
ff6a5ce5bc Merge remote-tracking branch 'origin/master' into new-labelling 
Conflicts:
	src/mbgl/map/source.cpp
	src/mbgl/map/source.hpp
	src/mbgl/map/tile_data.cpp
	src/mbgl/map/tile_parser.cpp
	src/mbgl/map/vector_tile_data.cpp
	src/mbgl/renderer/painter.cpp
	src/mbgl/renderer/symbol_bucket.cpp
	src/mbgl/text/glyph.hpp
	src/mbgl/text/glyph_store.cpp
	src/mbgl/text/placement.cpp
	test/suite
 2015-05-28 20:01:15 -04:00
Ansis Brammanis
1e044a175c Reparse tiles when zoom level > source maxzoom 
so that layout property functions are applied correctly
and so that label placement is redone

js:
https://github.com/mapbox/mapbox-gl-js/pull/1005
and
440bc02505
 2015-05-28 19:17:07 -04:00
Konstantin Käfer
f4707f72e0 Replace mbgl::util::make_unique<> with std::make_unique<> 2015-05-26 17:57:38 +02:00
Ansis Brammanis
7abd7950c9 Merge branch 'master' into new-labelling 
Conflicts:
	src/mbgl/map/tile_parser.cpp
	src/mbgl/map/tile_parser.hpp
	src/mbgl/renderer/painter.hpp
	src/mbgl/renderer/painter_symbol.cpp
	src/mbgl/renderer/symbol_bucket.cpp
	src/mbgl/renderer/symbol_bucket.hpp
	src/mbgl/text/collision.cpp
	src/mbgl/text/collision.hpp
	src/mbgl/text/placement.cpp
 2015-05-19 11:09:33 -04:00
John Firebaugh
63ea3d4bef Don't crash if VAO extensions are not available 
Fixes #1585
 2015-05-18 16:47:20 -07:00
John Firebaugh
83a5aae6c5 Render translucent background layers (fixes #1514) 2015-05-15 12:17:32 -07:00
John Firebaugh
a2344c36c3 Extensible GL extension support 2015-05-13 19:01:58 -07:00
Thiago Marcos P. Santos
41d619771e Make the state attribute private 
Also add a virtual setState() method to give subclasses a chance
to intercept the change of state. This will be used by VectorTileData
to release resources when the TileData becomes immutable.
 2015-05-13 09:58:19 +02:00
John Firebaugh
76b922453a Set correct strata for background render 
Fixes #1478
 2015-05-12 10:50:36 +02:00
Konstantin Käfer
63bb10a06b apply the framebuffer size before calling updateMatrices() 2015-05-05 11:16:02 +02:00
Konstantin Käfer
72964f5bef only update GL state when it actually changed 2015-05-04 17:33:05 +02:00
Konstantin Käfer
914b6f01f8 add gl::groups back for easier debugging in Xcode 2015-05-04 17:33:05 +02:00
Konstantin Käfer
f89f7f1bc2 rename prepare => upload and determine passes per layer instead of per bucket 2015-05-04 17:33:05 +02:00
Konstantin Käfer
97a22b6f5f upload all GL objects before rendering a frame 
This moves all texture updates and buffer uploads to the beginning of every frame, before we issue any drawing commands. This means the GPU typically has much more time to upload the data in the background until we actually need it, and doesn't have to pause to store/load the framebuffer.
 2015-05-04 17:33:05 +02:00
Konstantin Käfer
5beb635028 create the tile list statically 2015-05-04 17:33:04 +02:00
Konstantin Käfer
5f496d8f0c build render order array once instead of recursing through lots of different objects 2015-05-04 17:33:04 +02:00
John Firebaugh
fec4cd613c Kill overly-verbose output 2015-04-28 14:32:23 -04:00
Konstantin Käfer
dae18cc7bc remove some unused includes 2015-04-28 14:32:21 -04:00
Konstantin Käfer
b0a30943b4 move most private Map code to MapContext 2015-04-28 14:32:20 -04:00
Jason Wray
4d631623c7 Merge master @ 353e5661de 2015-04-27 17:49:24 -04:00
Ansis Brammanis
f1edce8e21 remove linejoin shader 
The previous commit switched to using triangles for drawing round joins.
 2015-04-27 11:44:49 +02:00
John Firebaugh
691756d7dd Move ClipID to clip_id.hpp/cpp 2015-04-09 10:58:11 -07:00
John Firebaugh
d8411f26d2 Tile::ID ⇢ TileID 
This allows making both Tile and TileID private.
 2015-04-06 13:58:56 -07:00
John Firebaugh
7e0e55e542 Eliminate StyleSource 
Fixes #695
 2015-04-06 10:30:01 -07:00
John Firebaugh
41c4d50f8a Remove unused 2015-04-03 13:51:33 -07:00
Ansis Brammanis
148294d3ac Merge branch 'master' into new-labelling 
Conflicts:
	src/mbgl/renderer/symbol_bucket.cpp
	src/mbgl/renderer/symbol_bucket.hpp
	src/mbgl/text/collision.cpp
	src/mbgl/text/glyph_store.cpp
	src/mbgl/text/placement.cpp
	src/mbgl/text/rotation_range.cpp
 2015-04-03 12:04:31 -07:00
John Firebaugh
9331acf8e6 Add typedefs for std::chrono::steady_clock types 2015-04-02 12:28:12 +02:00
Ansis Brammanis
dda1b770da port collision box debug rendering 2015-04-01 16:11:48 -07:00
John Firebaugh
5264982ba7 Eliminate StyleLayerGroup 2015-04-01 11:14:20 -07:00
Konstantin Käfer
220ebf61dd replace iterator variable types with auto 2015-04-01 16:42:42 +02:00
Ansis Brammanis
31a3d3603c clip fill antialiasing with depth buffer to avoid overlapping 
https://github.com/mapbox/mapbox-gl-native/pull/381
 2015-03-24 16:08:26 -07:00
John Firebaugh
0c985c024b Revert "Move atlas ownership to Style" 
This reverts commit bffee07154.
 2015-03-13 13:05:32 -07:00
John Firebaugh
bffee07154 Move atlas ownership to Style 
This follows gl-js and just makes sense -- whenever the style changes
the atlases should be blown away.

Refs #957
 2015-03-13 10:55:47 -07:00
Thiago Marcos P. Santos
124b49562d Get rid of printf and cout by using Log::* 
Use our logging system that will route the message accordingly on
the target platform.

Fixes #613
 2015-03-12 14:19:32 +02:00
Konstantin Käfer
0151fe6c01 pass StyleLayer objects as const ref instead of a shared pointer 2015-03-06 13:26:11 +01:00
Justin R. Miller
6e41664cb0 fixes #476 & #853: pixel/meter/latlng conversion routines in core & iOS 2015-02-16 09:52:36 -08:00
Ansis Brammanis
6d47e9b684 use correct interpolation for background images 2015-02-10 10:59:32 -08:00
Ansis Brammanis
4ec0028856 switch from low/high to from/to 2015-02-04 12:08:29 -08:00
Ansis Brammanis
465b1ac3eb Merge branch 'master' into pattern-functions 
Conflicts:
	src/mbgl/renderer/painter.cpp
	src/mbgl/renderer/painter.hpp
	src/mbgl/renderer/painter_fill.cpp
	src/mbgl/renderer/painter_line.cpp
	src/mbgl/style/style_layer.cpp
	src/mbgl/style/style_layer.hpp
	src/mbgl/style/style_layer_group.cpp
	src/mbgl/style/style_layer_group.hpp
 2015-02-04 11:05:36 -08:00
Leith Bade
89bbd29278 Use std::chrono 2015-02-04 09:39:25 +11:00
Ansis Brammanis
c9f8de863d remove old version of zoomHistory 2015-02-02 18:27:55 -08:00
Ansis Brammanis
322f46a5db implement functions for line-image 2015-02-02 17:57:12 -08:00
Ansis Brammanis
b3ca6fcca6 implement functions for background-image 2015-02-02 16:23:10 -08:00
Ansis Brammanis
d532824aec implement functions for patterns 
It introduces a new function type, FadedStopsFunction, that transitions
between the stops values instead of interpolating between them.
 2015-02-02 14:46:48 -08:00
Ansis Brammanis
60035d7728 Merge branch 'no-crossfade' 
Conflicts:
	src/mbgl/renderer/painter_line.cpp
 2015-01-26 12:19:40 -08:00
John Firebaugh
7694b0c1ec Merge pull request #771 from mapbox/visibility 
Add visibility property for v7
 2015-01-26 11:09:16 -08:00
Ansis Brammanis
c5d5a799be Don't permanently crossfade fill patterns. 
js: 00e11591106dae7eb02eff0328364d8ec03fdaa5
 2015-01-23 17:05:30 -05:00