John Firebaugh
df89de5cc5
[core] Rationalize style property classes: <type>{Paint,Layout}Properties
2015-10-22 09:21:30 -07:00
Ansis Brammanis
9e68e49c89
fix depth clipping in perspective view
...
The depth range is now set slightly differently. Both ends of the range
are shifted for each layer to solve some precision issues.
Some layers draw multiple things at different depths. For example, fill
layers draw fills and antialiasing separately. To handle this case, I
added setDepthSublayer(n) which a
2015-08-24 18:41:51 -04:00
Ansis Brammanis
494489f9a0
fix symbol rendering in perspective view
2015-08-24 18:41:50 -04:00
John Firebaugh
0451aca37e
Merge branch 'v8'
2015-08-24 10:47:30 -07:00
Konstantin Käfer
5989ff4eb7
use the global animationTime instead of querying our own time
...
this reduces the amount of std::chrono::steady_clock::now() calls
2015-08-20 16:40:31 -04:00
Ansis Brammanis
af9396a678
don't draw halo when halo-width is 0
...
669d891257
2015-08-20 11:59:08 -07:00
Ansis Brammanis
60e9712916
remove text-max-size and icon-max-size
...
port https://github.com/mapbox/mapbox-gl-js/pull/1419
2015-08-20 11:59:08 -07:00
Bruno de Oliveira Abinader
0ea8a37cb0
Unify default transition values in MapData
...
Relevant changes:
- Added 'defaultFadeDuration' and 'defaultTransitionDelay' to MapData;
- Painter & StyleParser now receives a reference to MapData;
- As previously seen on the code: 300ms is the default fade duration
and 0ms is the default transition duration;
- We no longer pass the current time point to Style, since it now uses
MapData.animationTime, which gets updated in MapContext::update().
- Updated StyleParser check to use a mock MapData;
2015-07-14 16:58:32 +03:00
Konstantin Käfer
675ddddee7
Make pixelRatio constant across a Map object lifetime
...
also moves framebuffer size out of TransformState into its own object
2015-07-08 10:40:05 +02:00
Ansis Brammanis
a8f77d23cc
reduce collision box linewidth to 1
...
06eece43a8
2015-07-02 12:35:15 +02:00
Ansis Brammanis
45e4938f9e
fix cross-tile label collisions
...
fix #1816
fix #1689
The missing label was the only one in it's bucket. Since the label was
outside the tile boundaries it wouldn't need to be drawn by the bucket.
Since the bucket had no features to draw, it was dropped completely.
Even if a bucket doesn't have any features that need to be rendered, it
may have features that need to impact the placement of features in other
layers.
2015-07-02 12:31:50 +02: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
Ansis Brammanis
2bd7e45502
fix collision box clipping
...
and name parameters when it's not clear from their type
2015-06-03 19:17:49 -04:00
Ansis Brammanis
36212ea3c6
sort overlapping symbols in the y direction
...
fixes #333
fixes #988
-js: 6514de77be2ff3df4267785f42f5e53c63233cac
2015-06-02 11:33:03 -04:00
John Firebaugh
ec06bb7e3c
Merge ResourceLoader into Style and move atlas ownership
2015-06-01 13:22:02 -07:00
Ansis Brammanis
8962442b1b
make collision debug boxes toggleable
2015-05-28 19:17:07 -04: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
Konstantin Käfer
72964f5bef
only update GL state when it actually changed
2015-05-04 17:33:05 +02:00
Konstantin Käfer
dae18cc7bc
remove some unused includes
2015-04-28 14:32:21 -04:00
Konstantin Käfer
c88a60b1e5
remove unused includes
2015-04-28 14:32:18 -04:00
Jason Wray
4d631623c7
Merge master @ 353e5661de
2015-04-27 17:49:24 -04:00
Ansis Brammanis
17010bfd73
make text-max-size not affect rendering size
...
This way it matches -js. The real fix will eventually be
https://github.com/mapbox/mapbox-gl-style-spec/issues/255
2015-04-24 15:33:58 -07:00
John Firebaugh
d8411f26d2
Tile::ID ⇢ TileID
...
This allows making both Tile and TileID private.
2015-04-06 13:58:56 -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
Ansis Brammanis
dda1b770da
port collision box debug rendering
2015-04-01 16:11:48 -07:00
John Firebaugh
3d9b441c8b
Eliminate some unnecessary pointer indirection
...
Buckets had a pointer to the associated layout type, when they can just
have a direct member.
2015-03-31 15:23:40 -07:00
Ansis Brammanis
19ddaae6cc
remove in-shader label flipping
2015-03-30 17:48:52 -07: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
Konstantin Käfer
0151fe6c01
pass StyleLayer objects as const ref instead of a shared pointer
2015-03-06 13:26:11 +01:00
Konstantin Käfer
c07fa06994
rename StyleBucket* => StyleLayout*
...
and remove a few unused variables
refs #881
2015-02-17 18:27:51 -08:00
Konstantin Käfer
89c0ff5f39
make StyleBucket mutable
...
refs #881
2015-02-17 18:27:51 -08:00
Leith Bade
89bbd29278
Use std::chrono
2015-02-04 09:39:25 +11:00
Konstantin Käfer
5b14c85b78
use 4-byte aligned vertex attributes for performance reason
...
reverts 9d5f02ccaa and 4c0b4a7901
2014-12-12 12:37:54 +01:00
Konstantin Käfer
93d56294cf
update error reporting function
2014-12-10 13:21:08 +01:00
Leith Bade
0808485453
Use CHECK_ERROR on every GL call
2014-12-10 21:57:34 +11:00
Konstantin Käfer
abafb52f37
make most headers private
2014-12-04 20:02:50 +01:00