added coronas (glow) to dynamic lights

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@1418 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/buildnumber.c b/buildnumber.c
index 479b26a87e4989241390af148c411ce901e0e659..dd203dc106f404223c704f72b976cceac4e0b691 100644 (file)
--- a/buildnumber.c
+++ b/buildnumber.c
@@ -1,4 +1,4 @@
 
 

-#define BUILDNUMBER 958
+#define BUILDNUMBER 1060

 
 int buildnumber = BUILDNUMBER;
 
 int buildnumber = BUILDNUMBER;

diff --git a/gl_rmain.c b/gl_rmain.c
index cb6207842754311cad9d26a1de64adbfdc00ee1a..77932da8ba49004f8198ca86ff5ab04176b8f7cc 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -732,7 +732,10 @@ void R_RenderView (void)
 
        // draw transparent meshs
        R_Mesh_AddTransparent();
 
        // draw transparent meshs
        R_Mesh_AddTransparent();

-       R_TimeReport("sorttrans");
+       R_TimeReport("addtrans");
+
+       R_DrawCoronas();
+       R_TimeReport("coronas");

 
        // render any queued meshs
        R_Mesh_Render();
 
        // render any queued meshs
        R_Mesh_Render();

diff --git a/r_light.c b/r_light.c
index 167e9c1863ee28f8ca15287e52fe00299c06204f..dbadd56b8cf01913860629e353bcddf2de207b35 100644 (file)
--- a/r_light.c
+++ b/r_light.c
@@ -28,12 +28,46 @@ cvar_t r_lightmodels = {CVAR_SAVE, "r_lightmodels", "1"};
 cvar_t r_vismarklights = {0, "r_vismarklights", "1"};
 cvar_t r_lightmodelhardness = {CVAR_SAVE, "r_lightmodelhardness", "0.9"};
 
 cvar_t r_vismarklights = {0, "r_vismarklights", "1"};
 cvar_t r_lightmodelhardness = {CVAR_SAVE, "r_lightmodelhardness", "0.9"};
 

+static rtexture_t *lightcorona;
+static rtexturepool_t *lighttexturepool;
+

 void r_light_start(void)
 {
 void r_light_start(void)
 {

+       float dx, dy;
+       int x, y, a;
+       byte pixels[32][32][4];
+       lighttexturepool = R_AllocTexturePool();
+       for (y = 0;y < 32;y++)
+       {
+               dy = (y - 15.5f) * (1.0f / 16.0f);
+               for (x = 0;x < 32;x++)
+               {
+                       dx = (x - 15.5f) * (1.0f / 16.0f);
+                       a = ((1.0f / (dx * dx + dy * dy + 0.2f)) - (1.0f / (1.0f + 0.2))) * 8.0f / (1.0f / (1.0f + 0.2));
+                       a = bound(0, a, 255);
+                       pixels[y][x][0] = 255;
+                       pixels[y][x][1] = 255;
+                       pixels[y][x][2] = 255;
+                       pixels[y][x][3] = a;
+                       /*
+                       // for testing the size of the corona textures
+                       if (a == 0)
+                       {
+                               pixels[y][x][0] = 255;
+                               pixels[y][x][1] = 0;
+                               pixels[y][x][2] = 0;
+                               pixels[y][x][3] = 255;
+                       }
+                       */
+               }
+       }
+       lightcorona = R_LoadTexture (lighttexturepool, "lightcorona", 32, 32, &pixels[0][0][0], TEXTYPE_RGBA, TEXF_PRECACHE | TEXF_ALPHA);

 }
 
 void r_light_shutdown(void)
 {
 }
 
 void r_light_shutdown(void)
 {

+       lighttexturepool = NULL;
+       lightcorona = NULL;

 }
 
 void r_light_newmap(void)
 }
 
 void r_light_newmap(void)


@@ -108,6 +142,77 @@ void R_BuildLightList(void)
        }
 }
 
        }
 }
 

+static int coronapolyindex[6] = {0, 1, 2, 0, 2, 3};
+
+void R_DrawCoronas(void)
+{
+       int i;
+       rmeshinfo_t m;
+       float tvxyz[4][4], tvst[4][2], scale, viewdist, diff[3], dist;
+       rdlight_t *rd;
+       memset(&m, 0, sizeof(m));
+       m.transparent = false;
+       m.blendfunc1 = GL_SRC_ALPHA;
+       m.blendfunc2 = GL_ONE;
+       m.depthdisable = true; // magic
+       m.numtriangles = 2;
+       m.numverts = 4;
+       m.index = coronapolyindex;
+       m.vertex = &tvxyz[0][0];
+       m.vertexstep = sizeof(float[4]);
+       m.tex[0] = R_GetTexture(lightcorona);
+       m.texcoords[0] = &tvst[0][0];
+       m.texcoordstep[0] = sizeof(float[2]);
+       tvst[0][0] = 0;
+       tvst[0][1] = 0;
+       tvst[1][0] = 0;
+       tvst[1][1] = 1;
+       tvst[2][0] = 1;
+       tvst[2][1] = 1;
+       tvst[3][0] = 1;
+       tvst[3][1] = 0;
+       viewdist = DotProduct(r_origin, vpn);
+       for (i = 0;i < r_numdlights;i++)
+       {
+               rd = r_dlight + i;
+               dist = (DotProduct(rd->origin, vpn) - viewdist);
+               if (dist >= 24.0f)
+               {
+                       // trace to a point just barely closer to the eye
+                       VectorSubtract(rd->origin, vpn, diff);
+                       if (TraceLine(r_origin, diff, NULL, NULL, 0) == 1)
+                       {
+                               scale = 1.0f / 65536.0f;//64.0f / (dist * dist + 1024.0f);
+                               m.cr = rd->light[0] * scale;
+                               m.cg = rd->light[1] * scale;
+                               m.cb = rd->light[2] * scale;
+                               m.ca = 1;
+                               if (fogenabled)
+                               {
+                                       VectorSubtract(rd->origin, r_origin, diff);
+                                       m.ca *= 1 - exp(fogdensity/DotProduct(diff,diff));
+                               }
+                               // make it larger in the distance to keep a consistent size
+                               //scale = 0.4f * dist;
+                               scale = 256.0f;
+                               tvxyz[0][0] = rd->origin[0] - vright[0] * scale - vup[0] * scale;
+                               tvxyz[0][1] = rd->origin[1] - vright[1] * scale - vup[1] * scale;
+                               tvxyz[0][2] = rd->origin[2] - vright[2] * scale - vup[2] * scale;
+                               tvxyz[1][0] = rd->origin[0] - vright[0] * scale + vup[0] * scale;
+                               tvxyz[1][1] = rd->origin[1] - vright[1] * scale + vup[1] * scale;
+                               tvxyz[1][2] = rd->origin[2] - vright[2] * scale + vup[2] * scale;
+                               tvxyz[2][0] = rd->origin[0] + vright[0] * scale + vup[0] * scale;
+                               tvxyz[2][1] = rd->origin[1] + vright[1] * scale + vup[1] * scale;
+                               tvxyz[2][2] = rd->origin[2] + vright[2] * scale + vup[2] * scale;
+                               tvxyz[3][0] = rd->origin[0] + vright[0] * scale - vup[0] * scale;
+                               tvxyz[3][1] = rd->origin[1] + vright[1] * scale - vup[1] * scale;
+                               tvxyz[3][2] = rd->origin[2] + vright[2] * scale - vup[2] * scale;
+                               R_Mesh_DrawDecal(&m);
+                       }
+               }
+       }
+}
+

 /*
 =============================================================================
 
 /*
 =============================================================================
 

diff --git a/r_light.h b/r_light.h
index e8fb4e8a6a49ae26d43ed2bd5e5ade0697e37f5c..9a264c9428fba804966c0eb7b5ac1e226531ed12 100644 (file)
--- a/r_light.h
+++ b/r_light.h
@@ -14,7 +14,8 @@ extern int r_numdlights;
 extern rdlight_t r_dlight[MAX_DLIGHTS];
 
 void R_BuildLightList(void);
 extern rdlight_t r_dlight[MAX_DLIGHTS];
 
 void R_BuildLightList(void);

-void R_AnimateLight (void);
+void R_AnimateLight(void);

 void R_MarkLights(void);
 void R_MarkLights(void);

-void R_CompleteLightPoint (vec3_t color, vec3_t p, int dynamic, mleaf_t *leaf);
-void R_LightModel (int numverts);
+void R_DrawCoronas(void);
+void R_CompleteLightPoint(vec3_t color, vec3_t p, int dynamic, mleaf_t *leaf);
+void R_LightModel(int numverts);