diff options
author | mano-wii <germano.costa@ig.com.br> | 2019-03-22 04:20:13 +0300 |
---|---|---|
committer | mano-wii <germano.costa@ig.com.br> | 2019-03-22 04:23:49 +0300 |
commit | 2b42b8b779cd29dd1d4531103cee6aa69643ac7b (patch) | |
tree | 15c01d0e72f1c2668d0ded4436e8dcd802913e7a /source/blender/draw/intern/draw_manager_exec.c | |
parent | 1ae6aaad43ad1e021b2e8d8298bb389a4271d185 (diff) |
BLI Math: Add and use new `projmat_dimensions` utility.
Diffstat (limited to 'source/blender/draw/intern/draw_manager_exec.c')
-rw-r--r-- | source/blender/draw/intern/draw_manager_exec.c | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c index dbbc847430e..b18e000665f 100644 --- a/source/blender/draw/intern/draw_manager_exec.c +++ b/source/blender/draw/intern/draw_manager_exec.c @@ -464,24 +464,17 @@ void DRW_state_clip_planes_set_from_rv3d(RegionView3D *rv3d) */ static void draw_frustum_boundbox_calc(const float(*projmat)[4], BoundBox *r_bbox) { - float near, far, left, right, bottom, top; + float left, right, bottom, top, near, far; bool is_persp = projmat[3][3] == 0.0f; + projmat_dimensions( + projmat, &left, &right, &bottom, &top, &near, &far); + if (is_persp) { - near = projmat[3][2] / (projmat[2][2] - 1.0f); - far = projmat[3][2] / (projmat[2][2] + 1.0f); - left = near * (projmat[2][0] - 1.0f) / projmat[0][0]; - right = near * (projmat[2][0] + 1.0f) / projmat[0][0]; - bottom = near * (projmat[2][1] - 1.0f) / projmat[1][1]; - top = near * (projmat[2][1] + 1.0f) / projmat[1][1]; - } - else { - near = ( projmat[3][2] + 1.0f) / projmat[2][2]; - far = ( projmat[3][2] - 1.0f) / projmat[2][2]; - left = (-projmat[3][0] - 1.0f) / projmat[0][0]; - right = (-projmat[3][0] + 1.0f) / projmat[0][0]; - bottom = (-projmat[3][1] - 1.0f) / projmat[1][1]; - top = (-projmat[3][1] + 1.0f) / projmat[1][1]; + left *= near; + right *= near; + bottom *= near; + top *= near; } r_bbox->vec[0][2] = r_bbox->vec[3][2] = r_bbox->vec[7][2] = r_bbox->vec[4][2] = -near; @@ -494,8 +487,8 @@ static void draw_frustum_boundbox_calc(const float(*projmat)[4], BoundBox *r_bbo if (is_persp) { float sca_far = far / near; left *= sca_far; - bottom *= sca_far; right *= sca_far; + bottom *= sca_far; top *= sca_far; } |