From 00a5a552029acbaaaf1d1b67fea108c31c4adbcb Mon Sep 17 00:00:00 2001
From: Marco Hladik <marco@icculus.org>
Date: Mon, 7 Dec 2020 15:59:22 +0100
Subject: [PATCH] dynamic_light: Added custom pattern support, which is custom
 to Nuclide.

---
 .../test_maps.pk3dir/maps/test_dlights.bsp    | Bin 1608828 -> 1608832 bytes
 .../test_maps.pk3dir/maps/test_dlights.map    |   2 +-
 src/gs-entbase/shared/light_dynamic.cpp       |  24 +++++++++++++++---
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/platform/test_maps.pk3dir/maps/test_dlights.bsp b/platform/test_maps.pk3dir/maps/test_dlights.bsp
index 3c0cf374a89b428859d59e3efff0127702568644..8f087101d2f81188d31fd64263e70fbbc17b38db 100644
GIT binary patch
delta 156
zcmWN_yAHu%7zW_~uTzUs=Wo;WI!qlTHi^}uiQyfHNGFkKhj*zM3{oz_D0K<8-i6r(
z7<k6#dkvynV2}OTR4b)M2T}gno>@^M>hq5%2B8UqC=f-WM3jjNVG<TmC2B;Su!#oI
zBpjkew22PUC3-}k7(5{JxV~A0;c~n7TyM8Z^GGCn$8s?ZcarTBakPG>r=tw@E4?2j
F{{caFG;9C>

delta 147
zcmWN_tqQ_W7zW^T{N2=}^Z#qg?m`g;2D7kg8W>)%X%Pl);VoNQnqGuKP<8`$@lLz|
zgFf+zF2VO4nAOr>Yo*lUB+AQ-Z-<Gf&p*N#geFQvnWzv|qDIsSi?E3X(Ii@gA=*TT
xaELC^Bl^UE7!o65{D5p?dw)3Yw(iuO74KNCmYx?;B97MgJWFMwpZP77*AHdsFr)wg

diff --git a/platform/test_maps.pk3dir/maps/test_dlights.map b/platform/test_maps.pk3dir/maps/test_dlights.map
index 94477442..50037176 100644
--- a/platform/test_maps.pk3dir/maps/test_dlights.map
+++ b/platform/test_maps.pk3dir/maps/test_dlights.map
@@ -224,7 +224,7 @@
 {
 "classname" "dynamic_light"
 "origin" "-192.000000 -64.000000 64.000000"
-"style" "9"
+"pattern" "zm"
 "_light" "255 255 128"
 "brightness" "150"
 }
diff --git a/src/gs-entbase/shared/light_dynamic.cpp b/src/gs-entbase/shared/light_dynamic.cpp
index 7c064471..6bc0c9d6 100644
--- a/src/gs-entbase/shared/light_dynamic.cpp
+++ b/src/gs-entbase/shared/light_dynamic.cpp
@@ -25,6 +25,7 @@
 "spotlight_radius"  Radius of the resulting spotlight that's cast at a wall.
 "style"             Select one of the hard-coded lightstyles.
 "start_active"      Override for if the entity should start on or off.
+"pattern"           Override the lightstyle pattern with a string.
 
 Inputs:
 "TurnOn"            Turns the light on.
@@ -37,6 +38,7 @@ Inputs:
 "_cone"             Sets the length of the light cone.
 "spotlight_radius"  Sets the radius of the projected spotlight.
 "style"             Sets the light appearance in integer form.
+"SetPattern"        Sets the light pattern in string form! a = dark, z = bright
 
 Dynamic light entity. Can be parented to things, it even has some inputs that
 may be interesting.
@@ -59,7 +61,8 @@ enumflags
 	DLIGHTFL_CHANGED_DISTANCE,
 	DLIGHTFL_CHANGED_RADIUS,
 	DLIGHTFL_CHANGED_STYLE,
-	DLIGHTFL_CHANGED_STATE
+	DLIGHTFL_CHANGED_STATE,
+	DLIGHTFL_CHANGED_PATTERN
 };
 
 #ifdef CLIENT
@@ -75,6 +78,7 @@ class light_dynamic:CBaseTrigger
 	float m_flDistance;
 	float m_flRadius;
 	float m_flStyle;
+	string m_strPattern;
 	int m_iState;
 
 	void(void) light_dynamic;
@@ -102,8 +106,11 @@ light_dynamic::predraw(void)
 		return PREDRAW_NEXT;
 	}
 
-	/* TODO: We need to handle the second cone light */
-	dynamiclight_add(origin, m_flDistance, m_vecLight, m_flStyle);
+	float p = dynamiclight_add(origin, m_flDistance, m_vecLight, m_flStyle);
+	dynamiclight_set(p, LFIELD_ANGLES, angles);
+
+	if (m_strPattern)
+		dynamiclight_set(p, LFIELD_STYLESTRING, m_strPattern);
 
 	addentity(this);
 	return PREDRAW_NEXT;
@@ -145,6 +152,8 @@ light_dynamic::ReceiveEntity(float flFlags)
 		m_flStyle = readbyte();
 	if (flFlags & DLIGHTFL_CHANGED_STATE)
 		m_iState = readbyte();
+	if (flFlags & DLIGHTFL_CHANGED_PATTERN)
+		m_strPattern = readstring();
 
 	classname = "light_dynamic";
 }
@@ -224,6 +233,8 @@ light_dynamic::SendEntity(entity ePVSEnt, float flFlags)
 		WriteByte(MSG_ENTITY, m_flStyle);
 	if (flFlags & DLIGHTFL_CHANGED_STATE)
 		WriteByte(MSG_ENTITY, m_iState);
+	if (flFlags & DLIGHTFL_CHANGED_PATTERN)
+		WriteString(MSG_ENTITY, m_strPattern);
 
 	return TRUE;
 }
@@ -269,6 +280,10 @@ light_dynamic::Input(entity eAct, string strInput, string strData)
 	case "Toggle":
 		Trigger(eAct, TRIG_TOGGLE);
 		break;
+	case "SetPattern":
+		m_strPattern = strData;
+		SendFlags |= DLIGHTFL_CHANGED_PATTERN;
+		break;
 	default:
 		CBaseTrigger::Input(eAct, strInput, strData);
 	}
@@ -304,6 +319,9 @@ light_dynamic::SpawnKey(string strKey, string strValue)
 	case "start_active":
 		m_iStartActive = stoi(strValue);
 		break;
+	case "pattern":
+		m_strPattern = strValue;
+		break;
 	default:
 		CBaseTrigger::SpawnKey(strKey, strValue);
 	}