tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[core] Remove obsolete modular arithmetic on atlas coordinates

Browse Source 
We switched to 16-bit coordinates in attributes in b0cb8715ed, so there's no longer any reason to require that they are divisible by four.
This commit is contained in:
John Firebaugh
2017-05-17 08:58:36 -07:00
parent 4c26759b69
commit 63558e06ad
6 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mapbox-gl-js

Submodule mapbox-gl-js updated: 0e0f2e5432...9dc82f694d

2
src/mbgl/programs/symbol_program.cpp
View File

@@ -51,7 +51,7 @@ Values makeValues(const bool isText,
values.translateAnchor,
state) },
uniforms::u_extrude_scale::Value{ extrudeScale },
uniforms::u_texsize::Value{ std::array<float, 2> {{ float(texsize.width) / 4, float(texsize.height) / 4 }} },
uniforms::u_texsize::Value{ std::array<float, 2> {{ float(texsize.width), float(texsize.height) }} },
uniforms::u_zoom::Value{ float(state.getZoom()) },
uniforms::u_rotate_with_map::Value{ values.rotationAlignment == AlignmentType::Map },
uniforms::u_texture::Value{ 0 },

4
src/mbgl/programs/symbol_program.hpp
View File

@@ -67,8 +67,8 @@ struct SymbolLayoutAttributes : gl::Attributes<
static_cast<int16_t>(::round(o.y * 64))
}},
{{
static_cast<uint16_t>(tx / 4),
static_cast<uint16_t>(ty / 4),
tx,
ty,
mbgl::attributes::packUint8Pair(
static_cast<uint8_t>(labelminzoom * 10), // 1/10 zoom levels: z16 == 160
static_cast<uint8_t>(labelangle)

17
src/mbgl/sprite/sprite_atlas.cpp
View File

@@ -14,6 +14,8 @@
namespace mbgl {
static constexpr uint32_t padding = 1;
SpriteAtlasElement::SpriteAtlasElement(Rect<uint16_t> rect_,
const style::Image::Impl& image,
Size size_, float pixelRatio)
@@ -23,7 +25,6 @@ SpriteAtlasElement::SpriteAtlasElement(Rect<uint16_t> rect_,
width(image.getWidth()),
height(image.getHeight()) {
const float padding = 1;
const float w = image.getWidth() * relativePixelRatio;
const float h = image.getHeight() * relativePixelRatio;
@@ -148,17 +149,10 @@ optional<SpriteAtlasElement> SpriteAtlas::getImage(const std::string& id,
};
}
const uint16_t pixelWidth = std::ceil(entry.image->image.size.width / pixelRatio);
const uint16_t pixelHeight = std::ceil(entry.image->image.size.height / pixelRatio);
const uint16_t width = std::ceil(entry.image->image.size.width / pixelRatio) + 2 * padding;
const uint16_t height = std::ceil(entry.image->image.size.height / pixelRatio) + 2 * padding;
// Increase to next number divisible by 4, but at least 1.
// This is so we can scale down the texture coordinates and pack them
// into 2 bytes rather than 4 bytes.
const uint16_t packWidth = (pixelWidth + 1) + (4 - (pixelWidth + 1) % 4);
const uint16_t packHeight = (pixelHeight + 1) + (4 - (pixelHeight + 1) % 4);
// We have to allocate a new area in the bin, and store an empty image in it.
Rect<uint16_t> rect = bin.allocate(packWidth, packHeight);
Rect<uint16_t> rect = bin.allocate(width, height);
if (rect.w == 0) {
if (debug::spriteWarnings) {
Log::Warning(Event::Sprite, "sprite atlas bitmap overflow");
@@ -187,7 +181,6 @@ void SpriteAtlas::copy(const Entry& entry, optional<Rect<uint16_t>> Entry::*entr
const PremultipliedImage& src = entry.image->image;
const Rect<uint16_t>& rect = *(entry.*entryRect);
const uint32_t padding = 1;
const uint32_t x = (rect.x + padding) * pixelRatio;
const uint32_t y = (rect.y + padding) * pixelRatio;
const uint32_t w = src.size.width;

10
src/mbgl/text/glyph_atlas.cpp
View File

@@ -184,14 +184,8 @@ Rect<uint16_t> GlyphAtlas::addGlyph(GlyphValue& value) {
// Add a 1px border around every image.
const uint32_t padding = 1;
uint16_t width = value.bitmap.size.width + 2 * padding;
uint16_t height = value.bitmap.size.height + 2 * padding;
// Increase to next number divisible by 4, but at least 1.
// This is so we can scale down the texture coordinates and pack them
// into 2 bytes rather than 4 bytes.
width += (4 - width % 4);
height += (4 - height % 4);
const uint16_t width = value.bitmap.size.width + 2 * padding;
const uint16_t height = value.bitmap.size.height + 2 * padding;
Rect<uint16_t> rect = bin.allocate(width, height);
if (rect.w == 0) {

8
test/sprite/sprite_atlas.test.cpp
View File

@@ -91,8 +91,8 @@ TEST(SpriteAtlas, Size) {
float imagePixelRatio = metro.relativePixelRatio * atlas.getPixelRatio();
EXPECT_EQ(0, metro.pos.x);
EXPECT_EQ(0, metro.pos.y);
EXPECT_EQ(16, metro.pos.w);
EXPECT_EQ(16, metro.pos.h);
EXPECT_EQ(15, metro.pos.w);
EXPECT_EQ(15, metro.pos.h);
EXPECT_EQ(18, metro.width);
EXPECT_EQ(18, metro.height);
EXPECT_EQ(18u, metro.width * imagePixelRatio);
@@ -118,8 +118,8 @@ TEST(SpriteAtlas, Updates) {
float imagePixelRatio = one.relativePixelRatio * atlas.getPixelRatio();
EXPECT_EQ(0, one.pos.x);
EXPECT_EQ(0, one.pos.y);
EXPECT_EQ(20, one.pos.w);
EXPECT_EQ(16, one.pos.h);
EXPECT_EQ(18, one.pos.w);
EXPECT_EQ(14, one.pos.h);
EXPECT_EQ(16, one.width);
EXPECT_EQ(12, one.height);
EXPECT_EQ(16u, one.width * imagePixelRatio);