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

Improve usage of recent golden ratio define 

- fix typo
- set back to conjugate value and use as such

Followup to rB95175c3b5e2b.
This commit is contained in:
Philipp Oeser 2020-02-27 10:52:34 +01:00
parent 10162d68e3
commit 830a45a18a
Notes: blender-bot 2023-02-14 10:32:59 +01:00 
Referenced by issue #74254, EEVEE: Switch To Combined Render Pass when a Render Pass isn't Available Anymore in the Viewport.
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/space_view3d/view3d_draw.c
View File

@ -98,7 +98,7 @@
#include "view3d_intern.h" /* own include */
#define M_GOLDEN_RATION_CONJUGATE 1.618033988749895f
#define M_GOLDEN_RATIO_CONJUGATE 0.618033988749895f
/* -------------------------------------------------------------------- */
/** \name General Functions
@ -452,7 +452,7 @@ static void drawviewborder_triangle(
if (w > h) {
if (golden) {
ofs = w * (1.0f - (1.0f / M_GOLDEN_RATION_CONJUGATE));
ofs = w * (1.0f - M_GOLDEN_RATIO_CONJUGATE);
}
else {
ofs = h * (h / w);
@ -472,7 +472,7 @@ static void drawviewborder_triangle(
}
else {
if (golden) {
ofs = h * (1.0f - (1.0f / M_GOLDEN_RATION_CONJUGATE));
ofs = h * (1.0f - M_GOLDEN_RATIO_CONJUGATE);
}
else {
ofs = w * (w / h);
@ -662,7 +662,7 @@ static void drawviewborder(Scene *scene, Depsgraph *depsgraph, ARegion *ar, View
}
if (ca->dtx & CAM_DTX_GOLDEN) {
drawviewborder_grid3(shdr_pos, x1, x2, y1, y2, 1.0f - (1.0f / M_GOLDEN_RATION_CONJUGATE));
drawviewborder_grid3(shdr_pos, x1, x2, y1, y2, 1.0f - M_GOLDEN_RATIO_CONJUGATE);
}
if (ca->dtx & CAM_DTX_GOLDEN_TRI_A) {