mirror of
https://github.com/libretro/ppsspp.git
synced 2025-02-01 06:12:43 +00:00
Merge pull request #1044 from raven02/patch-11
Put Vec3 norm and bool hasNormal in better place
This commit is contained in:
commit
eb1a76bfc2
@ -276,8 +276,10 @@ void Lighter::Light(float colorOut0[4], float colorOut1[4], const float colorIn[
|
||||
|
||||
GELightComputation comp = (GELightComputation)(gstate.ltype[l] & 3);
|
||||
GELightType type = (GELightType)((gstate.ltype[l] >> 8) & 3);
|
||||
Vec3 toLight;
|
||||
|
||||
|
||||
Vec3 toLight(0,0,0);
|
||||
Vec3 norm(0,0,0);
|
||||
|
||||
if (type == GE_LIGHTTYPE_DIRECTIONAL)
|
||||
toLight = Vec3(gstate_c.lightpos[l]); // lightdir is for spotlights
|
||||
else
|
||||
@ -285,10 +287,10 @@ void Lighter::Light(float colorOut0[4], float colorOut1[4], const float colorIn[
|
||||
|
||||
bool doSpecular = (comp != GE_LIGHTCOMP_ONLYDIFFUSE);
|
||||
bool poweredDiffuse = comp == GE_LIGHTCOMP_BOTHWITHPOWDIFFUSE;
|
||||
|
||||
bool hasNormal = (gstate.vertType & GE_VTYPE_NRM_MASK) != 0;
|
||||
|
||||
float distanceToLight = toLight.Length();
|
||||
float dot = 0.0f;
|
||||
Vec3 norm(0,0,0);
|
||||
|
||||
if (hasNormal)
|
||||
norm = normal.Normalized();
|
||||
|
Loading…
x
Reference in New Issue
Block a user