X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=r_lightning.c;h=8568292d098b83113f898bfc5fa773200b35fb7a;hp=8bc56007122e4435bd0920e6ee3cb116f32b7b7d;hb=023d02148e88cc846dbd76ffa312703c2eef1cd7;hpb=5d04684b45d2ebb6f28f7ab0d2563b1de9d713cc diff --git a/r_lightning.c b/r_lightning.c index 8bc56007..8568292d 100644 --- a/r_lightning.c +++ b/r_lightning.c @@ -10,27 +10,26 @@ cvar_t r_lightningbeam_color_green = {CVAR_SAVE, "r_lightningbeam_color_green", cvar_t r_lightningbeam_color_blue = {CVAR_SAVE, "r_lightningbeam_color_blue", "1", "color of the lightning beam effect"}; cvar_t r_lightningbeam_qmbtexture = {CVAR_SAVE, "r_lightningbeam_qmbtexture", "0", "load the qmb textures/particles/lightning.pcx texture instead of generating one, can look better"}; -rtexture_t *r_lightningbeamtexture; -rtexture_t *r_lightningbeamqmbtexture; -rtexturepool_t *r_lightningbeamtexturepool; +skinframe_t *r_lightningbeamtexture; +skinframe_t *r_lightningbeamqmbtexture; -int r_lightningbeamelements[18] = {0, 1, 2, 0, 2, 3, 4, 5, 6, 4, 6, 7, 8, 9, 10, 8, 10, 11}; +int r_lightningbeamelement3i[18] = {0, 1, 2, 0, 2, 3, 4, 5, 6, 4, 6, 7, 8, 9, 10, 8, 10, 11}; +unsigned short r_lightningbeamelement3s[18] = {0, 1, 2, 0, 2, 3, 4, 5, 6, 4, 6, 7, 8, 9, 10, 8, 10, 11}; -void r_lightningbeams_start(void) +static void r_lightningbeams_start(void) { - r_lightningbeamtexturepool = R_AllocTexturePool(); r_lightningbeamtexture = NULL; r_lightningbeamqmbtexture = NULL; } -void r_lightningbeams_setupqmbtexture(void) +static void r_lightningbeams_setupqmbtexture(void) { - r_lightningbeamqmbtexture = loadtextureimage(r_lightningbeamtexturepool, "textures/particles/lightning.pcx", 0, 0, false, TEXF_ALPHA | TEXF_PRECACHE); + r_lightningbeamqmbtexture = R_SkinFrame_LoadExternal("textures/particles/lightning.pcx", TEXF_ALPHA | TEXF_FORCELINEAR, false); if (r_lightningbeamqmbtexture == NULL) Cvar_SetValueQuick(&r_lightningbeam_qmbtexture, false); } -void r_lightningbeams_setuptexture(void) +static void r_lightningbeams_setuptexture(void) { #if 0 #define BEAMWIDTH 128 @@ -51,63 +50,63 @@ void r_lightningbeams_setuptexture(void) for (imagenumber = 0, maxpathstrength = 0.0339476;maxpathstrength < 0.5;imagenumber++, maxpathstrength += 0.01) { - for (i = 0;i < PATHPOINTS;i++) - { - path[i].x = lhrandom(0, 1); - path[i].y = lhrandom(0.2, 0.8); - path[i].strength = lhrandom(0, 1); - } - for (i = 0;i < PATHPOINTS;i++) - { - for (j = i + 1;j < PATHPOINTS;j++) + for (i = 0;i < PATHPOINTS;i++) + { + path[i].x = lhrandom(0, 1); + path[i].y = lhrandom(0.2, 0.8); + path[i].strength = lhrandom(0, 1); + } + for (i = 0;i < PATHPOINTS;i++) { - if (path[j].x < path[i].x) + for (j = i + 1;j < PATHPOINTS;j++) { - temppath = path[j]; - path[j] = path[i]; - path[i] = temppath; + if (path[j].x < path[i].x) + { + temppath = path[j]; + path[j] = path[i]; + path[i] = temppath; + } } } - } - particlex = path[0].x; - particley = path[0].y; - particlexv = lhrandom(0, 0.02); - particlexv = lhrandom(-0.02, 0.02); - memset(image, 0, BEAMWIDTH * BEAMHEIGHT * sizeof(int)); - for (i = 0;i < 65536;i++) - { - for (nearestpathindex = 0;nearestpathindex < PATHPOINTS;nearestpathindex++) - if (path[nearestpathindex].x > particlex) - break; - nearestpathindex %= PATHPOINTS; - dx = path[nearestpathindex].x + lhrandom(-0.01, 0.01);dx = bound(0, dx, 1) - particlex;if (dx < 0) dx += 1; - dy = path[nearestpathindex].y + lhrandom(-0.01, 0.01);dy = bound(0, dy, 1) - particley; - s = path[nearestpathindex].strength / sqrt(dx*dx+dy*dy); - particlexv = particlexv /* (1 - lhrandom(0.08, 0.12))*/ + dx * s; - particleyv = particleyv /* (1 - lhrandom(0.08, 0.12))*/ + dy * s; - particlex += particlexv * maxpathstrength;particlex -= (int) particlex; - particley += particleyv * maxpathstrength;particley = bound(0, particley, 1); - px = particlex * BEAMWIDTH; - py = particley * BEAMHEIGHT; - if (px >= 0 && py >= 0 && px < BEAMWIDTH && py < BEAMHEIGHT) - image[py*BEAMWIDTH+px] += 16; - } + particlex = path[0].x; + particley = path[0].y; + particlexv = lhrandom(0, 0.02); + particlexv = lhrandom(-0.02, 0.02); + memset(image, 0, BEAMWIDTH * BEAMHEIGHT * sizeof(int)); + for (i = 0;i < 65536;i++) + { + for (nearestpathindex = 0;nearestpathindex < PATHPOINTS;nearestpathindex++) + if (path[nearestpathindex].x > particlex) + break; + nearestpathindex %= PATHPOINTS; + dx = path[nearestpathindex].x + lhrandom(-0.01, 0.01);dx = bound(0, dx, 1) - particlex;if (dx < 0) dx += 1; + dy = path[nearestpathindex].y + lhrandom(-0.01, 0.01);dy = bound(0, dy, 1) - particley; + s = path[nearestpathindex].strength / sqrt(dx*dx+dy*dy); + particlexv = particlexv /* (1 - lhrandom(0.08, 0.12))*/ + dx * s; + particleyv = particleyv /* (1 - lhrandom(0.08, 0.12))*/ + dy * s; + particlex += particlexv * maxpathstrength;particlex -= (int) particlex; + particley += particleyv * maxpathstrength;particley = bound(0, particley, 1); + px = particlex * BEAMWIDTH; + py = particley * BEAMHEIGHT; + if (px >= 0 && py >= 0 && px < BEAMWIDTH && py < BEAMHEIGHT) + image[py*BEAMWIDTH+px] += 16; + } - for (py = 0;py < BEAMHEIGHT;py++) - { - for (px = 0;px < BEAMWIDTH;px++) + for (py = 0;py < BEAMHEIGHT;py++) { - pixels[(py*BEAMWIDTH+px)*4+0] = bound(0, image[py*BEAMWIDTH+px] * 1.0f, 255.0f); - pixels[(py*BEAMWIDTH+px)*4+1] = bound(0, image[py*BEAMWIDTH+px] * 1.0f, 255.0f); - pixels[(py*BEAMWIDTH+px)*4+2] = bound(0, image[py*BEAMWIDTH+px] * 1.0f, 255.0f); - pixels[(py*BEAMWIDTH+px)*4+3] = 255; + for (px = 0;px < BEAMWIDTH;px++) + { + pixels[(py*BEAMWIDTH+px)*4+2] = bound(0, image[py*BEAMWIDTH+px] * 1.0f, 255.0f); + pixels[(py*BEAMWIDTH+px)*4+1] = bound(0, image[py*BEAMWIDTH+px] * 1.0f, 255.0f); + pixels[(py*BEAMWIDTH+px)*4+0] = bound(0, image[py*BEAMWIDTH+px] * 1.0f, 255.0f); + pixels[(py*BEAMWIDTH+px)*4+3] = 255; + } } - } - Image_WriteTGARGBA(va("lightningbeam%i.tga", imagenumber), BEAMWIDTH, BEAMHEIGHT, pixels); + Image_WriteTGABGRA(va(vabuf, sizeof(vabuf), "lightningbeam%i.tga", imagenumber), BEAMWIDTH, BEAMHEIGHT, pixels); } - r_lightningbeamtexture = R_LoadTexture2D(r_lightningbeamtexturepool, "lightningbeam", BEAMWIDTH, BEAMHEIGHT, pixels, TEXTYPE_RGBA, TEXF_PRECACHE, NULL); + r_lightningbeamtexture = R_LoadTexture2D(r_lightningbeamtexturepool, "lightningbeam", BEAMWIDTH, BEAMHEIGHT, pixels, TEXTYPE_BGRA, TEXF_FORCELINEAR, NULL); Mem_Free(pixels); Mem_Free(image); @@ -138,29 +137,32 @@ void r_lightningbeams_setuptexture(void) r = intensity * 1.0f; g = intensity * 1.0f; b = intensity * 1.0f; - data[(y * BEAMWIDTH + x) * 4 + 0] = (unsigned char)(bound(0, r, 1) * 255.0f); + data[(y * BEAMWIDTH + x) * 4 + 2] = (unsigned char)(bound(0, r, 1) * 255.0f); data[(y * BEAMWIDTH + x) * 4 + 1] = (unsigned char)(bound(0, g, 1) * 255.0f); - data[(y * BEAMWIDTH + x) * 4 + 2] = (unsigned char)(bound(0, b, 1) * 255.0f); + data[(y * BEAMWIDTH + x) * 4 + 0] = (unsigned char)(bound(0, b, 1) * 255.0f); data[(y * BEAMWIDTH + x) * 4 + 3] = (unsigned char)255; } } - r_lightningbeamtexture = R_LoadTexture2D(r_lightningbeamtexturepool, "lightningbeam", BEAMWIDTH, BEAMHEIGHT, data, TEXTYPE_RGBA, TEXF_PRECACHE, NULL); + r_lightningbeamtexture = R_SkinFrame_LoadInternalBGRA("lightningbeam", TEXF_FORCELINEAR, data, BEAMWIDTH, BEAMHEIGHT, false); Mem_Free(noise1); Mem_Free(noise2); Mem_Free(data); #endif } -void r_lightningbeams_shutdown(void) +static void r_lightningbeams_shutdown(void) { r_lightningbeamtexture = NULL; r_lightningbeamqmbtexture = NULL; - R_FreeTexturePool(&r_lightningbeamtexturepool); } -void r_lightningbeams_newmap(void) +static void r_lightningbeams_newmap(void) { + if (r_lightningbeamtexture) + R_SkinFrame_MarkUsed(r_lightningbeamtexture); + if (r_lightningbeamqmbtexture) + R_SkinFrame_MarkUsed(r_lightningbeamqmbtexture); } void R_LightningBeams_Init(void) @@ -172,10 +174,10 @@ void R_LightningBeams_Init(void) Cvar_RegisterVariable(&r_lightningbeam_color_green); Cvar_RegisterVariable(&r_lightningbeam_color_blue); Cvar_RegisterVariable(&r_lightningbeam_qmbtexture); - R_RegisterModule("R_LightningBeams", r_lightningbeams_start, r_lightningbeams_shutdown, r_lightningbeams_newmap); + R_RegisterModule("R_LightningBeams", r_lightningbeams_start, r_lightningbeams_shutdown, r_lightningbeams_newmap, NULL, NULL); } -void R_CalcLightningBeamPolygonVertex3f(float *v, const float *start, const float *end, const float *offset) +static void R_CalcLightningBeamPolygonVertex3f(float *v, const float *start, const float *end, const float *offset) { // near right corner VectorAdd (start, offset, (v + 0)); @@ -187,7 +189,7 @@ void R_CalcLightningBeamPolygonVertex3f(float *v, const float *start, const floa VectorAdd (end , offset, (v + 9)); } -void R_CalcLightningBeamPolygonTexCoord2f(float *tc, float t1, float t2) +static void R_CalcLightningBeamPolygonTexCoord2f(float *tc, float t1, float t2) { if (r_lightningbeam_qmbtexture.integer) { @@ -213,68 +215,32 @@ void R_CalcLightningBeamPolygonTexCoord2f(float *tc, float t1, float t2) } } -void R_FogLightningBeam_Vertex3f_Color4f(const float *v, float *c, int numverts, float r, float g, float b, float a) -{ - int i; - float ifog; - for (i = 0;i < numverts;i++, v += 3, c += 4) - { - ifog = 1 - VERTEXFOGTABLE(VectorDistance(v, r_vieworigin)); - c[0] = r * ifog; - c[1] = g * ifog; - c[2] = b * ifog; - c[3] = a; - } -} - float beamrepeatscale; -void R_DrawLightningBeam_TransparentCallback(const entity_render_t *ent, const rtlight_t *rtlight, int numsurfaces, int *surfacelist) +static void R_DrawLightningBeam_TransparentCallback(const entity_render_t *ent, const rtlight_t *rtlight, int numsurfaces, int *surfacelist) { int surfacelistindex; - rmeshstate_t m; float vertex3f[12*3]; float texcoord2f[12*2]; - float color4f[12*4]; - R_Mesh_Matrix(&identitymatrix); - GL_BlendFunc(GL_SRC_ALPHA, GL_ONE); - GL_DepthMask(false); - GL_DepthTest(true); + + RSurf_ActiveCustomEntity(&identitymatrix, &identitymatrix, 0, 0, r_lightningbeam_color_red.value, r_lightningbeam_color_green.value, r_lightningbeam_color_blue.value, 1, 12, vertex3f, texcoord2f, NULL, NULL, NULL, NULL, 6, r_lightningbeamelement3i, r_lightningbeamelement3s, false, false); + if (r_lightningbeam_qmbtexture.integer && r_lightningbeamqmbtexture == NULL) r_lightningbeams_setupqmbtexture(); if (!r_lightningbeam_qmbtexture.integer && r_lightningbeamtexture == NULL) r_lightningbeams_setuptexture(); - R_Mesh_VertexPointer(vertex3f); - if (fogenabled) - { - // per vertex colors if fog is used - R_Mesh_ColorPointer(color4f); - R_FogLightningBeam_Vertex3f_Color4f(vertex3f, color4f, 12, r_lightningbeam_color_red.value, r_lightningbeam_color_green.value, r_lightningbeam_color_blue.value, 1); - } - else - { - // solid color if fog is not used - R_Mesh_ColorPointer(NULL); - GL_Color(r_lightningbeam_color_red.value, r_lightningbeam_color_green.value, r_lightningbeam_color_blue.value, 1); - } - memset(&m, 0, sizeof(m)); - if (r_lightningbeam_qmbtexture.integer) - m.tex[0] = R_GetTexture(r_lightningbeamqmbtexture); - else - m.tex[0] = R_GetTexture(r_lightningbeamtexture); - m.pointer_texcoord[0] = texcoord2f; - R_Mesh_TextureState(&m); - for (surfacelistindex = 0;surfacelistindex < numsurfaces;surfacelistindex++) { const beam_t *b = cl.beams + surfacelist[surfacelistindex]; - vec3_t beamdir, right, up, offset; + vec3_t beamdir, right, up, offset, start, end; float length, t1, t2; + CL_Beam_CalculatePositions(b, start, end); + // calculate beam direction (beamdir) vector and beam length // get difference vector - VectorSubtract(b->end, b->start, beamdir); + VectorSubtract(end, start, beamdir); // find length of difference vector length = sqrt(DotProduct(beamdir, beamdir)); // calculate scale to make beamdir a unit vector (normalized) @@ -284,7 +250,7 @@ void R_DrawLightningBeam_TransparentCallback(const entity_render_t *ent, const r // calculate up vector such that it points toward viewer, and rotates around the beamdir // get direction from start of beam to viewer - VectorSubtract(r_vieworigin, b->start, up); + VectorSubtract(r_refdef.view.origin, start, up); // remove the portion of the vector that moves along the beam // (this leaves only a vector pointing directly away from the beam) t1 = -DotProduct(up, beamdir); @@ -296,7 +262,7 @@ void R_DrawLightningBeam_TransparentCallback(const entity_render_t *ent, const r VectorNormalize(up); // calculate T coordinate scrolling (start and end texcoord along the beam) - t1 = r_refdef.time * -r_lightningbeam_scroll.value;// + beamrepeatscale * DotProduct(b->start, beamdir); + t1 = r_refdef.scene.time * -r_lightningbeam_scroll.value;// + beamrepeatscale * DotProduct(start, beamdir); t1 = t1 - (int) t1; t2 = t1 + beamrepeatscale * length; @@ -313,36 +279,29 @@ void R_DrawLightningBeam_TransparentCallback(const entity_render_t *ent, const r // polygon 1, verts 0-3 VectorScale(right, r_lightningbeam_thickness.value, offset); - R_CalcLightningBeamPolygonVertex3f(vertex3f + 0, b->start, b->end, offset); + R_CalcLightningBeamPolygonVertex3f(vertex3f + 0, start, end, offset); // polygon 2, verts 4-7 VectorAdd(right, up, offset); VectorScale(offset, r_lightningbeam_thickness.value * 0.70710681f, offset); - R_CalcLightningBeamPolygonVertex3f(vertex3f + 12, b->start, b->end, offset); + R_CalcLightningBeamPolygonVertex3f(vertex3f + 12, start, end, offset); // polygon 3, verts 8-11 VectorSubtract(right, up, offset); VectorScale(offset, r_lightningbeam_thickness.value * 0.70710681f, offset); - R_CalcLightningBeamPolygonVertex3f(vertex3f + 24, b->start, b->end, offset); + R_CalcLightningBeamPolygonVertex3f(vertex3f + 24, start, end, offset); R_CalcLightningBeamPolygonTexCoord2f(texcoord2f + 0, t1, t2); R_CalcLightningBeamPolygonTexCoord2f(texcoord2f + 8, t1 + 0.33, t2 + 0.33); R_CalcLightningBeamPolygonTexCoord2f(texcoord2f + 16, t1 + 0.66, t2 + 0.66); - if (fogenabled) - { - // per vertex colors if fog is used - R_FogLightningBeam_Vertex3f_Color4f(vertex3f, color4f, 12, r_lightningbeam_color_red.value, r_lightningbeam_color_green.value, r_lightningbeam_color_blue.value, 1); - } // draw the 3 polygons as one batch of 6 triangles using the 12 vertices - GL_LockArrays(0, 12); - R_Mesh_Draw(0, 12, 6, r_lightningbeamelements); - GL_LockArrays(0, 0); + R_DrawCustomSurface(r_lightningbeam_qmbtexture.integer ? r_lightningbeamqmbtexture : r_lightningbeamtexture, &identitymatrix, MATERIALFLAG_ADD | MATERIALFLAG_BLENDED | MATERIALFLAG_FULLBRIGHT | MATERIALFLAG_NOCULLFACE, 0, 12, 0, 6, false, false); } } +extern cvar_t cl_beams_polygons; void R_DrawLightningBeams(void) { int i; beam_t *b; - vec3_t org; if (!cl_beams_polygons.integer) return; @@ -350,11 +309,18 @@ void R_DrawLightningBeams(void) beamrepeatscale = 1.0f / r_lightningbeam_repeatdistance.value; for (i = 0, b = cl.beams;i < cl.num_beams;i++, b++) { - if (b->model && b->endtime >= r_refdef.time && b->lightning) + if (b->model && b->lightning) { - VectorAdd(b->start, b->end, org); - VectorScale(org, 0.5f, org); - R_MeshQueue_AddTransparent(org, R_DrawLightningBeam_TransparentCallback, NULL, i, NULL); + vec3_t org, start, end, dir; + vec_t dist; + CL_Beam_CalculatePositions(b, start, end); + // calculate the nearest point on the line (beam) for depth sorting + VectorSubtract(end, start, dir); + dist = (DotProduct(r_refdef.view.origin, dir) - DotProduct(start, dir)) / (DotProduct(end, dir) - DotProduct(start, dir)); + dist = bound(0, dist, 1); + VectorLerp(start, dist, end, org); + // now we have the nearest point on the line, so sort with it + R_MeshQueue_AddTransparent(TRANSPARENTSORT_DISTANCE, org, R_DrawLightningBeam_TransparentCallback, NULL, i, NULL); } } }