fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2024-11-10 07:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Better effectinfo compat

Browse source
This commit is contained in:
Shpoike 2019-01-30 04:17:18 +00:00
parent daac6039a5
commit 85821b6fab
6 changed files with 51 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Quake/cl_main.c
View file

@ -718,13 +718,13 @@ void CL_RelinkEntities (void)
{
vec3_t axis[3];
AngleVectors(ent->angles, axis[0], axis[1], axis[2]);
PScript_ParticleTrail(oldorg, ent->origin, cl.particle_precache[ent->netstate.traileffectnum].index, i, axis, &ent->trailstate);
PScript_ParticleTrail(oldorg, ent->origin, cl.particle_precache[ent->netstate.traileffectnum].index, frametime, i, axis, &ent->trailstate);
}
else if (ent->model->traileffect >= 0)
{
vec3_t axis[3];
AngleVectors(ent->angles, axis[0], axis[1], axis[2]);
PScript_ParticleTrail(oldorg, ent->origin, ent->model->traileffect, i, axis, &ent->trailstate);
PScript_ParticleTrail(oldorg, ent->origin, ent->model->traileffect, frametime, i, axis, &ent->trailstate);
}
else
#endif

2
Quake/cl_parse.c
View file

@ -2100,7 +2100,7 @@ static void CL_ParseParticles(int type)
ent = CL_EntityNum(entity);
if (efnum < MAX_PARTICLETYPES && cl.particle_precache[efnum].name)
PScript_ParticleTrail(org, vel, cl.particle_precache[efnum].index, 0, NULL, &ent->trailstate);
PScript_ParticleTrail(org, vel, cl.particle_precache[efnum].index, 1, 0, NULL, &ent->trailstate);
}
else
{ //point

2
Quake/cl_tent.c
View file

@ -557,7 +557,7 @@ void CL_UpdateTEnts (void)
VectorCopy (cl.entities[cl.viewentity].origin, b->start);
}
if (!PScript_ParticleTrail(b->start, b->end, PScript_FindParticleType(b->trailname), b->entity, NULL, &b->trailstate))
if (!PScript_ParticleTrail(b->start, b->end, PScript_FindParticleType(b->trailname), host_frametime, b->entity, NULL, &b->trailstate))
continue;
// calculate pitch and yaw

2
Quake/glquake.h
View file

@ -105,7 +105,7 @@ typedef struct particle_s
void PScript_Shutdown (void);
void PScript_DrawParticles (void);
struct trailstate_s;
int PScript_ParticleTrail (vec3_t startpos, vec3_t end, int type, int dlkey, vec3_t axis[3], struct trailstate_s **tsk);
int PScript_ParticleTrail (vec3_t startpos, vec3_t end, int type, float timeinterval, int dlkey, vec3_t axis[3], struct trailstate_s **tsk);
int PScript_RunParticleEffectState (vec3_t org, vec3_t dir, float count, int typenum, struct trailstate_s **tsk);
void PScript_RunParticleWeather(vec3_t minb, vec3_t maxb, vec3_t dir, float count, int colour, const char *efname);
void PScript_EmitSkyEffectTris(qmodel_t *mod, msurface_t *fa, int ptype);

2
Quake/pr_ext.c
View file

@ -4481,7 +4481,7 @@ static void PF_cl_trailparticles(void)
if (efnum <= 0)
return;
efnum = PF_CL_GetParticle(efnum);
PScript_ParticleTrail(start, end, efnum, -NUM_FOR_EDICT(ent), NULL, NULL/*&ent->trailstate*/);
PScript_ParticleTrail(start, end, efnum, host_frametime, -NUM_FOR_EDICT(ent), NULL, NULL/*&ent->trailstate*/);
}
static void PF_cl_pointparticles(void)
{

66
Quake/r_part_fte.c
View file

@ -126,7 +126,7 @@ static int pe_defaulttrail = P_INVALID;
static float psintable[256];
int PScript_RunParticleEffectState (vec3_t org, vec3_t dir, float count, int typenum, trailstate_t **tsk);
int PScript_ParticleTrail (vec3_t startpos, vec3_t end, int type, int dlkey, vec3_t axis[3], trailstate_t **tsk);
int PScript_ParticleTrail (vec3_t startpos, vec3_t end, int type, float timeinterval, int dlkey, vec3_t axis[3], trailstate_t **tsk);
static qboolean P_LoadParticleSet(char *name, qboolean implicit, qboolean showwarning);
static void R_Particles_KillAllEffects(void);
@ -313,6 +313,8 @@ typedef struct part_type_s {
float countextra;
float count;
float countrand;
float countspacing; //for trails.
float countoverflow; //for badly-designed effects, instead of depending on trail state.
float rainfrequency; //surface emitter multiplier
int assoc;
@ -1791,12 +1793,14 @@ skipread:
else if (!strcmp(var, "step"))
{
ptype->countspacing = atof(value);
ptype->count = 1/atof(value);
if (Cmd_Argc()>2)
ptype->countrand = 1/atof(Cmd_Argv(2));
}
else if (!strcmp(var, "count"))
{
ptype->countspacing = 0;
ptype->count = atof(value);
if (Cmd_Argc()>2)
ptype->countrand = atof(Cmd_Argv(2));
@ -3240,7 +3244,10 @@ static void P_ImportEffectInfo(const char *config, char *line, qboolean part_par
else if (!strcmp(arg[0], "velocitymultiplier") && args == 2)
ptype->veladd = atof(arg[1]);
else if (!strcmp(arg[0], "trailspacing") && args == 2)
ptype->count = 1 / atof(arg[1]);
{
ptype->countspacing = atof(arg[1]);
ptype->count = 1 / ptype->countspacing;
}
else if (!strcmp(arg[0], "time") && args == 3)
{
ptype->die = atof(arg[1]);
@ -5483,13 +5490,14 @@ int PScript_RunParticleEffectTypeString (vec3_t org, vec3_t dir, float count, co
int PScript_EntParticleTrail(vec3_t oldorg, entity_t *ent, const char *name)
{
float timeinterval = cl.time - cl.oldtime;
vec3_t axis[3];
int type = PScript_FindParticleType(name);
if (type < 0)
return 1;
AngleVectors(ent->angles, axis[0], axis[1], axis[2]);
return PScript_ParticleTrail(oldorg, ent->origin, type, ent-cl.entities, axis, &ent->trailstate);
return PScript_ParticleTrail(oldorg, ent->origin, type, timeinterval, ent-cl.entities, axis, &ent->trailstate);
}
/*
@ -5774,7 +5782,7 @@ void PScript_RunParticleWeather(vec3_t minb, vec3_t maxb, vec3_t dir, float coun
}
}
static void PScript_ParticleTrailDraw (vec3_t startpos, vec3_t end, part_type_t *ptype, trailstate_t **tsk, int dlkey, vec3_t dlaxis[3])
static void PScript_ParticleTrailSpawn (vec3_t startpos, vec3_t end, part_type_t *ptype, float timeinterval, trailstate_t **tsk, int dlkey, vec3_t dlaxis[3])
{
vec3_t vec, vstep, right, up, start;
float len;
@ -5827,9 +5835,9 @@ static void PScript_ParticleTrailDraw (vec3_t startpos, vec3_t end, part_type_t
if (ptype->assoc>=0)
{
if (ts)
PScript_ParticleTrail(start, end, ptype->assoc, dlkey, NULL, &(ts->assoc));
PScript_ParticleTrail(start, end, ptype->assoc, timeinterval, dlkey, NULL, &(ts->assoc));
else
PScript_ParticleTrail(start, end, ptype->assoc, dlkey, NULL, NULL);
PScript_ParticleTrail(start, end, ptype->assoc, timeinterval, dlkey, NULL, NULL);
}
if (r_part_contentswitch.value && (ptype->flags & (PT_TRUNDERWATER | PT_TROVERWATER)) && cl.worldmodel)
@ -5860,20 +5868,36 @@ static void PScript_ParticleTrailDraw (vec3_t startpos, vec3_t end, part_type_t
if (!ptype->die)
ts = NULL;
// use ptype step to calc step vector and step size
step = (ptype->count*r_part_density.value) + ptype->countextra;
if (step>0)
{
step = 1/step;
if (step < 0.01)
step = 0.01;
}
else
step = 0;
VectorSubtract (end, start, vec);
len = VectorNormalize (vec);
// use ptype step to calc step vector and step size
if (ptype->countspacing)
{
step = ptype->countspacing; //particles per qu
step /= r_part_density.value; //scaled...
if (ptype->countextra)
{
count = ptype->countextra;
if (step>0)
count += len/step;
step = len/count;
}
}
else
{
step = ptype->count * r_part_density.value * timeinterval;
step += ptype->countextra; //particles per frame
step += ptype->countoverflow;
count = (int)step;
ptype->countoverflow = step-count; //the part that we're forgetting, to add to the next frame...
if (count<=0)
return;
else
step = len/count; //particles per second
}
if (ptype->flags & PT_AVERAGETRAIL)
{
float tavg;
@ -5940,7 +5964,7 @@ static void PScript_ParticleTrailDraw (vec3_t startpos, vec3_t end, part_type_t
step = 0;
VectorClear(vstep);
}
count += ptype->countextra;
// count += ptype->countextra;
while (count-->0)//len < stop)
{
@ -6288,7 +6312,7 @@ static void PScript_ParticleTrailDraw (vec3_t startpos, vec3_t end, part_type_t
return;
}
int PScript_ParticleTrail (vec3_t startpos, vec3_t end, int type, int dlkey, vec3_t axis[3], trailstate_t **tsk)
int PScript_ParticleTrail (vec3_t startpos, vec3_t end, int type, float timeinterval, int dlkey, vec3_t axis[3], trailstate_t **tsk)
{
part_type_t *ptype = &part_type[type];
@ -6313,7 +6337,7 @@ int PScript_ParticleTrail (vec3_t startpos, vec3_t end, int type, int dlkey, vec
ptype = &part_type[ptype->inwater];
}
PScript_ParticleTrailDraw (startpos, end, ptype, tsk, dlkey, axis);
PScript_ParticleTrailSpawn (startpos, end, ptype, timeinterval, tsk, dlkey, axis);
return 0;
}
@ -7393,7 +7417,7 @@ static void PScript_DrawParticleTypes (float pframetime)
if (type->emit >= 0)
{
if (type->emittime < 0)
PScript_ParticleTrail(oldorg, p->org, type->emit, 0, NULL, &p->state.trailstate);
PScript_ParticleTrail(oldorg, p->org, type->emit, pframetime, 0, NULL, &p->state.trailstate);
else if (p->state.nextemit < particletime)
{
p->state.nextemit = particletime + type->emittime + frandom()*type->emitrand;