Add R_LightPoint which is fast version of R_CompleteLightPoint that only grabs ambien...

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

diff --git a/cl_particles.c b/cl_particles.c
index 328ab48a4a897eee80c483f0deff670fa3759102..12ab2bb57608a89593918ca0655d3dfb8d50e28d 100644 (file)
--- a/cl_particles.c
+++ b/cl_particles.c
@@ -2537,12 +2537,7 @@ void R_DrawParticle_TransparentCallback(const entity_render_t *ent, const rtligh
                        c4f[3] = alpha;
                        // note: lighting is not cheap!
                        if (particletype[p->typeindex].lighting)
-                       {
-                               R_CompleteLightPoint(ambient, diffuse, diffusenormal, p->org, LP_LIGHTMAP | LP_RTWORLD | LP_DYNLIGHT);
-                               c4f[0] *= (ambient[0] + 0.5 * diffuse[0]);
-                               c4f[1] *= (ambient[1] + 0.5 * diffuse[1]);
-                               c4f[2] *= (ambient[2] + 0.5 * diffuse[2]);
-                       }
+                               R_LightPoint(c4f, p->org, LP_LIGHTMAP | LP_RTWORLD | LP_DYNLIGHT);
                        // mix in the fog color
                        if (r_refdef.fogenabled)
                        {

diff --git a/gl_rmain.c b/gl_rmain.c
index f60e7e2b5fe4c911d58d4899dfbe50931845a020..3cda32764ed684d0b59a9e4b17668e9abc9a5d05 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -4614,7 +4614,7 @@ static void R_View_UpdateEntityLighting (void)
                        {
                                if (ent->model->sprite.sprnum_type == SPR_OVERHEAD) // apply offset for overhead sprites
                                        org[2] = org[2] + r_overheadsprites_pushback.value;
-                               R_CompleteLightPoint(ent->modellight_ambient, ent->modellight_diffuse, tempdiffusenormal, org, LP_LIGHTMAP | LP_RTWORLD | LP_DYNLIGHT);
+                               R_LightPoint(ent->modellight_ambient, org, LP_LIGHTMAP | LP_RTWORLD | LP_DYNLIGHT);
                        }
                        else
                                R_CompleteLightPoint(ent->modellight_ambient, ent->modellight_diffuse, tempdiffusenormal, org, LP_LIGHTMAP);

diff --git a/r_shadow.c b/r_shadow.c
index 52a2357d53662ef3cdf3e0b714a3e0c8a422cc20..c3286a20dec74dcdab3e3e0e4f5e0efa23320fc8 100644 (file)
--- a/r_shadow.c
+++ b/r_shadow.c
@@ -6598,6 +6598,84 @@ LIGHT SAMPLING
 =============================================================================
 */
 
+void R_LightPoint(vec3_t color, const vec3_t p, const int flags)
+{
+       int i, numlights, flag;
+       float f, relativepoint[3], dist, dist2, lightradius2;
+       vec3_t diffuse, n;
+       rtlight_t *light;
+       dlight_t *dlight;
+
+       VectorClear(color);
+
+       if (r_fullbright.integer)
+       {
+               VectorSet(color, 1, 1, 1);
+               return;
+       }
+
+       if (flags & LP_LIGHTMAP)
+       {
+               if (!r_fullbright.integer && r_refdef.scene.worldmodel && r_refdef.scene.worldmodel->brush.LightPoint)
+               {
+                       r_refdef.scene.worldmodel->brush.LightPoint(r_refdef.scene.worldmodel, p, color, diffuse, n);
+                       color[0] += r_refdef.scene.ambient + diffuse[0];
+                       color[1] += r_refdef.scene.ambient + diffuse[1];
+                       color[2] += r_refdef.scene.ambient + diffuse[2];
+               }
+               else
+                       VectorSet(color, 1, 1, 1);
+       }
+       if (flags & LP_RTWORLD)
+       {
+               flag = r_refdef.scene.rtworld ? LIGHTFLAG_REALTIMEMODE : LIGHTFLAG_NORMALMODE;
+               numlights = Mem_ExpandableArray_IndexRange(&r_shadow_worldlightsarray);
+               for (i = 0; i < numlights; i++)
+               {
+                       dlight = (dlight_t *) Mem_ExpandableArray_RecordAtIndex(&r_shadow_worldlightsarray, i);
+                       if (!dlight)
+                               continue;
+                       light = &dlight->rtlight;
+                       if (!(light->flags & flag))
+                               continue;
+                       // sample
+                       lightradius2 = light->radius * light->radius;
+                       VectorSubtract(light->shadoworigin, p, relativepoint);
+                       dist2 = VectorLength2(relativepoint);
+                       if (dist2 >= lightradius2)
+                               continue;
+                       dist = sqrt(dist2) / light->radius;
+                       f = dist < 1 ? (r_shadow_lightintensityscale.value * ((1.0f - dist) * r_shadow_lightattenuationlinearscale.value / (r_shadow_lightattenuationdividebias.value + dist*dist))) : 0;
+                       if (f <= 0)
+                               continue;
+                       // todo: add to both ambient and diffuse
+                       if (!light->shadow || CL_TraceLine(p, light->shadoworigin, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID, true, false, NULL, false, true).fraction == 1)
+                               VectorMA(color, f, light->currentcolor, color);
+               }
+       }
+       if (flags & LP_DYNLIGHT)
+       {
+               // sample dlights
+               for (i = 0;i < r_refdef.scene.numlights;i++)
+               {
+                       light = r_refdef.scene.lights[i];
+                       // sample
+                       lightradius2 = light->radius * light->radius;
+                       VectorSubtract(light->shadoworigin, p, relativepoint);
+                       dist2 = VectorLength2(relativepoint);
+                       if (dist2 >= lightradius2)
+                               continue;
+                       dist = sqrt(dist2) / light->radius;
+                       f = dist < 1 ? (r_shadow_lightintensityscale.value * ((1.0f - dist) * r_shadow_lightattenuationlinearscale.value / (r_shadow_lightattenuationdividebias.value + dist*dist))) : 0;
+                       if (f <= 0)
+                               continue;
+                       // todo: add to both ambient and diffuse
+                       if (!light->shadow || CL_TraceLine(p, light->shadoworigin, MOVE_NOMONSTERS, NULL, SUPERCONTENTS_SOLID, true, false, NULL, false, true).fraction == 1)
+                               VectorMA(color, f, light->color, color);
+               }
+       }
+}
+
 void R_CompleteLightPoint(vec3_t ambient, vec3_t diffuse, vec3_t lightdir, const vec3_t p, const int flags)
 {
        int i, numlights, flag;
@@ -6620,7 +6698,7 @@ void R_CompleteLightPoint(vec3_t ambient, vec3_t diffuse, vec3_t lightdir, const
                return;
        }
 
-       if (flags & LP_LIGHTMAP)
+       if (flags == LP_LIGHTMAP)
        {
                VectorSet(ambient, r_refdef.scene.ambient, r_refdef.scene.ambient, r_refdef.scene.ambient);
                VectorClear(diffuse);

diff --git a/r_shadow.h b/r_shadow.h
index b2dab2dde5b544d26ebf59f85da3c7300f7eacb5..c595fbe9f02e9232e1255dd4c586dcedbff07fbd 100644 (file)
--- a/r_shadow.h
+++ b/r_shadow.h
@@ -98,9 +98,10 @@ void R_Shadow_PrepareShadowSides(int numtris);
 
 void R_Shadow_PrepareModelShadows(void);
 
-#define LP_LIGHTMAP    1
-#define LP_RTWORLD     2
-#define LP_DYNLIGHT    4
+#define LP_LIGHTMAP            1
+#define LP_RTWORLD             2
+#define LP_DYNLIGHT            4
+void R_LightPoint(vec3_t color, const vec3_t p, const int flags);
 void R_CompleteLightPoint(vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffusenormal, const vec3_t p, const int flags);
 
 #endif

diff --git a/r_sprites.c b/r_sprites.c
index 8f416b47b6e665d430c15da4fb879ff315ba8815..486b119f5271367b04278049bbbf47b97442cfb0 100644 (file)
--- a/r_sprites.c
+++ b/r_sprites.c
@@ -374,6 +374,10 @@ void R_Model_Sprite_Draw_TransparentCallback(const entity_render_t *ent, const r
                org[2] = org[2] - middle[2]*r_overheadsprites_pushback.value;
                // little perspective effect
                up[2] = up[2] + dir_angle * 0.3;
+               // a bit of counter-camera rotation
+               up[0] = up[0] + r_refdef.view.forward[0] * 0.07;
+               up[1] = up[1] + r_refdef.view.forward[1] * 0.07;
+               up[2] = up[2] + r_refdef.view.forward[2] * 0.07;
                break;
        }