From: vortex <vortex@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 8 Dec 2011 23:13:04 +0000 (+0000)
Subject: RF_MODELLIGHT compatible with getlight() - assuming light direction is worldspace... 
X-Git-Tag: xonotic-v0.6.0~119
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=11027124425c869d3c105c04a98968dded0cd4f6;p=xonotic%2Fdarkplaces.git

RF_MODELLIGHT compatible with getlight() - assuming light direction is worldspace and transforming it into modelspace.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@11603 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=f853d1f291b3bf31b7572342c4d2e3dafa868776
---

diff --git a/csprogs.c b/csprogs.c
index f4ddce2c..289f678c 100644
--- a/csprogs.c
+++ b/csprogs.c
@@ -357,15 +357,6 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed, int edictnum)
 	if (renderflags & RF_USETRANSPARENTOFFSET)
 		entrender->transparent_offset = PRVM_clientglobalfloat(transparent_offset);
 
-	// model light
-	if (renderflags & RF_MODELLIGHT)
-	{
-		if(PRVM_clientedictvector(ed, modellight_ambient)) VectorCopy(PRVM_clientedictvector(ed, modellight_ambient), entrender->modellight_ambient);
-		if(PRVM_clientedictvector(ed, modellight_diffuse)) VectorCopy(PRVM_clientedictvector(ed, modellight_diffuse), entrender->modellight_diffuse);
-		if(PRVM_clientedictvector(ed, modellight_dir))     VectorCopy(PRVM_clientedictvector(ed, modellight_dir), entrender->modellight_lightdir);
-		entrender->flags |= RENDER_CUSTOMIZEDMODELLIGHT;
-	}
-
 	if(renderflags)
 	{
 		if(renderflags & RF_VIEWMODEL) entrender->flags |= RENDER_VIEWMODEL | RENDER_NODEPTHTEST;
@@ -413,6 +404,19 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed, int edictnum)
 	// make the other useful stuff
 	memcpy(entrender->framegroupblend, ed->priv.server->framegroupblend, sizeof(ed->priv.server->framegroupblend));
 	CL_UpdateRenderEntity(entrender);
+
+	// model light
+	if (renderflags & RF_MODELLIGHT)
+	{
+		if(PRVM_clientedictvector(ed, modellight_ambient)) VectorCopy(PRVM_clientedictvector(ed, modellight_ambient), entrender->modellight_ambient);
+		if(PRVM_clientedictvector(ed, modellight_diffuse)) VectorCopy(PRVM_clientedictvector(ed, modellight_diffuse), entrender->modellight_diffuse);
+		if(PRVM_clientedictvector(ed, modellight_dir))     Matrix4x4_Transform3x3(&entrender->matrix, PRVM_clientedictvector(ed, modellight_dir), entrender->modellight_lightdir);
+		if (VectorLength2(entrender->modellight_lightdir) == 0)
+			VectorSet(entrender->modellight_lightdir, 0, 0, 1); // have to set SOME valid vector here
+		VectorNormalize(entrender->modellight_lightdir);
+		entrender->flags |= RENDER_CUSTOMIZEDMODELLIGHT;
+	}
+
 	// override animation data with full control
 	memcpy(entrender->frameblend, ed->priv.server->frameblend, sizeof(ed->priv.server->frameblend));
 	if (ed->priv.server->skeleton.relativetransforms)