olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

light: GetLightDist: use entity->getFormula()

This commit is contained in:
Eric Wasylishen 2016-08-11 14:37:26 -06:00
parent b849a79c3f
commit 4f58f61aad
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
light/ltface.cc
View File

@ -934,14 +934,14 @@ float
GetLightDist(const light_t *entity, vec_t desiredLight) GetLightDist(const light_t *entity, vec_t desiredLight)
{ {
float fadedist; float fadedist;
if (entity->formula.intValue() == LF_LINEAR) { if (entity->getFormula() == LF_LINEAR) {
/* Linear formula always has a falloff point */ /* Linear formula always has a falloff point */
fadedist = fabs(entity->light.floatValue()) - desiredLight; fadedist = fabs(entity->light.floatValue()) - desiredLight;
fadedist = fadedist / entity->atten.floatValue() / scaledist.floatValue(); fadedist = fadedist / entity->atten.floatValue() / scaledist.floatValue();
fadedist = qmax(0.0f, fadedist); fadedist = qmax(0.0f, fadedist);
} else { } else {
/* Calculate the distance at which brightness falls to desiredLight */ /* Calculate the distance at which brightness falls to desiredLight */
switch (entity->formula.intValue()) { switch (entity->getFormula()) {
case LF_INFINITE: case LF_INFINITE:
case LF_LOCALMIN: case LF_LOCALMIN:
fadedist = VECT_MAX; fadedist = VECT_MAX;
@ -952,7 +952,7 @@ GetLightDist(const light_t *entity, vec_t desiredLight)
case LF_INVERSE2: case LF_INVERSE2:
case LF_INVERSE2A: case LF_INVERSE2A:
fadedist = sqrt(fabs(entity->light.floatValue() * SQR(LF_SCALE) / (SQR(scaledist.floatValue()) * SQR(entity->atten.floatValue()) * desiredLight))); fadedist = sqrt(fabs(entity->light.floatValue() * SQR(LF_SCALE) / (SQR(scaledist.floatValue()) * SQR(entity->atten.floatValue()) * desiredLight)));
if (entity->formula.intValue() == LF_INVERSE2A) { if (entity->getFormula() == LF_INVERSE2A) {
fadedist -= (LF_SCALE / (scaledist.floatValue() * entity->atten.floatValue())); fadedist -= (LF_SCALE / (scaledist.floatValue() * entity->atten.floatValue()));
} }
fadedist = qmax(0.0f, fadedist); fadedist = qmax(0.0f, fadedist);