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

CJK overflow - update to match gl-shader (#5908)

Browse Source 
* update vertex array ushorts

* update atlas size

* testing latest cjk test-suite branch

* update shader ref

* update shaders

* update icon buffer

* shaders

* updated tests

* buffer fix

* updated make tests

* annotation expected updates

* final push

* final fonts

* a_data1 removal

* remove cjk-mixed test

* hiring threshold for cjk-chinese

* update to new test suite

* Rename a_data2 to a_data in sdf and icon shaders

* update test-suite sha
This commit is contained in:
Amy Lee Walton
2016-08-11 09:49:36 -07:00
committed by GitHub
parent 89190f8d89
commit b0cb8715ed
16 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/mbgl/geometry/text_buffer.cpp
View File

@@ -16,18 +16,21 @@ size_t TextVertexBuffer::add(int16_t x, int16_t y, float ox, float oy, uint16_t
shorts[2] /* offset */ = ::round(ox * 64); // use 1/64 pixels for placement
shorts[3] /* offset */ = ::round(oy * 64);
uint8_t *ubytes = static_cast<uint8_t *>(data);
// a_data1
ubytes[8] /* tex */ = tx / 4;
ubytes[9] /* tex */ = ty / 4;
ubytes[10] /* labelminzoom */ = labelminzoom * 10;
ubytes[11] /* labelangle */ = labelangle;
uint16_t *ushorts = static_cast<uint16_t *>(data);
// a_texture_pos
ushorts[4] /* tex */ = tx / 4;
ushorts[5] /* tex */ = ty / 4;
// a_data2
ubytes[12] /* minzoom */ = minzoom * 10; // 1/10 zoom levels: z16 == 160.
ubytes[13] /* maxzoom */ = ::fmin(maxzoom, 25) * 10; // 1/10 zoom levels: z16 == 160.
uint8_t *ubytes = static_cast<uint8_t *>(data);
// a_data
ubytes[12] /* labelminzoom */ = labelminzoom * 10;
ubytes[13] /* labelangle */ = labelangle;
ubytes[14] /* minzoom */ = minzoom * 10; // 1/10 zoom levels: z16 == 160.
ubytes[15] /* maxzoom */ = ::fmin(maxzoom, 25) * 10; // 1/10 zoom levels: z16 == 160.
return idx;
}
} // namespace mbgl