Forgot to commit removal of DrawDecal

[xonotic/darkplaces.git] / r_light.c

diff --git a/r_light.c b/r_light.c
index dbadd56b8cf01913860629e353bcddf2de207b35..b67dc484a5f207e124a15aa0ffe14a93d1503cf3 100644 (file)
--- a/r_light.c
+++ b/r_light.c
@@ -43,22 +43,12 @@ void r_light_start(void)
                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 = ((1.0f / (dx * dx + dy * dy + 0.2f)) - (1.0f / (1.0f + 0.2))) * 64.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);
@@ -180,9 +170,10 @@ void R_DrawCoronas(void)
                {
                        // trace to a point just barely closer to the eye
                        VectorSubtract(rd->origin, vpn, diff);
-                       if (TraceLine(r_origin, diff, NULL, NULL, 0) == 1)
+                       if (TraceLine(r_origin, diff, NULL, NULL, 0, true) == 1)
                        {
-                               scale = 1.0f / 65536.0f;//64.0f / (dist * dist + 1024.0f);
+                               scale = 1.0f / 262144.0f;
+                               //scale = 64.0f / (DotProduct(diff,diff) + 1024.0f);
                                m.cr = rd->light[0] * scale;
                                m.cg = rd->light[1] * scale;
                                m.cb = rd->light[2] * scale;
@@ -192,9 +183,7 @@ void R_DrawCoronas(void)
                                        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;
+                               scale = rd->cullradius * 0.25f;
                                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;
@@ -207,7 +196,7 @@ void R_DrawCoronas(void)
                                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);
+                               R_Mesh_Draw(&m);
                        }
                }
        }
@@ -269,7 +258,7 @@ loc0:
        }
 
 // mark the polygons
-       surf = cl.worldmodel->surfaces + node->firstsurface;
+       surf = currentrenderentity->model->surfaces + node->firstsurface;
        for (i=0 ; i<node->numsurfaces ; i++, surf++)
        {
                int d, impacts, impactt;