blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Cleanup: pass const arguments to smooth-view functions 

Also move region redraw tag out of view3d_smoothview_apply_with_interp
as it's not always needed.
This commit is contained in:
Campbell Barton 2022-08-11 10:05:21 +10:00
parent 07deb9a71b
commit b9b45c2036
4 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/include/ED_view3d.h
View File

@ -1211,8 +1211,8 @@ bool ED_view3d_camera_lock_undo_test(const View3D *v3d,
* \return true when the call to push an undo step was made.
*/
bool ED_view3d_camera_lock_undo_push(const char *str,
View3D *v3d,
struct RegionView3D *rv3d,
const View3D *v3d,
const struct RegionView3D *rv3d,
struct bContext *C);
/**
@ -1222,8 +1222,8 @@ bool ED_view3d_camera_lock_undo_push(const char *str,
* where adding a separate undo step each time isn't desirable.
*/
bool ED_view3d_camera_lock_undo_grouped_push(const char *str,
View3D *v3d,
struct RegionView3D *rv3d,
const View3D *v3d,
const struct RegionView3D *rv3d,
struct bContext *C);
#define VIEW3D_MARGIN 1.4f

4
source/blender/editors/space_view3d/view3d_navigate.h
View File

@ -266,12 +266,12 @@ void ED_view3d_smooth_view(struct bContext *C,
* or when calling #ED_view3d_smooth_view_ex.
* Otherwise pass in #V3D_SmoothParams.undo_str so an undo step is pushed as needed.
*/
void ED_view3d_smooth_view_undo_begin(struct bContext *C, struct ScrArea *area);
void ED_view3d_smooth_view_undo_begin(struct bContext *C, const struct ScrArea *area);
/**
* Run after multiple smooth-view operations have run to push undo as needed.
*/
void ED_view3d_smooth_view_undo_end(struct bContext *C,
struct ScrArea *area,
const struct ScrArea *area,
const char *undo_str,
bool undo_grouped);

42
source/blender/editors/space_view3d/view3d_navigate_smoothview.c
View File

@ -23,7 +23,7 @@
#include "view3d_navigate.h" /* own include */
static void view3d_smoothview_apply_with_interp(
bContext *C, View3D *v3d, ARegion *region, const bool use_autokey, const float factor);
bContext *C, View3D *v3d, RegionView3D *rv3d, const bool use_autokey, const float factor);
/* -------------------------------------------------------------------- */
/** \name Smooth View Undo Handling
@ -40,7 +40,7 @@ static void view3d_smoothview_apply_with_interp(
* operations are executed once smooth-view has started.
* \{ */
void ED_view3d_smooth_view_undo_begin(bContext *C, ScrArea *area)
void ED_view3d_smooth_view_undo_begin(bContext *C, const ScrArea *area)
{
const View3D *v3d = area->spacedata.first;
Object *camera = v3d->camera;
@ -53,11 +53,11 @@ void ED_view3d_smooth_view_undo_begin(bContext *C, ScrArea *area)
* NOTE: It doesn't matter if the actual object being manipulated is the camera or not. */
camera->id.tag &= ~LIB_TAG_DOIT;
LISTBASE_FOREACH (ARegion *, region, &area->regionbase) {
LISTBASE_FOREACH (const ARegion *, region, &area->regionbase) {
if (region->regiontype != RGN_TYPE_WINDOW) {
continue;
}
RegionView3D *rv3d = region->regiondata;
const RegionView3D *rv3d = region->regiondata;
if (ED_view3d_camera_lock_undo_test(v3d, rv3d, C)) {
camera->id.tag |= LIB_TAG_DOIT;
break;
@ -66,7 +66,7 @@ void ED_view3d_smooth_view_undo_begin(bContext *C, ScrArea *area)
}
void ED_view3d_smooth_view_undo_end(bContext *C,
ScrArea *area,
const ScrArea *area,
const char *undo_str,
const bool undo_grouped)
{
@ -89,15 +89,15 @@ void ED_view3d_smooth_view_undo_end(bContext *C,
* so even in the case there is a quad-view with multiple camera views set, these will all
* reference the same camera. In this case it doesn't matter which region is used.
* If in the future multiple cameras are supported, this logic can be extended. */
ARegion *region_camera = NULL;
const ARegion *region_camera = NULL;
/* An undo push should be performed. */
bool is_interactive = false;
LISTBASE_FOREACH (ARegion *, region, &area->regionbase) {
LISTBASE_FOREACH (const ARegion *, region, &area->regionbase) {
if (region->regiontype != RGN_TYPE_WINDOW) {
continue;
}
RegionView3D *rv3d = region->regiondata;
const RegionView3D *rv3d = region->regiondata;
if (ED_view3d_camera_lock_undo_test(v3d, rv3d, C)) {
region_camera = region;
if (rv3d->sms) {
@ -110,12 +110,13 @@ void ED_view3d_smooth_view_undo_end(bContext *C,
return;
}
RegionView3D *rv3d = region_camera->regiondata;
/* Fast forward, undo push, then rewind. */
if (is_interactive) {
view3d_smoothview_apply_with_interp(C, v3d, region_camera, false, 1.0f);
view3d_smoothview_apply_with_interp(C, v3d, rv3d, false, 1.0f);
}
RegionView3D *rv3d = region_camera->regiondata;
if (undo_grouped) {
ED_view3d_camera_lock_undo_grouped_push(undo_str, v3d, rv3d, C);
}
@ -124,7 +125,7 @@ void ED_view3d_smooth_view_undo_end(bContext *C,
}
if (is_interactive) {
view3d_smoothview_apply_with_interp(C, v3d, region_camera, false, 0.0f);
view3d_smoothview_apply_with_interp(C, v3d, rv3d, false, 0.0f);
}
}
@ -391,9 +392,8 @@ void ED_view3d_smooth_view(bContext *C,
* Apply with interpolation, on completion run #view3d_smoothview_apply_and_finish.
*/
static void view3d_smoothview_apply_with_interp(
bContext *C, View3D *v3d, ARegion *region, const bool use_autokey, const float factor)
bContext *C, View3D *v3d, RegionView3D *rv3d, const bool use_autokey, const float factor)
{
RegionView3D *rv3d = region->regiondata;
struct SmoothView3DStore *sms = rv3d->sms;
interp_qt_qtqt(rv3d->viewquat, sms->src.quat, sms->dst.quat, factor);
@ -414,17 +414,14 @@ static void view3d_smoothview_apply_with_interp(
if (use_autokey) {
ED_view3d_camera_lock_autokey(v3d, rv3d, C, true, true);
}
ED_region_tag_redraw(region);
}
/**
* Apply the view-port transformation & free smooth-view related data.
*/
static void view3d_smoothview_apply_and_finish(bContext *C, View3D *v3d, ARegion *region)
static void view3d_smoothview_apply_and_finish(bContext *C, View3D *v3d, RegionView3D *rv3d)
{
wmWindowManager *wm = CTX_wm_manager(C);
RegionView3D *rv3d = region->regiondata;
struct SmoothView3DStore *sms = rv3d->sms;
wmWindow *win = CTX_wm_window(C);
@ -481,18 +478,20 @@ static void view3d_smoothview_apply_from_timer(bContext *C, View3D *v3d, ARegion
factor = 1.0f;
}
if (factor >= 1.0f) {
view3d_smoothview_apply_and_finish(C, v3d, region);
view3d_smoothview_apply_and_finish(C, v3d, rv3d);
}
else {
/* Ease in/out smoothing. */
factor = (3.0f * factor * factor - 2.0f * factor * factor * factor);
const bool use_autokey = ED_screen_animation_playing(wm);
view3d_smoothview_apply_with_interp(C, v3d, region, use_autokey, factor);
view3d_smoothview_apply_with_interp(C, v3d, rv3d, use_autokey, factor);
}
if (RV3D_LOCK_FLAGS(rv3d) & RV3D_BOXVIEW) {
view3d_boxview_copy(CTX_wm_area(C), region);
}
ED_region_tag_redraw(region);
}
static int view3d_smoothview_invoke(bContext *C, wmOperator *UNUSED(op), const wmEvent *event)
@ -514,11 +513,10 @@ static int view3d_smoothview_invoke(bContext *C, wmOperator *UNUSED(op), const w
void ED_view3d_smooth_view_force_finish(bContext *C, View3D *v3d, ARegion *region)
{
RegionView3D *rv3d = region->regiondata;
if (rv3d && rv3d->sms) {
view3d_smoothview_apply_and_finish(C, v3d, region);
view3d_smoothview_apply_and_finish(C, v3d, rv3d);
/* force update of view matrix so tools that run immediately after
/* Force update of view matrix so tools that run immediately after
* can use them without redrawing first */
Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
Scene *scene = CTX_data_scene(C);

16
source/blender/editors/space_view3d/view3d_utils.c
View File

@ -708,8 +708,11 @@ bool ED_view3d_camera_lock_undo_test(const View3D *v3d,
* unnecessary undo steps so undo push for them is not supported for now. Also operators that uses
* smooth view for navigation are excluded too, but they can be supported, see: D15345.
*/
static bool view3d_camera_lock_undo_ex(
const char *str, View3D *v3d, RegionView3D *rv3d, struct bContext *C, bool undo_group)
static bool view3d_camera_lock_undo_ex(const char *str,
const View3D *v3d,
const RegionView3D *rv3d,
struct bContext *C,
const bool undo_group)
{
if (ED_view3d_camera_lock_undo_test(v3d, rv3d, C)) {
if (undo_group) {
@ -723,14 +726,17 @@ static bool view3d_camera_lock_undo_ex(
return false;
}
bool ED_view3d_camera_lock_undo_push(const char *str, View3D *v3d, RegionView3D *rv3d, bContext *C)
bool ED_view3d_camera_lock_undo_push(const char *str,
const View3D *v3d,
const RegionView3D *rv3d,
bContext *C)
{
return view3d_camera_lock_undo_ex(str, v3d, rv3d, C, false);
}
bool ED_view3d_camera_lock_undo_grouped_push(const char *str,
View3D *v3d,
RegionView3D *rv3d,
const View3D *v3d,
const RegionView3D *rv3d,
bContext *C)
{
return view3d_camera_lock_undo_ex(str, v3d, rv3d, C, true);