mirror/blah
1
0
Fork 0
mirror of https://github.com/NoelFB/blah.git synced 2025-04-11 01:26:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed packer sub rectangle

Browse Source
This commit is contained in:
Noel Berry 2021-04-11 22:07:46 -07:00
parent 0f04ff0803
commit 682cc12780
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/images/packer.cpp
View File

@ -68,7 +68,7 @@ void Packer::add_entry(u64 id, int w, int h, const Color* pixels, const RectI& s
Entry entry(id, RectI(0, 0, source.w, source.h)); Entry entry(id, RectI(0, 0, source.w, source.h));
// trim // trim
int top = 0, left = 0, right = 0, bottom = 0; int top = source.y, left = source.x, right = source.x, bottom = source.y;
// TOP: // TOP:
for (int y = source.y; y < source.y + source.h; y++) for (int y = source.y; y < source.y + source.h; y++)
@ -105,7 +105,7 @@ void Packer::add_entry(u64 id, int w, int h, const Color* pixels, const RectI& s
JUMP_END:; JUMP_END:;
// pixels actually exist in this source // pixels actually exist in this source
if (right >= left && bottom >= top) if (right > left && bottom > top)
{ {
entry.empty = false; entry.empty = false;
@ -115,6 +115,7 @@ void Packer::add_entry(u64 id, int w, int h, const Color* pixels, const RectI& s
entry.packed.w = (right - left); entry.packed.w = (right - left);
entry.packed.h = (bottom - top); entry.packed.h = (bottom - top);
// create pixel data // create pixel data
entry.memory_index = m_buffer.position(); entry.memory_index = m_buffer.position();
@ -126,7 +127,7 @@ void Packer::add_entry(u64 id, int w, int h, const Color* pixels, const RectI& s
else else
{ {
for (int i = 0; i < entry.packed.h; i++) for (int i = 0; i < entry.packed.h; i++)
m_buffer.write((char*)(pixels + left + (top + i) * entry.frame.w), sizeof(Color) * entry.packed.w); m_buffer.write((char*)(pixels + left + (top + i) * w), sizeof(Color) * entry.packed.w);
} }
} }