void R_InitParticleTexture (void)
{
- int x,y,d,i;
+ int x,y,d,i,m;
float dx, dy;
- byte data[32][32][4], noise1[32][32], noise2[32][32];
+ byte data[32][32][4], noise1[128][128], noise2[128][128];
vec3_t light;
- for (x=0 ; x<32 ; x++)
+ for (y = 0;y < 32;y++)
{
- for (y=0 ; y<32 ; y++)
+ dy = y - 16;
+ for (x = 0;x < 32;x++)
{
data[y][x][0] = data[y][x][1] = data[y][x][2] = 255;
dx = x - 16;
- dy = y - 16;
d = (255 - (dx*dx+dy*dy));
if (d < 0) d = 0;
data[y][x][3] = (byte) d;
for (i = 0;i < 8;i++)
{
- fractalnoise(&noise1[0][0], 32, 1);
- fractalnoise(&noise2[0][0], 32, 8);
- for (y = 0;y < 32;y++)
- for (x = 0;x < 32;x++)
+ do
+ {
+ fractalnoise(&noise1[0][0], 128, 8);
+ fractalnoise(&noise2[0][0], 128, 16);
+ m = 0;
+ for (y = 0;y < 32;y++)
{
- data[y][x][0] = data[y][x][1] = data[y][x][2] = (noise1[y][x] >> 1) + 128;
- dx = x - 16;
dy = y - 16;
- d = ((noise2[y][x] * 384) >> 8) - 128;
- if (d > 0)
+ for (x = 0;x < 32;x++)
{
- if (d > 255)
- d = 255;
- d = (d * (255 - (int) (dx*dx+dy*dy))) >> 8;
- if (d < 0) d = 0;
- if (d > 255) d = 255;
- data[y][x][3] = (byte) d;
+ int j;
+ j = (noise1[y][x] - 128) * 2 + 128;
+ if (j < 0) j = 0;
+ if (j > 255) j = 255;
+ data[y][x][0] = data[y][x][1] = data[y][x][2] = j;
+ dx = x - 16;
+ d = (noise2[y][x] - 128) * 4 + 128;
+ if (d > 0)
+ {
+ d = (d * (255 - (int) (dx*dx+dy*dy))) >> 8;
+ //j = (sqrt(dx*dx+dy*dy) * 2.0f - 16.0f);
+ //if (j > 0)
+ // d = (d * (255 - j*j)) >> 8;
+ if (d < 0) d = 0;
+ if (d > 255) d = 255;
+ data[y][x][3] = (byte) d;
+ if (m < d)
+ m = d;
+ }
}
- else
- data[y][x][3] = 0;
}
+ }
+ while (m < 192);
smokeparticletexture[i] = GL_LoadTexture (va("smokeparticletexture%d", i), 32, 32, &data[0][0][0], true, true, 4);
}
void r_part_start()
{
- particles = (particle_t *) malloc (r_numparticles * sizeof(particle_t));
- freeparticles = (void *) malloc (r_numparticles * sizeof(particle_t *));
+ particles = (particle_t *) qmalloc(r_numparticles * sizeof(particle_t));
+ freeparticles = (void *) qmalloc(r_numparticles * sizeof(particle_t *));
R_InitParticleTexture ();
}
void r_part_shutdown()
{
- free(particles);
- free(freeparticles);
+ qfree(particles);
+ qfree(freeparticles);
}
/*
R_InitParticles
===============
*/
+void R_ReadPointFile_f (void);
void R_Particles_Init (void)
{
int i;
r_numparticles = MAX_PARTICLES;
}
+ Cmd_AddCommand ("pointfile", R_ReadPointFile_f);
+
Cvar_RegisterVariable (&r_particles);
Cvar_RegisterVariable (&r_dynamicparticles);
int i;
if (!r_particles.value) return; // LordHavoc: particles are optional
- particle(pt_smokecloud, (rand()&7) + 8, smokeparticletexture[rand()&7], 30, 160, 2, org[0], org[1], org[2], 0, 0, 0);
+ particle(pt_smokecloud, (rand()&7) + 8, smokeparticletexture[rand()&7], 30, 255, 2, org[0], org[1], org[2], 0, 0, 0);
i = Mod_PointInLeaf(org, cl.worldmodel)->contents;
if (i == CONTENTS_SLIME || i == CONTENTS_WATER)
else
{
for (i = 0;i < 256;i++)
- particle(pt_fallfadespark, ramp3[rand()%6], particletexture, 1.5, lhrandom(0, 255), 5, lhrandom(-16, 16) + org[0], lhrandom(-16, 16) + org[1], lhrandom(-16, 16) + org[2], lhrandom(-192, 192), lhrandom(-192, 192), lhrandom(-192, 192) + 192);
+ particle(pt_fallfadespark, ramp3[rand()%6], particletexture, 1.5, lhrandom(128, 255), 5, lhrandom(-16, 16) + org[0], lhrandom(-16, 16) + org[1], lhrandom(-16, 16) + org[2], lhrandom(-192, 192), lhrandom(-192, 192), lhrandom(-192, 192) + 192);
}
}
if (!r_particles.value) return; // LordHavoc: particles are optional
// smoke puff
- particle(pt_smokecloud, 12+(rand()&3), smokeparticletexture[rand()&7], 8, 64, 99, org[0], org[1], org[2], 0, 0, 0);
+ particle(pt_smoke, 12+(rand()&3), smokeparticletexture[rand()&7], 8, 160, 99, org[0], org[1], org[2], 0, 0, 0);
// sparks
while(count--)
// particle2(pt_fallfadespark, ramp3[rand()%6], particletexture, 1, lhrandom(0, 255), 5, org, 4, 96);
{
if (!r_particles.value) return; // LordHavoc: particles are optional
- particle(pt_bloodcloud, 68+(rand()&3), smokeparticletexture[rand()&7], 12, 128, 99, org[0], org[1], org[2], 0, 0, 0);
+ particle(pt_bloodcloud, 251 /*68+(rand()&3)*/, smokeparticletexture[rand()&7], 12, 128, 99, org[0], org[1], org[2], 0, 0, 0);
+ particle(pt_bloodcloud, 251 /*68+(rand()&3)*/, smokeparticletexture[rand()&7], 10, 128, 99, org[0] + lhrandom(-4, 4), org[1] + lhrandom(-4, 4), org[2] + lhrandom(-4, 4), 0, 0, 0);
+ particle(pt_bloodcloud, 251 /*68+(rand()&3)*/, smokeparticletexture[rand()&7], 8, 128, 99, org[0] + lhrandom(-4, 4), org[1] + lhrandom(-4, 4), org[2] + lhrandom(-4, 4), 0, 0, 0);
}
void R_BloodShower (vec3_t mins, vec3_t maxs, float velspeed, int count)
ALLOCPARTICLE
p->texnum = smokeparticletexture[rand()&7];
- p->scale = lhrandom(6, 8);
+ p->scale = lhrandom(4, 6);
p->alpha = 96 + (rand()&63);
p->die = cl.time + 2;
p->type = pt_bloodcloud;
- p->color = (rand()&3)+68;
+ p->color = 251; //(rand()&3)+68;
for (j=0 ; j<3 ; j++)
{
p->org[j] = diff[j] * (float) (rand()%1024) * (1.0 / 1024.0) + mins[j];
case 1: // grenade trail
if (bubbles)
{
- dec = 0.005f;
+ dec = type == 0 ? 0.01f : 0.02f;
p->texnum = bubbleparticletexture;
p->scale = lhrandom(1,2);
p->alpha = 255;
- p->color = (rand()&3)+12;
+ p->color = 254;
p->type = pt_bubble;
p->die = cl.time + 2;
for (j=0 ; j<3 ; j++)
}
else
{
- dec = 0.02f;
+ dec = type == 0 ? 0.01f : 0.02f;
p->texnum = smokeparticletexture[rand()&7];
- p->scale = lhrandom(8, 12);
- p->alpha = 64 + (rand()&31);
- p->color = (rand()&3)+12;
+ p->scale = lhrandom(4, 8);
+ p->alpha = 160; //128 + (rand()&63);
+ p->color = 254;
p->type = pt_smoke;
p->die = cl.time + 10000;
VectorCopy(start, p->org);
+ if (type == 0)
+ {
+ particle(pt_fallfadespark, 0x68 + (rand() & 7), particletexture, 1, lhrandom(64, 128), 5, start[0], start[1], start[2], lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(-64, 64));
+ particle(pt_fallfadespark, 0x68 + (rand() & 7), particletexture, 1, lhrandom(64, 128), 5, start[0], start[1], start[2], lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(-64, 64));
+ particle(pt_fallfadespark, 0x68 + (rand() & 7), particletexture, 1, lhrandom(64, 128), 5, start[0], start[1], start[2], lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(-64, 64));
+ particle(pt_fallfadespark, 0x68 + (rand() & 7), particletexture, 1, lhrandom(64, 128), 5, start[0], start[1], start[2], lhrandom(-64, 64), lhrandom(-64, 64), lhrandom(-64, 64));
+ }
}
break;
case 4: // slight blood
dec = 0.025f;
p->texnum = smokeparticletexture[rand()&7];
- p->scale = lhrandom(6, 8);
+ p->scale = lhrandom(4, 6);
p->alpha = type == 4 ? 192 : 255;
- p->color = (rand()&3)+68;
+ p->color = 247; //(rand()&3)+68;
p->type = pt_bloodcloud;
p->die = cl.time + 9999;
for (j=0 ; j<3 ; j++)
}
-extern qboolean lighthalf;
-
/*
===============
R_DrawParticles
===============
*/
extern cvar_t sv_gravity;
-void R_CompleteLightPoint (vec3_t color, vec3_t p);
void TraceLine (vec3_t start, vec3_t end, vec3_t impact);
-void R_DrawParticles (void)
+void R_MoveParticles (void)
{
particle_t *p;
- int i, r,g,b,a;
- float gravity, dvel, frametime, scale, scale2, minparticledist;
- byte *color24;
- vec3_t up, right, uprightangles, forward2, up2, right2, tempcolor, v;
- int activeparticles, maxparticle, j, k;
+ int i, activeparticles, maxparticle, j, a;
+ vec3_t v;
+ float gravity, dvel, frametime;
// LordHavoc: early out condition
if (!numparticles)
return;
- VectorScale (vup, 1.5, up);
- VectorScale (vright, 1.5, right);
-
- uprightangles[0] = 0;
- uprightangles[1] = r_refdef.viewangles[1];
- uprightangles[2] = 0;
- AngleVectors (uprightangles, forward2, right2, up2);
-
frametime = cl.time - cl.oldtime;
gravity = frametime * sv_gravity.value;
dvel = 1+4*frametime;
- minparticledist = DotProduct(r_refdef.vieworg, vpn) + 16.0f;
-
activeparticles = 0;
maxparticle = -1;
j = 0;
- for (k = 0, p = particles;k < numparticles;k++, p++)
+ for (i = 0, p = particles;i < numparticles;i++, p++)
{
if (p->die < cl.time)
{
freeparticles[j++] = p;
continue;
}
- maxparticle = k;
+ maxparticle = i;
activeparticles++;
- // LordHavoc: only render if not too close
- if (DotProduct(p->org, vpn) >= minparticledist)
- {
- color24 = (byte *) &d_8to24table[(int)p->color];
- r = color24[0];
- g = color24[1];
- b = color24[2];
- a = p->alpha;
- if (r_dynamicparticles.value)
- {
- R_CompleteLightPoint(tempcolor, p->org);
- r = (r * (int) tempcolor[0]) >> 7;
- g = (g * (int) tempcolor[1]) >> 7;
- b = (b * (int) tempcolor[2]) >> 7;
- }
- transpolybegin(p->texnum, 0, p->texnum, TPOLYTYPE_ALPHA);
- scale = p->scale * -0.5;scale2 = p->scale * 0.5;
- if (p->texnum == rainparticletexture) // rain streak
- {
- transpolyvert(p->org[0] + up2[0]*scale + right2[0]*scale , p->org[1] + up2[1]*scale + right2[1]*scale , p->org[2] + up2[2]*scale + right2[2]*scale , 0,1,r,g,b,a);
- transpolyvert(p->org[0] + up2[0]*scale2 + right2[0]*scale , p->org[1] + up2[1]*scale2 + right2[1]*scale , p->org[2] + up2[2]*scale2 + right2[2]*scale , 0,0,r,g,b,a);
- transpolyvert(p->org[0] + up2[0]*scale2 + right2[0]*scale2, p->org[1] + up2[1]*scale2 + right2[1]*scale2, p->org[2] + up2[2]*scale2 + right2[2]*scale2, 1,0,r,g,b,a);
- transpolyvert(p->org[0] + up2[0]*scale + right2[0]*scale2, p->org[1] + up2[1]*scale + right2[1]*scale2, p->org[2] + up2[2]*scale + right2[2]*scale2, 1,1,r,g,b,a);
- }
- else
- {
- transpolyvert(p->org[0] + up[0]*scale + right[0]*scale , p->org[1] + up[1]*scale + right[1]*scale , p->org[2] + up[2]*scale + right[2]*scale , 0,1,r,g,b,a);
- transpolyvert(p->org[0] + up[0]*scale2 + right[0]*scale , p->org[1] + up[1]*scale2 + right[1]*scale , p->org[2] + up[2]*scale2 + right[2]*scale , 0,0,r,g,b,a);
- transpolyvert(p->org[0] + up[0]*scale2 + right[0]*scale2, p->org[1] + up[1]*scale2 + right[1]*scale2, p->org[2] + up[2]*scale2 + right[2]*scale2, 1,0,r,g,b,a);
- transpolyvert(p->org[0] + up[0]*scale + right[0]*scale2, p->org[1] + up[1]*scale + right[1]*scale2, p->org[2] + up[2]*scale + right[2]*scale2, 1,1,r,g,b,a);
- }
- transpolyend();
- }
-
VectorCopy(p->org, p->oldorg);
p->org[0] += p->vel[0]*frametime;
p->org[1] += p->vel[1]*frametime;
case pt_static:
break;
+ // LordHavoc: drop-through because of shared code
case pt_blob:
- for (i=0 ; i<3 ; i++)
- p->vel[i] *= dvel;
- break;
-
+ p->vel[2] *= dvel;
case pt_blob2:
- for (i=0 ; i<2 ; i++)
- p->vel[i] *= dvel;
+ p->vel[0] *= dvel;
+ p->vel[1] *= dvel;
break;
case pt_grav:
p->vel[2] -= gravity;
break;
-// LordHavoc: for smoke trails
- case pt_smoke:
- p->scale += frametime * 6;
- p->alpha -= frametime * 128;
- if (p->alpha < 1)
- p->die = -1;
- break;
case pt_snow:
if (cl.time > p->time2)
{
// p->die = -1;
// break;
// }
- p->scale += frametime * 4;
- p->alpha -= frametime * 64;
- if (p->alpha < 1 || p->scale < 1)
- p->die = -1;
+ p->scale += frametime * 16;
+ p->alpha -= frametime * 512;
break;
case pt_fallfadespark:
p->alpha -= frametime * 256;
p->vel[2] -= gravity;
- if (p->alpha < 1)
- p->die = -1;
break;
case pt_fade:
p->alpha -= frametime * 512;
- if (p->alpha < 1)
- p->die = -1;
break;
case pt_bubble:
a = Mod_PointInLeaf(p->org, cl.worldmodel)->contents;
p->vel[2] += lhrandom(-32,32);
}
p->alpha -= frametime * 64;
- if (p->alpha < 1)
- p->die = -1;
+ break;
+// LordHavoc: for smoke trails
+ case pt_smoke:
+ p->scale += frametime * 16;
+ p->alpha -= frametime * 256;
break;
case pt_smokecloud:
- p->scale += frametime * 60;
- p->alpha -= frametime * 96;
- if (p->alpha < 1)
- p->die = -1;
+ p->scale += frametime * 64;
+ p->alpha -= frametime * 256;
break;
case pt_splash:
p->scale += frametime * 24;
- p->alpha -= frametime * 256;
- if (p->alpha < 1)
- p->die = -1;
+ p->alpha -= frametime * 512;
break;
case pt_rain:
a = Mod_PointInLeaf(p->org, cl.worldmodel)->contents;
}
break;
}
+
+ // LordHavoc: most particles did this check anyway, consistency...
+ if (p->alpha < 1)
+ p->die = -1;
+
+ // LordHavoc: immediate removal of unnecessary particles (must be done to ensure compactor below operates properly in all cases)
+ if (p->die < cl.time)
+ freeparticles[j++] = p;
}
// fill in gaps to compact the array
i = 0;
numparticles = activeparticles;
}
+void R_CompleteLightPoint (vec3_t color, vec3_t p);
+
+void R_DrawParticles (void)
+{
+ particle_t *p;
+ int i, r,g,b,a;
+ float scale, scale2, minparticledist;
+ byte *color24;
+ vec3_t up, right, uprightangles, forward2, up2, right2, tempcolor;
+
+ // LordHavoc: early out condition
+ if (!numparticles)
+ return;
+
+ c_particles += numparticles;
+
+ VectorScale (vup, 1.5, up);
+ VectorScale (vright, 1.5, right);
+
+ uprightangles[0] = 0;
+ uprightangles[1] = r_refdef.viewangles[1];
+ uprightangles[2] = 0;
+ AngleVectors (uprightangles, forward2, right2, up2);
+
+ minparticledist = DotProduct(r_refdef.vieworg, vpn) + 16.0f;
+
+ for (i = 0, p = particles;i < numparticles;i++, p++)
+ {
+ // LordHavoc: unnecessary (array was already compacted)
+// if (p->die < cl.time)
+// continue;
+
+ // LordHavoc: only render if not too close
+ if (DotProduct(p->org, vpn) < minparticledist)
+ continue;
+
+ color24 = (byte *) &d_8to24table[(int)p->color];
+ r = color24[0];
+ g = color24[1];
+ b = color24[2];
+ a = p->alpha;
+ if (r_dynamicparticles.value)
+ {
+ R_CompleteLightPoint(tempcolor, p->org);
+ r = (r * (int) tempcolor[0]) >> 7;
+ g = (g * (int) tempcolor[1]) >> 7;
+ b = (b * (int) tempcolor[2]) >> 7;
+ }
+ transpolybegin(p->texnum, 0, p->texnum, TPOLYTYPE_ALPHA);
+ scale = p->scale * -0.5;scale2 = p->scale * 0.5;
+ if (p->texnum == rainparticletexture) // rain streak
+ {
+ transpolyvert(p->org[0] + up2[0]*scale + right2[0]*scale , p->org[1] + up2[1]*scale + right2[1]*scale , p->org[2] + up2[2]*scale + right2[2]*scale , 0,1,r,g,b,a);
+ transpolyvert(p->org[0] + up2[0]*scale2 + right2[0]*scale , p->org[1] + up2[1]*scale2 + right2[1]*scale , p->org[2] + up2[2]*scale2 + right2[2]*scale , 0,0,r,g,b,a);
+ transpolyvert(p->org[0] + up2[0]*scale2 + right2[0]*scale2, p->org[1] + up2[1]*scale2 + right2[1]*scale2, p->org[2] + up2[2]*scale2 + right2[2]*scale2, 1,0,r,g,b,a);
+ transpolyvert(p->org[0] + up2[0]*scale + right2[0]*scale2, p->org[1] + up2[1]*scale + right2[1]*scale2, p->org[2] + up2[2]*scale + right2[2]*scale2, 1,1,r,g,b,a);
+ }
+ else
+ {
+ transpolyvert(p->org[0] + up[0]*scale + right[0]*scale , p->org[1] + up[1]*scale + right[1]*scale , p->org[2] + up[2]*scale + right[2]*scale , 0,1,r,g,b,a);
+ transpolyvert(p->org[0] + up[0]*scale2 + right[0]*scale , p->org[1] + up[1]*scale2 + right[1]*scale , p->org[2] + up[2]*scale2 + right[2]*scale , 0,0,r,g,b,a);
+ transpolyvert(p->org[0] + up[0]*scale2 + right[0]*scale2, p->org[1] + up[1]*scale2 + right[1]*scale2, p->org[2] + up[2]*scale2 + right[2]*scale2, 1,0,r,g,b,a);
+ transpolyvert(p->org[0] + up[0]*scale + right[0]*scale2, p->org[1] + up[1]*scale + right[1]*scale2, p->org[2] + up[2]*scale + right[2]*scale2, 1,1,r,g,b,a);
+ }
+ transpolyend();
+ }
+}
projects / xonotic / darkplaces.git / blobdiff