// these must match r_part.c's textures
static const int tex_smoke[8] = {0, 1, 2, 3, 4, 5, 6, 7};
-static const int tex_bullethole[8] = {8, 9, 10, 11, 12, 13, 14, 15};
-static const int tex_rainsplash[16] = {16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31};
-static const int tex_particle = 32;
-static const int tex_rain = 33;
-static const int tex_bubble = 34;
-static const int tex_rocketglow = 35;
+static const int tex_rainsplash[16] = {8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23};
+static const int tex_particle = 24;
+static const int tex_rain = 25;
+static const int tex_bubble = 26;
+static const int tex_rocketglow = 27;
static int cl_maxparticles;
static int cl_numparticles;
*/
void CL_ParticleExplosion (vec3_t org, int smoke)
{
- int i, j;
- float f;
- vec3_t v, end, ang;
- byte noise1[32*32], noise2[32*32];
-
- VectorClear(end); // hush MSVC
if (cl_particles.integer && cl_particles_explosions.integer)
{
+ int i, j;
+ float f;
+ vec3_t v, end, ang;
+ byte noise1[32*32], noise2[32*32];
+
+ VectorClear(end); // hush MSVC
i = Mod_PointInLeaf(org, cl.worldmodel)->contents;
if (i == CONTENTS_SLIME || i == CONTENTS_WATER)
{
particle(pt_bubble, PARTICLE_BILLBOARD, 0xFFFFFF, tex_bubble, false, true, 2, 2, 255, 9999, 1.5, org[0] + lhrandom(-16, 16), org[1] + lhrandom(-16, 16), org[2] + lhrandom(-16, 16), lhrandom(-96, 96), lhrandom(-96, 96), lhrandom(-96, 96), 0, 0, 0, 0, 0, 0);
ang[2] = lhrandom(0, 360);
- fractalnoise(noise1, 32, 4);
- fractalnoise(noise2, 32, 8);
+ fractalnoisequick(noise1, 32, 4);
+ fractalnoisequick(noise2, 32, 8);
for (i = 0;i < 32;i++)
{
for (j = 0;j < 32;j++)
{
VectorRandom(v);
VectorMA(org, 16, v, v);
- TraceLine(org, v, end, NULL, 0);
+ TraceLine(org, v, end, NULL, 0, true);
ang[0] = (j + 0.5f) * (360.0f / 32.0f);
ang[1] = (i + 0.5f) * (360.0f / 32.0f);
AngleVectors(ang, v, NULL, NULL);
else
{
ang[2] = lhrandom(0, 360);
- fractalnoise(noise1, 32, 4);
- fractalnoise(noise2, 32, 8);
+ fractalnoisequick(noise1, 32, 4);
+ fractalnoisequick(noise2, 32, 8);
for (i = 0;i < 32;i++)
{
for (j = 0;j < 32;j++)
{
VectorRandom(v);
VectorMA(org, 16, v, v);
- TraceLine(org, v, end, NULL, 0);
+ TraceLine(org, v, end, NULL, 0, true);
ang[0] = (j + 0.5f) * (360.0f / 32.0f);
ang[1] = (i + 0.5f) * (360.0f / 32.0f);
AngleVectors(ang, v, NULL, NULL);
}
else
R_NewExplosion(org);
+ R_Stain(org, 96, 80, 80, 80, 128, 176, 176, 176, 128);
}
/*
int i;
if (!cl_particles.integer) return;
+ R_Stain(org, 96, 96, 64, 96, 128, 160, 128, 160, 128);
for (i = 0;i < 256;i++)
particle(pt_blob , PARTICLE_BILLBOARD, particlepalette[ 66+(rand()%6)], tex_particle, false, true, 4, 4, 255, 9999, 0, org[0] + lhrandom(-16, 16), org[1] + lhrandom(-16, 16), org[2] + lhrandom(-16, 16), lhrandom(-4, 4), lhrandom(-4, 4), lhrandom(-128, 128), 0, 0, 0, 0, 0, 0);
for (i = 0;i < 256;i++)
{
if (!cl_particles.integer) return;
- CL_Decal(org, tex_bullethole[rand()&7], 16 * cl_particles_size.value, 0, 0, 0, 1);
+ R_Stain(org, 32, 96, 96, 96, 32, 128, 128, 128, 32);
// smoke puff
if (cl_particles_smoke.integer)
{
// sparks
while(count--)
- particle(pt_spark, PARTICLE_BILLBOARD, particlepalette[0x68 + (rand() & 7)], tex_particle, false, true, 1, 1, lhrandom(0, 255), 9999, 1.5, org[0], org[1], org[2], lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(0, 128), 512.0f, 0, 0, 0, 0.2f, 0);
+ particle(pt_spark, PARTICLE_BILLBOARD, particlepalette[0x68 + (rand() & 7)], tex_particle, false, true, 1, 1, lhrandom(0, 255), 9999, 1.5, org[0], org[1], org[2], lhrandom(-64, 64) + dir[0], lhrandom(-64, 64) + dir[1], lhrandom(0, 128) + dir[2], 512.0f, 0, 0, 0, 0.2f, 0);
}
}
+void CL_PlasmaBurn (vec3_t org)
+{
+ if (!cl_particles.integer) return;
+
+ R_Stain(org, 48, 96, 96, 96, 48, 128, 128, 128, 48);
+}
+
void CL_BloodPuff (vec3_t org, vec3_t vel, int count)
{
// bloodcount is used to accumulate counts too small to cause a blood particle
VectorSubtract(end, start, dir);
VectorNormalize(dir);
- if (type == 0 && host_frametime != 0) // rocket glow
- particle(pt_oneframe, PARTICLE_BILLBOARD, 0xFFFFFF, tex_rocketglow, false, true, 24, 24, 255, 9999, 0, end[0] - 12 * dir[0], end[1] - 12 * dir[1], end[2] - 12 * dir[2], 0, 0, 0, 0, 0, 0, 0, 0, 0);
+ //if (type == 0 && host_frametime != 0) // rocket glow
+ // particle(pt_oneframe, PARTICLE_BILLBOARD, 0xFFFFFF, tex_rocketglow, false, true, 24, 24, 255, 9999, 0, end[0] - 12 * dir[0], end[1] - 12 * dir[1], end[2] - 12 * dir[2], 0, 0, 0, 0, 0, 0, 0, 0, 0);
t = ent->persistent.trail_time;
if (t >= cl.time)
{
particle_t *p;
renderparticle_t *r;
- int i, activeparticles, maxparticle, j, a, b, pressureused = false;
- float gravity, dvel, frametime, f, dist, normal[3], v[3], org[3], o[3];
+ int i, activeparticles, maxparticle, j, a, pressureused = false;
+ float gravity, dvel, frametime, f, dist, normal[3], v[3], org[3];
// LordHavoc: early out condition
if (!cl_numparticles)
VectorCopy(p->org, org);
if (p->bounce)
{
- if (TraceLine(p->oldorg, p->org, v, normal, 0) < 1)
+ if (TraceLine(p->oldorg, p->org, v, normal, 0, true) < 1)
{
VectorCopy(v, p->org);
if (p->bounce < 0)
{
- CL_Decal(v, p->tex, p->scalex * cl_particles_size.value, p->color[0] * (1.0f / 255.0f), p->color[1] * (1.0f / 255.0f), p->color[2] * (1.0f / 255.0f), p->alpha * (1.0f / 255.0f));
+ // assume it's blood (lame, but...)
+ R_Stain(v, 48, 64, 24, 24, 48, 192, 48, 48, 48);
p->die = -1;
freeparticles[j++] = p;
continue;
p->vel[2] = 96;
break;
default: // CONTENTS_SOLID and any others
- TraceLine(p->oldorg, p->org, v, normal, 0);
+ TraceLine(p->oldorg, p->org, v, normal, 0, true);
VectorCopy(v, p->org);
p->tex = tex_smoke[rand()&7];
p->orientation = PARTICLE_BILLBOARD;
p->die = -1;
break;
case pt_rain:
+ a = Mod_PointInLeaf(p->org, cl.worldmodel)->contents;
+ if (a != CONTENTS_EMPTY && a != CONTENTS_SKY)
+ p->die = -1;
+ /*
f = 0;
b = Mod_PointInLeaf(p->oldorg, cl.worldmodel)->contents;
VectorCopy(p->oldorg, o);
while (f < 1)
{
a = b;
- f = TraceLine(o, p->org, v, normal, a);
+ f = TraceLine(o, p->org, v, normal, a, true);
b = traceline_endcontents;
if (f < 1 && b != CONTENTS_EMPTY && b != CONTENTS_SKY)
{
+ #if 1
p->die = -1;
- /*
+ #else
p->die = cl.time + 1000;
p->vel[0] = p->vel[1] = p->vel[2] = 0;
VectorCopy(v, p->org);
p->scaley = 8;
break;
}
- */
+ #endif
+ break;
}
}
+ */
break;
/*
case pt_raindropsplash:
projects / xonotic / darkplaces.git / blobdiff