fixed bugs concerning rtlighting of transparent entities

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

diff --git a/gl_rsurf.c b/gl_rsurf.c
index 292f1e71cf96578286afdac5f3babab76a32983c..988e1541933e09ccbd83b4fffbe1ef8f0533562a 100644 (file)
--- a/gl_rsurf.c
+++ b/gl_rsurf.c
@@ -780,6 +780,22 @@ static void R_Q1BSP_DrawLight_TransparentCallback(const entity_render_t *ent, in
        R_Shadow_RenderMode_End();
 }
 
+static void R_Q1BSP_DrawLight_TransparentBatch(const entity_render_t *ent, texture_t *texture, int batchnumsurfaces, msurface_t **batchsurfacelist)
+{
+       int batchsurfaceindex;
+       msurface_t *batchsurface;
+       vec3_t tempcenter, center;
+       for (batchsurfaceindex = 0;batchsurfaceindex < batchnumsurfaces;batchsurfaceindex++)
+       {
+               batchsurface = batchsurfacelist[batchsurfaceindex];
+               tempcenter[0] = (batchsurface->mins[0] + batchsurface->maxs[0]) * 0.5f;
+               tempcenter[1] = (batchsurface->mins[1] + batchsurface->maxs[1]) * 0.5f;
+               tempcenter[2] = (batchsurface->mins[2] + batchsurface->maxs[2]) * 0.5f;
+               Matrix4x4_Transform(&ent->matrix, tempcenter, center);
+               R_MeshQueue_AddTransparent(texture->currentmaterialflags & MATERIALFLAG_NODEPTHTEST ? r_vieworigin : center, R_Q1BSP_DrawLight_TransparentCallback, ent, batchsurface - ent->model->data_surfaces, r_shadow_rtlight);
+       }
+}
+
 #define RSURF_MAX_BATCHSURFACES 1024
 
 void R_Q1BSP_DrawLight(entity_render_t *ent, int numsurfaces, const int *surfacelist)
@@ -811,19 +827,7 @@ void R_Q1BSP_DrawLight(entity_render_t *ent, int numsurfaces, const int *surface
                        if (batchnumsurfaces > 0)
                        {
                                if (texture->currentmaterialflags & MATERIALFLAG_TRANSPARENT)
-                               {
-                                       int batchsurfaceindex;
-                                       for (batchsurfaceindex = 0;batchsurfaceindex < batchnumsurfaces;batchsurfaceindex++)
-                                       {
-                                               msurface_t *batchsurface = batchsurfacelist[batchsurfaceindex];
-                                               vec3_t tempcenter, center;
-                                               tempcenter[0] = (batchsurface->mins[0] + batchsurface->maxs[0]) * 0.5f;
-                                               tempcenter[1] = (batchsurface->mins[1] + batchsurface->maxs[1]) * 0.5f;
-                                               tempcenter[2] = (batchsurface->mins[2] + batchsurface->maxs[2]) * 0.5f;
-                                               Matrix4x4_Transform(&ent->matrix, tempcenter, center);
-                                               R_MeshQueue_AddTransparent(texture->currentmaterialflags & MATERIALFLAG_NODEPTHTEST ? r_vieworigin : center, R_Q1BSP_DrawLight_TransparentCallback, ent, batchsurface - ent->model->data_surfaces, r_shadow_rtlight);
-                                       }
-                               }
+                                       R_Q1BSP_DrawLight_TransparentBatch(ent, texture, batchnumsurfaces, batchsurfacelist);
                                else
                                        R_Shadow_RenderSurfacesLighting(ent, texture, batchnumsurfaces, batchsurfacelist);
                                batchnumsurfaces = 0;
@@ -839,19 +843,7 @@ void R_Q1BSP_DrawLight(entity_render_t *ent, int numsurfaces, const int *surface
                        if (batchnumsurfaces == RSURF_MAX_BATCHSURFACES)
                        {
                                if (texture->currentmaterialflags & MATERIALFLAG_TRANSPARENT)
-                               {
-                                       int batchsurfaceindex;
-                                       for (batchsurfaceindex = 0;batchsurfaceindex < batchnumsurfaces;batchsurfaceindex++)
-                                       {
-                                               msurface_t *batchsurface = batchsurfacelist[batchsurfaceindex];
-                                               vec3_t tempcenter, center;
-                                               tempcenter[0] = (batchsurface->mins[0] + batchsurface->maxs[0]) * 0.5f;
-                                               tempcenter[1] = (batchsurface->mins[1] + batchsurface->maxs[1]) * 0.5f;
-                                               tempcenter[2] = (batchsurface->mins[2] + batchsurface->maxs[2]) * 0.5f;
-                                               Matrix4x4_Transform(&ent->matrix, tempcenter, center);
-                                               R_MeshQueue_AddTransparent(texture->currentmaterialflags & MATERIALFLAG_NODEPTHTEST ? r_vieworigin : center, R_Q1BSP_DrawLight_TransparentCallback, ent, batchsurface - ent->model->data_surfaces, r_shadow_rtlight);
-                                       }
-                               }
+                                       R_Q1BSP_DrawLight_TransparentBatch(ent, texture, batchnumsurfaces, batchsurfacelist);
                                else
                                        R_Shadow_RenderSurfacesLighting(ent, texture, batchnumsurfaces, batchsurfacelist);
                                batchnumsurfaces = 0;
@@ -861,7 +853,10 @@ void R_Q1BSP_DrawLight(entity_render_t *ent, int numsurfaces, const int *surface
        }
        if (batchnumsurfaces > 0)
        {
-               R_Shadow_RenderSurfacesLighting(ent, texture, batchnumsurfaces, batchsurfacelist);
+               if (texture->currentmaterialflags & MATERIALFLAG_TRANSPARENT)
+                       R_Q1BSP_DrawLight_TransparentBatch(ent, texture, batchnumsurfaces, batchsurfacelist);
+               else
+                       R_Shadow_RenderSurfacesLighting(ent, texture, batchnumsurfaces, batchsurfacelist);
                batchnumsurfaces = 0;
        }
        qglEnable(GL_CULL_FACE);

diff --git a/r_light.c b/r_light.c
index ec50a8d8d32cb7283f444d90e03f5016319176f5..f06c41e0208bb07d7cae921c4a8c7aaa69bdb284 100644 (file)
--- a/r_light.c
+++ b/r_light.c
@@ -201,7 +201,6 @@ int R_LightModel(float *ambient4f, float *diffusecolor, float *diffusenormal, co
        float v[3], f, mscale, stylescale, intensity, ambientcolor[3], tempdiffusenormal[3];
        nearlight_t *nl;
        mlight_t *sl;
-       dlight_t *light;
 
        nearlights = 0;
        maxnearlights = r_modellights.integer;
@@ -214,7 +213,7 @@ int R_LightModel(float *ambient4f, float *diffusecolor, float *diffusenormal, co
                VectorSet(ambient4f, 1, 1, 1);
                maxnearlights = 0;
        }
-       else if (r_lightmapintensity <= 0 && !(ent->flags & RENDER_TRANSPARENT))
+       else if (r_lightmapintensity <= 0)
                maxnearlights = 0;
        else
        {
@@ -283,81 +282,6 @@ int R_LightModel(float *ambient4f, float *diffusecolor, float *diffusenormal, co
                        nl->offset = sl->distbias;
                }
        }
-       if (ent->flags & RENDER_TRANSPARENT)
-       {
-               // FIXME: this dlighting doesn't look like rtlights
-               for (i = 0;i < r_refdef.numlights;i++)
-               {
-                       light = r_refdef.lights[i];
-                       VectorCopy(light->origin, v);
-                       if (v[0] < ent->mins[0]) v[0] = ent->mins[0];if (v[0] > ent->maxs[0]) v[0] = ent->maxs[0];
-                       if (v[1] < ent->mins[1]) v[1] = ent->mins[1];if (v[1] > ent->maxs[1]) v[1] = ent->maxs[1];
-                       if (v[2] < ent->mins[2]) v[2] = ent->mins[2];if (v[2] > ent->maxs[2]) v[2] = ent->maxs[2];
-                       VectorSubtract (v, light->origin, v);
-                       if (DotProduct(v, v) < light->rtlight.lightmap_cullradius2)
-                       {
-                               if (CL_TraceBox(ent->origin, vec3_origin, vec3_origin, light->origin, false, NULL, SUPERCONTENTS_SOLID, false).fraction != 1)
-                                       continue;
-                               VectorSubtract (ent->origin, light->origin, v);
-                               f = ((1.0f / (DotProduct(v, v) + LIGHTOFFSET)) - light->rtlight.lightmap_subtract);
-                               VectorScale(light->rtlight.lightmap_light, f, ambientcolor);
-                               intensity = DotProduct(ambientcolor, ambientcolor);
-                               if (f < 0)
-                                       intensity *= -1.0f;
-                               if (nearlights < maxnearlights)
-                                       j = nearlights++;
-                               else
-                               {
-                                       for (j = 0;j < maxnearlights;j++)
-                                       {
-                                               if (nearlight[j].intensity < intensity)
-                                               {
-                                                       if (nearlight[j].intensity > 0)
-                                                               VectorAdd(ambient4f, nearlight[j].ambientlight, ambient4f);
-                                                       break;
-                                               }
-                                       }
-                               }
-                               if (j >= maxnearlights)
-                               {
-                                       // this light is less significant than all others,
-                                       // add it to ambient
-                                       if (intensity > 0)
-                                               VectorAdd(ambient4f, ambientcolor, ambient4f);
-                               }
-                               else
-                               {
-                                       nl = nearlight + j;
-                                       nl->intensity = intensity;
-                                       // transform the light into the model's coordinate system
-                                       if (worldcoords)
-                                               VectorCopy(light->origin, nl->origin);
-                                       else
-                                       {
-                                               Matrix4x4_Transform(&ent->inversematrix, light->origin, nl->origin);
-                                               /*
-                                               Con_Printf("%i %s : %f %f %f : %f %f %f\n%f %f %f %f\n%f %f %f %f\n%f %f %f %f\n%f %f %f %f\n"
-                                               , rd - cl_dlights, ent->model->name
-                                               , light->origin[0], light->origin[1], light->origin[2]
-                                               , nl->origin[0], nl->origin[1], nl->origin[2]
-                                               , ent->inversematrix.m[0][0], ent->inversematrix.m[0][1], ent->inversematrix.m[0][2], ent->inversematrix.m[0][3]
-                                               , ent->inversematrix.m[1][0], ent->inversematrix.m[1][1], ent->inversematrix.m[1][2], ent->inversematrix.m[1][3]
-                                               , ent->inversematrix.m[2][0], ent->inversematrix.m[2][1], ent->inversematrix.m[2][2], ent->inversematrix.m[2][3]
-                                               , ent->inversematrix.m[3][0], ent->inversematrix.m[3][1], ent->inversematrix.m[3][2], ent->inversematrix.m[3][3]);
-                                               */
-                                       }
-                                       // integrate mscale into falloff, for maximum speed
-                                       nl->falloff = mscale;
-                                       VectorCopy(ambientcolor, nl->ambientlight);
-                                       nl->light[0] = light->rtlight.lightmap_light[0] * colorr * 4.0f;
-                                       nl->light[1] = light->rtlight.lightmap_light[1] * colorg * 4.0f;
-                                       nl->light[2] = light->rtlight.lightmap_light[2] * colorb * 4.0f;
-                                       nl->subtract = light->rtlight.lightmap_subtract;
-                                       nl->offset = LIGHTOFFSET;
-                               }
-                       }
-               }
-       }
        ambient4f[0] *= colorr;
        ambient4f[1] *= colorg;
        ambient4f[2] *= colorb;
@@ -427,7 +351,7 @@ void R_UpdateEntLights(entity_render_t *ent)
        int i;
        const mlight_t *sl;
        vec3_t v;
-       if (r_lightmapintensity <= 0 && !(ent->flags & RENDER_TRANSPARENT))
+       if (r_lightmapintensity <= 0)
                return;
        VectorSubtract(ent->origin, ent->entlightsorigin, v);
        if (ent->entlightsframe != (r_framecount - 1) || (realtime > ent->entlightstime && DotProduct(v,v) >= 1.0f))

diff --git a/r_shadow.c b/r_shadow.c
index 88bc073587445478ce9656fe991536ed5a4075d2..8eb69cbfd82d5f6b35b6fa75f5ba04510ad5cdac 100644 (file)
--- a/r_shadow.c
+++ b/r_shadow.c
@@ -3003,7 +3003,6 @@ void R_DrawRTLight(rtlight_t *rtlight, qboolean visible)
                        entity_render_t *ent = r_refdef.entities[i];
                        if (BoxesOverlap(ent->mins, ent->maxs, rtlight->cullmins, rtlight->cullmaxs)
                         && ent->model
-                        && !(ent->flags & RENDER_TRANSPARENT)
                         && (r_refdef.worldmodel == NULL || r_refdef.worldmodel->brush.BoxTouchingLeafPVS == NULL || r_refdef.worldmodel->brush.BoxTouchingLeafPVS(r_refdef.worldmodel, leafpvs, ent->mins, ent->maxs)))
                        {
                                // about the VectorDistance2 - light emitting entities should not cast their own shadow