Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify decal system. #223

Merged
merged 1 commit into from
Nov 21, 2024
Merged

Simplify decal system. #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion client.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ typedef struct decalsystem_s
model_t *model;
double lastupdatetime;
int maxdecals;
int freedecal;
int numdecals;
tridecal_t *decals;
float *vertex3f;
Expand Down
42 changes: 7 additions & 35 deletions gl_rmain.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9141,7 +9141,6 @@ void R_DecalSystem_Reset(decalsystem_t *decalsystem)
static void R_DecalSystem_SpawnTriangle(decalsystem_t *decalsystem, const float *v0, const float *v1, const float *v2, const float *t0, const float *t1, const float *t2, const float *c0, const float *c1, const float *c2, int triangleindex, int surfaceindex, unsigned int decalsequence)
{
tridecal_t *decal;
tridecal_t *decals;
int i;

// expand or initialize the system
Expand Down Expand Up @@ -9169,13 +9168,7 @@ static void R_DecalSystem_SpawnTriangle(decalsystem_t *decalsystem, const float
}

// grab a decal and search for another free slot for the next one
decals = decalsystem->decals;
decal = decalsystem->decals + (i = decalsystem->freedecal++);
for (i = decalsystem->freedecal;i < decalsystem->numdecals && decals[i].color4f[0][3];i++)
;
decalsystem->freedecal = i;
if (decalsystem->numdecals <= i)
decalsystem->numdecals = i + 1;
decal = &decalsystem->decals[decalsystem->numdecals++];

// initialize the decal
decal->lived = 0;
Expand Down Expand Up @@ -9541,7 +9534,6 @@ static void R_DrawModelDecals_FadeEntity(entity_render_t *ent)
{
int i;
decalsystem_t *decalsystem = &ent->decalsystem;
int numdecals;
unsigned int killsequence;
tridecal_t *decal;
float frametime;
Expand All @@ -9567,38 +9559,18 @@ static void R_DrawModelDecals_FadeEntity(entity_render_t *ent)
else
frametime = 0;
decalsystem->lastupdatetime = r_refdef.scene.time;
numdecals = decalsystem->numdecals;

for (i = 0, decal = decalsystem->decals;i < numdecals;i++, decal++)
for (i = 0, decal = decalsystem->decals;i < decalsystem->numdecals;i++, decal++)
{
if (decal->color4f[0][3])
decal->lived += frametime;
if (killsequence > decal->decalsequence || decal->lived >= lifetime)
{
decal->lived += frametime;
if (killsequence > decal->decalsequence || decal->lived >= lifetime)
{
memset(decal, 0, sizeof(*decal));
if (decalsystem->freedecal > i)
decalsystem->freedecal = i;
}
*decal = decalsystem->decals[--decalsystem->numdecals];
--i, --decal; // Consider the just moved decal next.
}
}
decal = decalsystem->decals;
while (numdecals > 0 && !decal[numdecals-1].color4f[0][3])
numdecals--;

// collapse the array by shuffling the tail decals into the gaps
for (;;)
{
while (decalsystem->freedecal < numdecals && decal[decalsystem->freedecal].color4f[0][3])
decalsystem->freedecal++;
if (decalsystem->freedecal == numdecals)
break;
decal[decalsystem->freedecal] = decal[--numdecals];
}

decalsystem->numdecals = numdecals;

if (numdecals <= 0)
if (decalsystem->numdecals <= 0)
{
// if there are no decals left, reset decalsystem
R_DecalSystem_Reset(decalsystem);
Expand Down
Loading