blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 778 Projects 19 Wiki Activity

Refactoring: Corrections and unifications in mathematics vfont gizmos #107193

Closed
Iliya Katushenock wants to merge 19 commits from mod_moder/blender:tmp_fix_text_cursor_transform into main
pull from: mod_moder/blender:tmp_fix_text_cursor_transform
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 8 Commits 19 Files Changed 6 +7 -7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9adb0a1fe6 - Show all commits

14
source/blender/blenkernel/intern/vfont.c
View File

@ -1590,25 +1590,25 @@ static bool vfont_to_curve(Object *ob,
cursor_centre[1] -= descender_downship;
float cursor_rot = 0.0f;
float aling_factor = 1.0f;
float align_factor = 1.0f;
if (is_line_cap) {
/* Aling to start or end of each line. */
aling_factor = is_start_cap ? 1.0f : 0.0f;
align_factor = is_start_cap ? 1.0f : 0.0f;
}
else if (cursor_to_selection) {
aling_factor = is_before_selection ? 1.0f : 0.0f;
align_factor = is_before_selection ? 1.0f : 0.0f;
}
else {
if (is_between_space_and_word) {
/* Aling to text, if cursor between regular text and space. */
aling_factor = is_space_word ? 1.0f : 0.0f;
align_factor = is_space_word ? 1.0f : 0.0f;
}
else {
aling_factor = 0.5f;
align_factor = 0.5f;
}
}
cursor_rot = slerp_r_r(prev_char_rot, curent_char_rot, aling_factor);
interp_v2_v2v2(cursor_loc, prev_char_loc, current_char_loc, aling_factor);
cursor_rot = slerp_r_r(prev_char_rot, curent_char_rot, align_factor);
interp_v2_v2v2(cursor_loc, prev_char_loc, current_char_loc, align_factor);
float geom[2][2];
angle_to_mat2(geom, cursor_rot);