archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix for non spot lamps calculating spot values

Browse Source 
Logical error in D1378, also incorrectly used lamp type as a flag.
This commit is contained in:
Campbell Barton
2016-03-21 16:01:26 +11:00
parent a0a66e0418
commit 72bf5d13e6
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/gpu/intern/gpu_material.c
View File

@@ -2164,22 +2164,17 @@ static void gpu_lamp_calc_winmat(GPULamp *lamp)
wsize = lamp->la->shadow_frustum_size; wsize = lamp->la->shadow_frustum_size;
orthographic_m4(lamp->winmat, -wsize, wsize, -wsize, wsize, lamp->d, lamp->clipend); orthographic_m4(lamp->winmat, -wsize, wsize, -wsize, wsize, lamp->d, lamp->clipend);
} }
else { else if (lamp->type == LA_SPOT) {
angle = saacos(lamp->spotsi); angle = saacos(lamp->spotsi);
temp = 0.5f * lamp->size * cosf(angle) / sinf(angle); temp = 0.5f * lamp->size * cosf(angle) / sinf(angle);
pixsize = lamp->d / temp; pixsize = lamp->d / temp;
wsize = pixsize * 0.5f * lamp->size; wsize = pixsize * 0.5f * lamp->size;
if (lamp->type & LA_SPOT) { /* compute shadows according to X and Y scaling factors */
/* compute shadows according to X and Y scaling factors */ perspective_m4(
perspective_m4( lamp->winmat,
lamp->winmat, -wsize * lamp->spotvec[0], wsize * lamp->spotvec[0],
-wsize * lamp->spotvec[0], wsize * lamp->spotvec[0], -wsize * lamp->spotvec[1], wsize * lamp->spotvec[1],
-wsize * lamp->spotvec[1], wsize * lamp->spotvec[1], lamp->d, lamp->clipend);
lamp->d, lamp->clipend);
}
else {
perspective_m4(lamp->winmat, -wsize, wsize, -wsize, wsize, lamp->d, lamp->clipend);
}
} }
} }