TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

mathutil: support infinite near/far in LFrustum

Browse Source 
I don't know if anyone is using LFrustum, but just in case, it's good to support this corner case.
This commit is contained in:
rdb 2018-07-17 23:00:57 +02:00
parent cf240d95c1
commit bbb15631c6
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
panda/src/mathutil/frustum_src.I
View File

@ -140,7 +140,6 @@ get_perspective_projection_mat(CoordinateSystem cs) const {
cs = get_default_coordinate_system(); cs = get_default_coordinate_system();
} }
FLOATTYPE recip_far_minus_near = 1.0f/(_ffar - _fnear);
FLOATTYPE recip_r_minus_l = 1.0f/(_r - _l); FLOATTYPE recip_r_minus_l = 1.0f/(_r - _l);
FLOATTYPE recip_t_minus_b = 1.0f/(_t - _b); FLOATTYPE recip_t_minus_b = 1.0f/(_t - _b);
FLOATTYPE two_fnear = 2.0f*_fnear; FLOATTYPE two_fnear = 2.0f*_fnear;
@ -149,8 +148,20 @@ get_perspective_projection_mat(CoordinateSystem cs) const {
FLOATTYPE a = two_fnear * recip_r_minus_l; FLOATTYPE a = two_fnear * recip_r_minus_l;
FLOATTYPE e = two_fnear * recip_t_minus_b; FLOATTYPE e = two_fnear * recip_t_minus_b;
FLOATTYPE b = (_t + _b) * recip_t_minus_b; FLOATTYPE b = (_t + _b) * recip_t_minus_b;
FLOATTYPE c = (_ffar + _fnear) * recip_far_minus_near; FLOATTYPE c, f;
FLOATTYPE f = -_ffar * two_fnear * recip_far_minus_near;
// Take the limits if either near or far is infinite.
if (cinf(_ffar)) {
c = 1;
f = -2 * _fnear;
} else if (cinf(_fnear)) {
c = -1;
f = 2 * _ffar;
} else {
FLOATTYPE recip_far_minus_near = 1.0f / (_ffar - _fnear);
c = (_ffar + _fnear) * recip_far_minus_near;
f = -_ffar * two_fnear * recip_far_minus_near;
}
/* /*
FLOATTYPE a = (2.0f * _fnear) / (_r - _l); FLOATTYPE a = (2.0f * _fnear) / (_r - _l);