mirror of
https://git.do.srb2.org/KartKrew/Kart-Public.git
synced 2024-11-17 02:01:15 +00:00
Gave the new flag-based system for sprite angles actual flag names instead of relying on magic numbers.
Also, I did a wee smidgen of reorganisation.
This commit is contained in:
parent
f08e996e76
commit
41b35a923f
3 changed files with 52 additions and 43 deletions
|
@ -5092,14 +5092,21 @@ static void HWR_ProjectSprite(mobj_t *thing)
|
||||||
I_Error("sprframes NULL for sprite %d\n", thing->sprite);
|
I_Error("sprframes NULL for sprite %d\n", thing->sprite);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (sprframe->rotate)
|
if (sprframe->rotate == SRF_SINGLE)
|
||||||
|
{
|
||||||
|
// use single rotation for all views
|
||||||
|
rot = 0; //Fab: for vis->patch below
|
||||||
|
lumpoff = sprframe->lumpid[0]; //Fab: see note above
|
||||||
|
flip = sprframe->flip; // Will only be 0x00 or 0xFF
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
// choose a different rotation based on player view
|
// choose a different rotation based on player view
|
||||||
ang = R_PointToAngle (thing->x, thing->y) - thing->angle;
|
ang = R_PointToAngle (thing->x, thing->y) - thing->angle;
|
||||||
|
|
||||||
if ((ang < ANGLE_180) && (sprframe->rotate & 4)) // See from right
|
if ((ang < ANGLE_180) && (sprframe->rotate & SRF_RIGHT)) // See from right
|
||||||
rot = 6; // F7 slot
|
rot = 6; // F7 slot
|
||||||
else if ((ang >= ANGLE_180) && (sprframe->rotate & 2)) // See from left
|
else if ((ang >= ANGLE_180) && (sprframe->rotate & SRF_LEFT)) // See from left
|
||||||
rot = 2; // F3 slot
|
rot = 2; // F3 slot
|
||||||
else // Normal behaviour
|
else // Normal behaviour
|
||||||
rot = (ang+ANGLE_202h)>>29;
|
rot = (ang+ANGLE_202h)>>29;
|
||||||
|
@ -5108,13 +5115,6 @@ static void HWR_ProjectSprite(mobj_t *thing)
|
||||||
lumpoff = sprframe->lumpid[rot];
|
lumpoff = sprframe->lumpid[rot];
|
||||||
flip = sprframe->flip & (1<<rot);
|
flip = sprframe->flip & (1<<rot);
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
// use single rotation for all views
|
|
||||||
rot = 0; //Fab: for vis->patch below
|
|
||||||
lumpoff = sprframe->lumpid[0]; //Fab: see note above
|
|
||||||
flip = sprframe->flip; // Will only be 0x00 or 0xFF
|
|
||||||
}
|
|
||||||
|
|
||||||
if (thing->skin && ((skin_t *)thing->skin)->flags & SF_HIRES)
|
if (thing->skin && ((skin_t *)thing->skin)->flags & SF_HIRES)
|
||||||
this_scale = this_scale * FIXED_TO_FLOAT(((skin_t *)thing->skin)->highresscale);
|
this_scale = this_scale * FIXED_TO_FLOAT(((skin_t *)thing->skin)->highresscale);
|
||||||
|
|
18
src/r_defs.h
18
src/r_defs.h
|
@ -729,11 +729,21 @@ typedef struct
|
||||||
#pragma pack()
|
#pragma pack()
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
typedef enum
|
||||||
|
{
|
||||||
|
SRF_SINGLE = 0, // 0-angle for all rotations
|
||||||
|
SRF_3D = 1, // Angles 1-8
|
||||||
|
SRF_LEFT = 2, // Left side has single patch
|
||||||
|
SRF_RIGHT = 4, // Right side has single patch
|
||||||
|
SRF_2D = 6, // SRF_LEFT|SRF_RIGHT
|
||||||
|
SRF_NONE = 0xff // Initial value
|
||||||
|
} spriterotateflags_t; // SRF's up!
|
||||||
|
|
||||||
//
|
//
|
||||||
// Sprites are patches with a special naming convention so they can be
|
// Sprites are patches with a special naming convention so they can be
|
||||||
// recognized by R_InitSprites.
|
// recognized by R_InitSprites.
|
||||||
// The base name is NNNNFx or NNNNFxFx, with x indicating the rotation,
|
// The base name is NNNNFx or NNNNFxFx, with x indicating the rotation,
|
||||||
// x = 0, 1-7.
|
// x = 0, 1-8, L/R
|
||||||
// The sprite and frame specified by a thing_t is range checked at run time.
|
// The sprite and frame specified by a thing_t is range checked at run time.
|
||||||
// A sprite is a patch_t that is assumed to represent a three dimensional
|
// A sprite is a patch_t that is assumed to represent a three dimensional
|
||||||
// object and may have multiple rotations predrawn.
|
// object and may have multiple rotations predrawn.
|
||||||
|
@ -745,13 +755,9 @@ typedef struct
|
||||||
//
|
//
|
||||||
typedef struct
|
typedef struct
|
||||||
{
|
{
|
||||||
// If false use 0 for any position.
|
|
||||||
// If L is present, (rotate & 2) == 2.
|
|
||||||
// If R is present, (rotate & 4) == 4.
|
|
||||||
// Otherwise, use 1.
|
|
||||||
// Note: as eight entries are available, we might as well insert the same
|
// Note: as eight entries are available, we might as well insert the same
|
||||||
// name eight times.
|
// name eight times.
|
||||||
UINT8 rotate;
|
UINT8 rotate; // see spriterotateflags_t above
|
||||||
|
|
||||||
// Lump to use for view angles 0-7.
|
// Lump to use for view angles 0-7.
|
||||||
lumpnum_t lumppat[8]; // lump number 16 : 16 wad : lump
|
lumpnum_t lumppat[8]; // lump number 16 : 16 wad : lump
|
||||||
|
|
|
@ -109,12 +109,12 @@ static void R_InstallSpriteLump(UINT16 wad, // graphics patch
|
||||||
if (rotation == 0)
|
if (rotation == 0)
|
||||||
{
|
{
|
||||||
// the lump should be used for all rotations
|
// the lump should be used for all rotations
|
||||||
if (sprtemp[frame].rotate == 0)
|
if (sprtemp[frame].rotate == SRF_SINGLE)
|
||||||
CONS_Debug(DBG_SETUP, "R_InitSprites: Sprite %s frame %c has multiple rot = 0 lump\n", spritename, cn);
|
CONS_Debug(DBG_SETUP, "R_InitSprites: Sprite %s frame %c has multiple rot = 0 lump\n", spritename, cn);
|
||||||
else if (sprtemp[frame].rotate != 0xff) // Let's complain for both 1-8 and L/R rotations.
|
else if (sprtemp[frame].rotate != SRF_NONE) // Let's complain for both 1-8 and L/R rotations.
|
||||||
CONS_Debug(DBG_SETUP, "R_InitSprites: Sprite %s frame %c has rotations and a rot = 0 lump\n", spritename, cn);
|
CONS_Debug(DBG_SETUP, "R_InitSprites: Sprite %s frame %c has rotations and a rot = 0 lump\n", spritename, cn);
|
||||||
|
|
||||||
sprtemp[frame].rotate = 0;
|
sprtemp[frame].rotate = SRF_SINGLE;
|
||||||
for (r = 0; r < 8; r++)
|
for (r = 0; r < 8; r++)
|
||||||
{
|
{
|
||||||
sprtemp[frame].lumppat[r] = lumppat;
|
sprtemp[frame].lumppat[r] = lumppat;
|
||||||
|
@ -129,16 +129,20 @@ static void R_InstallSpriteLump(UINT16 wad, // graphics patch
|
||||||
UINT8 rightfactor = ((rotation == ROT_R) ? 4 : 0);
|
UINT8 rightfactor = ((rotation == ROT_R) ? 4 : 0);
|
||||||
|
|
||||||
// the lump should be used for half of all rotations
|
// the lump should be used for half of all rotations
|
||||||
if (sprtemp[frame].rotate == 0)
|
if (sprtemp[frame].rotate == SRF_SINGLE)
|
||||||
CONS_Debug(DBG_SETUP, "R_InitSprites: Sprite %s frame %c has L/R rotations and a rot = 0 lump\n", spritename, cn);
|
CONS_Debug(DBG_SETUP, "R_InitSprites: Sprite %s frame %c has L/R rotations and a rot = 0 lump\n", spritename, cn);
|
||||||
else if (sprtemp[frame].rotate == 1)
|
else if (sprtemp[frame].rotate == SRF_3D)
|
||||||
CONS_Debug(DBG_SETUP, "R_InitSprites: Sprite %s frame %c has both L/R and 1-8 rotations\n", spritename, cn);
|
CONS_Debug(DBG_SETUP, "R_InitSprites: Sprite %s frame %c has both L/R and 1-8 rotations\n", spritename, cn);
|
||||||
// Let's not complain about multiple L/R rotations. It's not worth the effort.
|
// Let's not complain about multiple L/R rotations. It's not worth the effort.
|
||||||
|
|
||||||
if (sprtemp[frame].rotate == 0xff)
|
if (sprtemp[frame].rotate == SRF_NONE)
|
||||||
sprtemp[frame].rotate = 0;
|
sprtemp[frame].rotate = SRF_SINGLE;
|
||||||
|
|
||||||
|
sprtemp[frame].rotate |= ((rotation == ROT_R) ? SRF_RIGHT : SRF_LEFT);
|
||||||
|
|
||||||
|
if (sprtemp[frame].rotate == (SRF_3D|SRF_2D))
|
||||||
|
sprtemp[frame].rotate = SRF_2D; // SRF_3D|SRF_2D being enabled at the same time doesn't HURT in the current sprite angle implementation, but it DOES mean more to check in some of the helper functions. Let's not allow this scenario to happen.
|
||||||
|
|
||||||
sprtemp[frame].rotate |= ((rotation == ROT_R) ? 4 : 2);
|
|
||||||
for (r = 1; r < 4; r++) // Don't set for front/back frames
|
for (r = 1; r < 4; r++) // Don't set for front/back frames
|
||||||
{
|
{
|
||||||
sprtemp[frame].lumppat[r + rightfactor] = lumppat;
|
sprtemp[frame].lumppat[r + rightfactor] = lumppat;
|
||||||
|
@ -149,20 +153,20 @@ static void R_InstallSpriteLump(UINT16 wad, // graphics patch
|
||||||
}
|
}
|
||||||
|
|
||||||
// the lump is only used for one rotation
|
// the lump is only used for one rotation
|
||||||
if (sprtemp[frame].rotate == 0)
|
if (sprtemp[frame].rotate == SRF_SINGLE)
|
||||||
CONS_Debug(DBG_SETUP, "R_InitSprites: Sprite %s frame %c has 1-8 rotations and a rot = 0 lump\n", spritename, cn);
|
CONS_Debug(DBG_SETUP, "R_InitSprites: Sprite %s frame %c has 1-8 rotations and a rot = 0 lump\n", spritename, cn);
|
||||||
else if (sprtemp[frame].rotate != 1)
|
else if ((sprtemp[frame].rotate != SRF_3D) && (sprtemp[frame].rotate != SRF_NONE))
|
||||||
CONS_Debug(DBG_SETUP, "R_InitSprites: Sprite %s frame %c has both L/R and 1-8 rotations\n", spritename, cn);
|
CONS_Debug(DBG_SETUP, "R_InitSprites: Sprite %s frame %c has both L/R and 1-8 rotations\n", spritename, cn);
|
||||||
|
|
||||||
// make 0 based
|
// make 0 based
|
||||||
rotation--;
|
rotation--;
|
||||||
|
|
||||||
if (rotation == 0 || rotation == 4) // Front or back...
|
if (rotation == 0 || rotation == 4) // Front or back...
|
||||||
sprtemp[frame].rotate = 1; // Prevent L and R changeover
|
sprtemp[frame].rotate = SRF_3D; // Prevent L and R changeover
|
||||||
else if (rotation > 3) // Right side
|
else if (rotation > 3) // Right side
|
||||||
sprtemp[frame].rotate = (1 | (sprtemp[frame].rotate & 2)); // Continue allowing L frame changeover
|
sprtemp[frame].rotate = (SRF_3D | (sprtemp[frame].rotate & SRF_LEFT)); // Continue allowing L frame changeover
|
||||||
else // if (rotation <= 3) // Left side
|
else // if (rotation <= 3) // Left side
|
||||||
sprtemp[frame].rotate = (1 | (sprtemp[frame].rotate & 4)); // Continue allowing R frame changeover
|
sprtemp[frame].rotate = (SRF_3D | (sprtemp[frame].rotate & SRF_RIGHT)); // Continue allowing R frame changeover
|
||||||
|
|
||||||
if (sprtemp[frame].lumppat[rotation] != LUMPERROR)
|
if (sprtemp[frame].lumppat[rotation] != LUMPERROR)
|
||||||
CONS_Debug(DBG_SETUP, "R_InitSprites: Sprite %s: %c%c has two lumps mapped to it\n", spritename, cn, '1'+rotation);
|
CONS_Debug(DBG_SETUP, "R_InitSprites: Sprite %s: %c%c has two lumps mapped to it\n", spritename, cn, '1'+rotation);
|
||||||
|
@ -308,17 +312,16 @@ static boolean R_AddSingleSpriteDef(const char *sprname, spritedef_t *spritedef,
|
||||||
{
|
{
|
||||||
switch (sprtemp[frame].rotate)
|
switch (sprtemp[frame].rotate)
|
||||||
{
|
{
|
||||||
case 0xff:
|
case SRF_NONE:
|
||||||
// no rotations were found for that frame at all
|
// no rotations were found for that frame at all
|
||||||
I_Error("R_AddSingleSpriteDef: No patches found for %s frame %c", sprname, R_Frame2Char(frame));
|
I_Error("R_AddSingleSpriteDef: No patches found for %s frame %c", sprname, R_Frame2Char(frame));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 0:
|
case SRF_SINGLE:
|
||||||
// only the first rotation is needed
|
// only the first rotation is needed
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 6: // (rotate & (2|4)) == (2|4) - both Left and Right rotations
|
case SRF_2D: // both Left and Right rotations
|
||||||
case 7:
|
|
||||||
// we test to see whether the left and right slots are present
|
// we test to see whether the left and right slots are present
|
||||||
if ((sprtemp[frame].lumppat[2] == LUMPERROR) || (sprtemp[frame].lumppat[6] == LUMPERROR))
|
if ((sprtemp[frame].lumppat[2] == LUMPERROR) || (sprtemp[frame].lumppat[6] == LUMPERROR))
|
||||||
I_Error("R_AddSingleSpriteDef: Sprite %s frame %c is missing rotations",
|
I_Error("R_AddSingleSpriteDef: Sprite %s frame %c is missing rotations",
|
||||||
|
@ -1167,14 +1170,21 @@ static void R_ProjectSprite(mobj_t *thing)
|
||||||
I_Error("R_ProjectSprite: sprframes NULL for sprite %d\n", thing->sprite);
|
I_Error("R_ProjectSprite: sprframes NULL for sprite %d\n", thing->sprite);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (sprframe->rotate)
|
if (sprframe->rotate == SRF_SINGLE)
|
||||||
|
{
|
||||||
|
// use single rotation for all views
|
||||||
|
rot = 0; //Fab: for vis->patch below
|
||||||
|
lump = sprframe->lumpid[0]; //Fab: see note above
|
||||||
|
flip = sprframe->flip; // Will only be 0x00 or 0xFF
|
||||||
|
}
|
||||||
|
else
|
||||||
{
|
{
|
||||||
// choose a different rotation based on player view
|
// choose a different rotation based on player view
|
||||||
ang = R_PointToAngle (thing->x, thing->y) - thing->angle;
|
ang = R_PointToAngle (thing->x, thing->y) - thing->angle;
|
||||||
|
|
||||||
if ((ang < ANGLE_180) && (sprframe->rotate & 4)) // See from right
|
if ((ang < ANGLE_180) && (sprframe->rotate & SRF_RIGHT)) // See from right
|
||||||
rot = 6; // F7 slot
|
rot = 6; // F7 slot
|
||||||
else if ((ang >= ANGLE_180) && (sprframe->rotate & 2)) // See from left
|
else if ((ang >= ANGLE_180) && (sprframe->rotate & SRF_LEFT)) // See from left
|
||||||
rot = 2; // F3 slot
|
rot = 2; // F3 slot
|
||||||
else // Normal behaviour
|
else // Normal behaviour
|
||||||
rot = (ang+ANGLE_202h)>>29;
|
rot = (ang+ANGLE_202h)>>29;
|
||||||
|
@ -1183,13 +1193,6 @@ static void R_ProjectSprite(mobj_t *thing)
|
||||||
lump = sprframe->lumpid[rot];
|
lump = sprframe->lumpid[rot];
|
||||||
flip = sprframe->flip & (1<<rot);
|
flip = sprframe->flip & (1<<rot);
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
// use single rotation for all views
|
|
||||||
rot = 0; //Fab: for vis->patch below
|
|
||||||
lump = sprframe->lumpid[0]; //Fab: see note above
|
|
||||||
flip = sprframe->flip; // Will only be 0x00 or 0xFF
|
|
||||||
}
|
|
||||||
|
|
||||||
I_Assert(lump < max_spritelumps);
|
I_Assert(lump < max_spritelumps);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue