vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

dynamic_light: Added custom pattern support, which is custom to Nuclide.

Browse source
This commit is contained in:
Marco Cawthorne 2020-12-07 15:59:22 +01:00
parent 751315b318
commit 00a5a55202
3 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
platform/test_maps.pk3dir/maps/test_dlights.bsp
View file

Binary file not shown.

2
platform/test_maps.pk3dir/maps/test_dlights.map
View file

@ -224,7 +224,7 @@
{
"classname" "dynamic_light"
"origin" "-192.000000 -64.000000 64.000000"
"style" "9"
"pattern" "zm"
"_light" "255 255 128"
"brightness" "150"
}

24
src/gs-entbase/shared/light_dynamic.cpp
View file

@ -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);
}