blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix T54491: Do not avoid the creation of inverted frustum. 

Blender allows this.
The Cube in the file in the report would always disappear with the non camera view.
The clip_end was too small.
The correction here is only on the assert.
This commit is contained in:
Germano Cavalcante 2018-04-16 12:37:14 -03:00
parent 3b48a2a72f
commit 80bb4254c6
Notes: blender-bot 2023-02-14 10:43:47 +01:00 
Referenced by issue #54491, Default cube disappear in Front or Side view
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/draw/intern/draw_manager_exec.c
View File

@ -395,22 +395,23 @@ static void draw_frustum_boundbox_calc(const float(*projmat)[4], BoundBox *r_bbo
bool is_persp = projmat[3][3] == 0.0f;
if (is_persp) {
near = projmat[3][2] / (projmat[2][2] - 1.0f);
far = projmat[3][2] / (projmat[2][2] + 1.0f);
float w_half = near / projmat[0][0];
float h_half = near / projmat[1][1];
float w_half, h_half;
near = projmat[3][2] / (projmat[2][2] - 1.0f);
far = projmat[3][2] / (projmat[2][2] + 1.0f);
w_half = near / projmat[0][0];
h_half = near / projmat[1][1];
left = projmat[2][0] - w_half;
right = projmat[2][0] + w_half;
bottom = projmat[2][1] - h_half;
top = projmat[2][1] + h_half;
}
else {
near = (projmat[3][2] + 1.0f) / projmat[2][2];
far = (projmat[3][2] - 1.0f) / projmat[2][2];
left = (-1.0f - projmat[3][0]) / projmat[0][0];
right = (1.0f - projmat[3][0]) / projmat[0][0];
near = (projmat[3][2] + 1.0f) / projmat[2][2];
far = (projmat[3][2] - 1.0f) / projmat[2][2];
left = (-1.0f - projmat[3][0]) / projmat[0][0];
right = (1.0f - projmat[3][0]) / projmat[0][0];
bottom = (-1.0f - projmat[3][1]) / projmat[1][1];
top = (1.0f - projmat[3][1]) / projmat[1][1];
top = (1.0f - projmat[3][1]) / projmat[1][1];
}
r_bbox->vec[0][2] = r_bbox->vec[3][2] = r_bbox->vec[7][2] = r_bbox->vec[4][2] = -near;
@ -509,7 +510,6 @@ static void draw_clipping_setup_from_view(void)
float h_sq = len_squared_v3v3(mid_min, mid_max);
float fac = (4 * h_sq + b_sq - a_sq) / (8 * h_sq);
BLI_assert(fac >= 0.0f);
/* The goal is to get the smallest sphere,
* not the sphere that passes through each corner */