stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-24 21:31:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add use_pixel_alpha parameter

Browse source
This commit is contained in:
Lactozilla 2023-11-01 20:46:09 -03:00
parent 5a89823cc6
commit d6700a7584
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/lua_hudlib.c
View file

@ -450,6 +450,7 @@ static int lib_patch_copy(lua_State *L)
int dx = luaL_optinteger(L, 7, 0);
int dy = luaL_optinteger(L, 8, 0);
boolean copy_transparent = lua_optboolean(L, 9);
boolean use_pixel_alpha = lua_optboolean(L, 10);
if (sw <= 0)
return luaL_error(L, "invalid copy rect width");
@ -488,9 +489,7 @@ static int lib_patch_copy(lua_State *L)
Patch_UpdatePixels(patch, patch_update_buffer, src_img_width, src_img_height, format, sx, sy, sw, sh, dx, dy, copy_transparent);
}
else
{
V_DrawIntoPatch(patch, src_patch, dx << FRACBITS, dy << FRACBITS, FRACUNIT, FRACUNIT, 0, NULL, sx << FRACBITS, sy << FRACBITS, sw << FRACBITS, sh << FRACBITS, copy_transparent);
}
V_DrawIntoPatch(patch, src_patch, dx << FRACBITS, dy << FRACBITS, FRACUNIT, FRACUNIT, 0, NULL, sx << FRACBITS, sy << FRACBITS, sw << FRACBITS, sh << FRACBITS, use_pixel_alpha, copy_transparent);
return 0;
}

14
src/v_video.c
View file

@ -586,14 +586,12 @@ static void standardpdraw_i32o32(void *dest, void *source)
RGBA_t *d = (RGBA_t *)dest;
*d = *s;
}
#if 0
static void standardpdraw_ia32o32(void *dest, void *source)
{
RGBA_t *s = (RGBA_t *)source;
RGBA_t *d = (RGBA_t *)dest;
UINT32 *d = (UINT32 *)dest;
*d = ASTBlendPixel(*(RGBA_t *)d, *s, AST_TRANSLUCENT, 255);
}
#endif
static void translucentpdraw_i32o32(void *dest, void *source)
{
RGBA_t *s = (RGBA_t *)source;
@ -1343,7 +1341,7 @@ void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, IN
}
}
static void V_DrawIntoPatchRGBA(patch_t *dest_patch, patch_t *src_patch, fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 flags, const UINT8 *colormap, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h, boolean copy_transparent)
static void V_DrawIntoPatchRGBA(patch_t *dest_patch, patch_t *src_patch, fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 flags, const UINT8 *colormap, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h, boolean use_pixel_alpha, boolean copy_transparent)
{
if (dest_patch->type != PATCH_TYPE_DYNAMIC)
return;
@ -1432,6 +1430,8 @@ static void V_DrawIntoPatchRGBA(patch_t *dest_patch, patch_t *src_patch, fixed_t
{
if (alphalevel || blendmode)
patchdrawfunc = translucentpdraw_i32o8;
else if (use_pixel_alpha)
patchdrawfunc = standardpdraw_ia32o8;
else
patchdrawfunc = standardpdraw_i32o8;
@ -1441,6 +1441,8 @@ static void V_DrawIntoPatchRGBA(patch_t *dest_patch, patch_t *src_patch, fixed_t
{
if (alphalevel || blendmode)
patchdrawfunc = translucentpdraw_i32o32;
else if (use_pixel_alpha)
patchdrawfunc = standardpdraw_ia32o32;
else
patchdrawfunc = standardpdraw_i32o32;
}
@ -1628,14 +1630,14 @@ static void V_DrawIntoPatchRGBA(patch_t *dest_patch, patch_t *src_patch, fixed_t
}
}
void V_DrawIntoPatch(patch_t *dest_patch, patch_t *src_patch, fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 flags, const UINT8 *colormap, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h, boolean copy_transparent)
void V_DrawIntoPatch(patch_t *dest_patch, patch_t *src_patch, fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 flags, const UINT8 *colormap, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h, boolean use_pixel_alpha, boolean copy_transparent)
{
if (dest_patch->type != PATCH_TYPE_DYNAMIC)
return;
if (src_patch->format != PATCH_FORMAT_PALETTE || dest_patch->format != PATCH_FORMAT_PALETTE)
{
V_DrawIntoPatchRGBA(dest_patch, src_patch, x, y, pscale, vscale, flags, colormap, sx, sy, w, h, copy_transparent);
V_DrawIntoPatchRGBA(dest_patch, src_patch, x, y, pscale, vscale, flags, colormap, sx, sy, w, h, use_pixel_alpha, copy_transparent);
return;
}

2
src/v_video.h
View file

@ -175,7 +175,7 @@ void V_CubeApply(UINT8 *red, UINT8 *green, UINT8 *blue);
void V_DrawPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 scrn, patch_t *patch, const UINT8 *colormap);
void V_DrawCroppedPatch(fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 scrn, patch_t *patch, const UINT8 *colormap, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h);
void V_DrawIntoPatch(patch_t *dest_patch, patch_t *src_patch, fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 flags, const UINT8 *colormap, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h, boolean copy_transparent);
void V_DrawIntoPatch(patch_t *dest_patch, patch_t *src_patch, fixed_t x, fixed_t y, fixed_t pscale, fixed_t vscale, INT32 flags, const UINT8 *colormap, fixed_t sx, fixed_t sy, fixed_t w, fixed_t h, boolean use_pixel_alpha, boolean copy_transparent);
void V_DrawContinueIcon(INT32 x, INT32 y, INT32 flags, INT32 skinnum, UINT16 skincolor);