From 01e64f5163863db760773f6416fcd20c302f4ee6 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 26 Oct 2019 19:26:51 +0200 Subject: [PATCH] Fix logic in last commit. --- texture_packer.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/texture_packer.cpp b/texture_packer.cpp index 993ba95..59ff80e 100644 --- a/texture_packer.cpp +++ b/texture_packer.cpp @@ -339,11 +339,13 @@ void TexturePacker::merge() { int orig_img_indx = (rect_pos_y + y) * img_width * input_format_offset + rect_pos_x * input_format_offset; int start_indx = (r->y + y + _margin) * b.size.w * 4 + (r->x + _margin) * 4; - int row_width = (r->w - 2 * _margin) * input_format_offset; - for (int x = 0; x < row_width; x += 4) { + int row_width = (r->w - 2 * _margin); + for (int x = 0; x < row_width; ++x) { - for (int sx = 0; sx < 4; ++sx) { - data.set(start_indx + x + sx, image_data[orig_img_indx + sx + x]); + + + for (int sx = 0; sx < input_format_offset; ++sx) { + data.set(start_indx + (x * 4) + sx, image_data[orig_img_indx + sx + (x * input_format_offset)]); } } }