backup/cnc-ddraw
1
0
Fork 0
mirror of https://github.com/FunkyFr3sh/cnc-ddraw.git synced 2025-03-25 01:57:47 +01:00
Code Issues Projects Releases Activity

replace blt_stretch

Browse Source
This commit is contained in:
FunkyFr3sh 2022-09-13 15:51:14 +02:00
parent 4cacc350c9
commit a2475ed259
5 changed files with 88 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cnc-ddraw.vcxproj
View File

@ -92,7 +92,6 @@
<ClInclude Include="inc\openglshader.h" /> <ClInclude Include="inc\openglshader.h" />
<ClInclude Include="inc\render_ogl.h" /> <ClInclude Include="inc\render_ogl.h" />
<ClInclude Include="inc\render_gdi.h" /> <ClInclude Include="inc\render_gdi.h" />
<ClInclude Include="inc\scale_pattern.h" />
<ClInclude Include="inc\screenshot.h" /> <ClInclude Include="inc\screenshot.h" />
<ClInclude Include="inc\config.h" /> <ClInclude Include="inc\config.h" />
<ClInclude Include="inc\ddsurface.h" /> <ClInclude Include="inc\ddsurface.h" />

3
cnc-ddraw.vcxproj.filters
View File

@ -176,9 +176,6 @@
<ClInclude Include="inc\lodepng.h"> <ClInclude Include="inc\lodepng.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="inc\scale_pattern.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="inc\mouse.h"> <ClInclude Include="inc\mouse.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>

4
inc/blt.h
View File

@ -100,13 +100,13 @@ void blt_bgra8888_to_rgba8888(
int src_p); int src_p);
void blt_stretch( void blt_stretch(
unsigned char* dst_buf, unsigned char* dst,
int dst_x, int dst_x,
int dst_y, int dst_y,
int dst_w, int dst_w,
int dst_h, int dst_h,
int dst_p, int dst_p,
unsigned char* src_buf, unsigned char* src,
int src_x, int src_x,
int src_y, int src_y,
int src_w, int src_w,

18
inc/scale_pattern.h
View File

@ -1,18 +0,0 @@
#ifndef _SCALE_PATTERN_H
#define _SCALE_PATTERN_H
typedef enum {
REPEAT,
SEQUENCE,
ONCE,
END
} SCALE_PATTERN_TYPE;
typedef struct {
SCALE_PATTERN_TYPE type;
int dst_index;
int src_index;
int count;
} scale_pattern;
#endif

274
src/blt.c
View File

@ -522,13 +522,13 @@ void blt_bgra8888_to_rgba8888(
} }
void blt_stretch( void blt_stretch(
unsigned char* dst_buf, unsigned char* dst,
int dst_x, int dst_x,
int dst_y, int dst_y,
int dst_w, int dst_w,
int dst_h, int dst_h,
int dst_p, int dst_p,
unsigned char* src_buf, unsigned char* src,
int src_x, int src_x,
int src_y, int src_y,
int src_w, int src_w,
@ -536,203 +536,101 @@ void blt_stretch(
int src_p, int src_p,
int bpp) int bpp)
{ {
/* Linear scaling using integer math int bytes_pp = bpp / 8;
* Since the scaling pattern for x will aways be the same, the pattern itself gets pre-calculated
* and stored in an array.
* Y scaling pattern gets calculated during the blit loop
*/
unsigned int x_ratio = (unsigned int)((src_w << 16) / dst_w) + 1;
unsigned int y_ratio = (unsigned int)((src_h << 16) / dst_h) + 1;
unsigned int s_src_x, s_src_y; size_t size = dst_w * bytes_pp;
unsigned int dest_base, source_base;
scale_pattern* pattern = malloc((dst_w + 1) * (sizeof(scale_pattern))); int dst_surf_w = dst_p / bytes_pp;
int pattern_idx = 0; int src_surf_w = src_p / bytes_pp;
unsigned int last_src_x = 0;
if (pattern != NULL) float scale_w = (float)src_w / dst_w;
float scale_h = (float)src_h / dst_h;
int last_y = -1;
int last_row = -1;
if (bpp == 8)
{ {
pattern[pattern_idx] = (scale_pattern){ ONCE, 0, 0, 1 }; for (int y = 0; y < dst_h; y++)
{
int scaled_y = (int)(y * scale_h);
int dst_row = dst_surf_w * (y + dst_y);
/* Build the pattern! */ if (scaled_y == last_y)
int x;
for (x = 1; x < dst_w; x++) {
s_src_x = (x * x_ratio) >> 16;
if (s_src_x == last_src_x)
{ {
if (pattern[pattern_idx].type == REPEAT || pattern[pattern_idx].type == ONCE) memcpy(&dst[dst_x + dst_row], &dst[dst_x + last_row], size);
{ continue;
pattern[pattern_idx].type = REPEAT;
pattern[pattern_idx].count++;
}
else if (pattern[pattern_idx].type == SEQUENCE)
{
pattern_idx++;
pattern[pattern_idx] = (scale_pattern){ REPEAT, x, s_src_x, 1 };
}
} }
else if (s_src_x == last_src_x + 1)
last_y = scaled_y;
last_row = dst_row;
int src_row = src_surf_w * (scaled_y + src_y);
for (int x = 0; x < dst_w; x++)
{ {
if (pattern[pattern_idx].type == SEQUENCE || pattern[pattern_idx].type == ONCE) int scaled_x = (int)(x * scale_w);
{
pattern[pattern_idx].type = SEQUENCE;
pattern[pattern_idx].count++;
}
else if (pattern[pattern_idx].type == REPEAT)
{
pattern_idx++;
pattern[pattern_idx] = (scale_pattern){ ONCE, x, s_src_x, 1 };
}
}
else
{
pattern_idx++;
pattern[pattern_idx] = (scale_pattern){ ONCE, x, s_src_x, 1 };
}
last_src_x = s_src_x;
}
pattern[pattern_idx + 1] = (scale_pattern){ END, 0, 0, 0 };
dst[x + dst_x + dst_row] = src[scaled_x + src_x + src_row];
/* Do the actual blitting */
int bytes_pp = bpp / 8;
int dst_surf_w = dst_p / bytes_pp;
int src_surf_w = src_p / bytes_pp;
int count = 0;
int y;
for (y = 0; y < dst_h; y++) {
dest_base = dst_x + dst_surf_w * (y + dst_y);
s_src_y = (y * y_ratio) >> 16;
source_base = src_x + src_surf_w * (s_src_y + src_y);
pattern_idx = 0;
scale_pattern* current = &pattern[pattern_idx];
if (bpp == 8)
{
unsigned char* d, * s, v;
unsigned char* src = (unsigned char*)src_buf;
unsigned char* dst = (unsigned char*)dst_buf;
do {
switch (current->type)
{
case ONCE:
dst[dest_base + current->dst_index] =
src[source_base + current->src_index];
break;
case REPEAT:
d = (dst + dest_base + current->dst_index);
v = src[source_base + current->src_index];
count = current->count;
while (count-- > 0)
*d++ = v;
break;
case SEQUENCE:
d = dst + dest_base + current->dst_index;
s = src + source_base + current->src_index;
memcpy((void*)d, (void*)s, current->count);
break;
case END:
default:
break;
}
current = &pattern[++pattern_idx];
} while (current->type != END);
}
else if (bpp == 16)
{
unsigned short* d, * s, v;
unsigned short* src = (unsigned short*)src_buf;
unsigned short* dst = (unsigned short*)dst_buf;
do {
switch (current->type)
{
case ONCE:
dst[dest_base + current->dst_index] =
src[source_base + current->src_index];
break;
case REPEAT:
d = (dst + dest_base + current->dst_index);
v = src[source_base + current->src_index];
count = current->count;
while (count-- > 0)
*d++ = v;
break;
case SEQUENCE:
d = dst + dest_base + current->dst_index;
s = src + source_base + current->src_index;
memcpy((void*)d, (void*)s, current->count * bytes_pp);
break;
case END:
default:
break;
}
current = &pattern[++pattern_idx];
} while (current->type != END);
}
else if (bpp == 32)
{
unsigned int* d, * s, v;
unsigned int* src = (unsigned int*)src_buf;
unsigned int* dst = (unsigned int*)dst_buf;
do {
switch (current->type)
{
case ONCE:
dst[dest_base + current->dst_index] =
src[source_base + current->src_index];
break;
case REPEAT:
d = (dst + dest_base + current->dst_index);
v = src[source_base + current->src_index];
count = current->count;
while (count-- > 0)
*d++ = v;
break;
case SEQUENCE:
d = dst + dest_base + current->dst_index;
s = src + source_base + current->src_index;
memcpy((void*)d, (void*)s, current->count * bytes_pp);
break;
case END:
default:
break;
}
current = &pattern[++pattern_idx];
} while (current->type != END);
} }
} }
free(pattern);
} }
else if (bpp == 16)
{
unsigned short* d = (unsigned short*)dst;
unsigned short* s = (unsigned short*)src;
for (int y = 0; y < dst_h; y++)
{
int scaled_y = (int)(y * scale_h);
int dst_row = dst_surf_w * (y + dst_y);
if (scaled_y == last_y)
{
memcpy(&d[dst_x + dst_row], &d[dst_x + last_row], size);
continue;
}
last_y = scaled_y;
last_row = dst_row;
int src_row = src_surf_w * (scaled_y + src_y);
for (int x = 0; x < dst_w; x++)
{
int scaled_x = (int)(x * scale_w);
d[x + dst_x + dst_row] = s[scaled_x + src_x + src_row];
}
}
}
else if (bpp == 32)
{
unsigned int* d = (unsigned int*)dst;
unsigned int* s = (unsigned int*)src;
for (int y = 0; y < dst_h; y++)
{
int scaled_y = (int)(y * scale_h);
int dst_row = dst_surf_w * (y + dst_y);
if (scaled_y == last_y)
{
memcpy(&d[dst_x + dst_row], &d[dst_x + last_row], size);
continue;
}
last_y = scaled_y;
last_row = dst_row;
int src_row = src_surf_w * (scaled_y + src_y);
for (int x = 0; x < dst_w; x++)
{
int scaled_x = (int)(x * scale_w);
d[x + dst_x + dst_row] = s[scaled_x + src_x + src_row];
}
}
}
} }