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

[core] Simplify and fix sprite atlas coordinate calculations

Browse Source 
* Always return image metrics exclusive of padding
* Work with integer coordinates whenever possible
* Eliminate redundant SpriteAtlasElement members
* Fix asymmetric re-padding in getIconQuad when pixelRatio != 1
* Add explanatory comments
This commit is contained in:
John Firebaugh
2017-05-18 09:37:21 -07:00
parent 9e1cbbeacb
commit 1759603e12
23 changed files with 269 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mbgl/programs/fill_program.cpp
View File

@@ -28,12 +28,12 @@ FillPatternUniforms::values(mat4 matrix,
uniforms::u_matrix::Value{ matrix },
uniforms::u_world::Value{ framebufferSize },
uniforms::u_texsize::Value{ atlasSize },
uniforms::u_pattern_tl_a::Value{ a.tl },
uniforms::u_pattern_br_a::Value{ a.br },
uniforms::u_pattern_tl_b::Value{ b.tl },
uniforms::u_pattern_br_b::Value{ b.br },
uniforms::u_pattern_size_a::Value{ a.size },
uniforms::u_pattern_size_b::Value{ b.size },
uniforms::u_pattern_tl_a::Value{ a.tl() },
uniforms::u_pattern_br_a::Value{ a.br() },
uniforms::u_pattern_tl_b::Value{ b.tl() },
uniforms::u_pattern_br_b::Value{ b.br() },
uniforms::u_pattern_size_a::Value{ a.displaySize() },
uniforms::u_pattern_size_b::Value{ b.displaySize() },
uniforms::u_scale_a::Value{ fading.fromScale },
uniforms::u_scale_b::Value{ fading.toScale },
uniforms::u_mix::Value{ fading.t },