Public-Mirror/GARbro-mirror
1
0
Fork 0
mirror of https://github.com/crskycode/GARbro.git synced 2024-11-30 17:05:37 +08:00
Code Issues Projects Releases Wiki Activity

(Pb2Reader): rearranged local vars.

Browse Source
This commit is contained in:
morkt 2016-12-03 14:33:08 +04:00
parent 6596df030e
commit 40ec5dedee
1 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
ArcFormats/Cmvs/ImagePB2.cs
View File

@ -145,43 +145,45 @@ namespace GameRes.Formats.Purple
int block_src = 0; int block_src = 0;
bit_src = ctl_offset + 12; bit_src = ctl_offset + 12;
int src = ctl_offset + m_input.ToInt32 (ctl_offset) + 12; int src = ctl_offset + m_input.ToInt32 (ctl_offset) + 12;
int dst = c; int dst_block = c;
for (int y = 0, lBlockY = 0; lBlockY < h_block_count; y += block_size, lBlockY++) for (int block_y = 0; block_y < h_block_count; block_y++)
{ {
int dst_origin = dst; int y = block_y * block_size;
int max_height = Math.Min (height - y, block_size); int dst_row = dst_block;
for (int x = 0, lBlockX = 0; lBlockX < w_block_count; x += block_size, lBlockX++) int block_height = Math.Min (height - y, block_size);
for (int block_x = 0; block_x < w_block_count; block_x++)
{ {
int x = block_x * block_size;
if (0 == bit_mask) if (0 == bit_mask)
{ {
bit_src++; bit_src++;
bit_mask = 0x80; bit_mask = 0x80;
} }
int dst3 = dst_origin; int dst_pixel = dst_row;
int max_width = Math.Min (width - x, block_size); int block_width = Math.Min (width - x, block_size);
if (0 != (bit_mask & m_input[bit_src])) if (0 != (bit_mask & m_input[bit_src]))
{ {
byte b = m_input[src++]; byte b = m_input[src++];
for (int i = 0 ; i < max_height; i++) for (int i = 0 ; i < block_height; i++)
{ {
for (int j = 0 ; j < max_width; j++) for (int j = 0 ; j < block_width; j++)
m_output[dst3 + j * pixel_size] = b; m_output[dst_pixel + j * pixel_size] = b;
dst3 += m_stride; dst_pixel += m_stride;
} }
} }
else else
{ {
for (int i = 0 ; i < max_height; i++) for (int i = 0 ; i < block_height; i++)
{ {
for (int j = 0 ; j < max_width; j++) for (int j = 0 ; j < block_width; j++)
m_output[dst3 + j * pixel_size] = block_data[block_src++]; m_output[dst_pixel + j * pixel_size] = block_data[block_src++];
dst3 += m_stride; dst_pixel += m_stride;
} }
} }
dst_origin += block_size * pixel_size; dst_row += block_size * pixel_size;
bit_mask >>= 1; bit_mask >>= 1;
} }
dst += m_stride * block_size; dst_block += m_stride * block_size;
} }
ctl_offset += m_input.ToInt32 (m_offset1 + c * 4); ctl_offset += m_input.ToInt32 (m_offset1 + c * 4);
data_offset += m_input.ToInt32 (m_offset2 + c * 4); data_offset += m_input.ToInt32 (m_offset2 + c * 4);
@ -191,7 +193,6 @@ namespace GameRes.Formats.Purple
void UnpackV6 () void UnpackV6 ()
{ {
int channel_size = (int)m_info.Width * (int)m_info.Height; int channel_size = (int)m_info.Width * (int)m_info.Height;
m_output = new byte[4 * channel_size];
int src = Array.IndexOf<byte> (m_input, 0, 0x24); int src = Array.IndexOf<byte> (m_input, 0, 0x24);
src = (src + 3) & ~3; src = (src + 3) & ~3;
byte[][] channels = new byte[4][]; byte[][] channels = new byte[4][];
@ -204,20 +205,17 @@ namespace GameRes.Formats.Purple
LzssResetFrame(); LzssResetFrame();
LzssUnpack (bit_src, data_src, channels[i], channel_size); LzssUnpack (bit_src, data_src, channels[i], channel_size);
} }
m_output = new byte[4 * channel_size];
int dst = 0; int dst = 0;
for (int i = 0; i < channel_size; ++i) for (int i = 0; i < channel_size; ++i)
{ {
m_output[dst ] = channels[0][i]; byte r = (byte)(channels[2][i] ^ channels[3][i]);
m_output[dst+1] = channels[1][i]; byte g = (byte)(channels[1][i] ^ r);
m_output[dst+2] = channels[2][i]; byte b = (byte)(channels[0][i] ^ g);
m_output[dst+3] = channels[3][i]; m_output[dst++] = b;
m_output[dst++] = g;
byte d1 = (byte)(m_output[dst+2] ^ m_output[dst+3]); m_output[dst++] = r;
byte d2 = (byte)(m_output[dst+1] ^ d1); m_output[dst++] = channels[3][i];
m_output[dst+2] = d1;
m_output[dst+1] = d2;
m_output[dst ] ^= d2;
dst += 4;
} }
} }
} }