Commit: e345686cb7f4a8ccdc10e85d4f05cded45850cf7 Author: Jacques Lucke Date: Fri Sep 23 16:51:29 2022 +0200 Branches: master https://developer.blender.org/rBe345686cb7f4a8ccdc10e85d4f05cded45850cf7
View3d: move space_view3d.c to c++ =================================================================== M source/blender/editors/include/ED_view3d.h M source/blender/editors/space_view3d/CMakeLists.txt R091 source/blender/editors/space_view3d/space_view3d.c source/blender/editors/space_view3d/space_view3d.cc M source/blender/editors/space_view3d/view3d_intern.h M source/blender/editors/space_view3d/view3d_navigate.h =================================================================== diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h index c72f3121217..a4857c2b92f 100644 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.h @@ -1319,7 +1319,7 @@ void ED_view3d_gizmo_mesh_preselect_get_active(struct bContext *C, struct BMElem **r_ele); void ED_view3d_gizmo_mesh_preselect_clear(struct wmGizmo *gz); -/* space_view3d.c */ +/* space_view3d.cc */ void ED_view3d_buttons_region_layout_ex(const struct bContext *C, struct ARegion *region, diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt index 27a0cd8e55a..d465460682d 100644 --- a/source/blender/editors/space_view3d/CMakeLists.txt +++ b/source/blender/editors/space_view3d/CMakeLists.txt @@ -27,7 +27,7 @@ set(INC set(SRC drawobject.c - space_view3d.c + space_view3d.cc view3d_buttons.c view3d_camera_control.c view3d_cursor_snap.c diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.cc similarity index 91% rename from source/blender/editors/space_view3d/space_view3d.c rename to source/blender/editors/space_view3d/space_view3d.cc index 723a5f859a6..1b168ca1dda 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.cc @@ -83,12 +83,12 @@ RegionView3D *ED_view3d_context_rv3d(bContext *C) { RegionView3D *rv3d = CTX_wm_region_view3d(C); - if (rv3d == NULL) { + if (rv3d == nullptr) { ScrArea *area = CTX_wm_area(C); if (area && area->spacetype == SPACE_VIEW3D) { ARegion *region = BKE_area_find_region_active_win(area); if (region) { - rv3d = region->regiondata; + rv3d = static_cast<RegionView3D *>(region->regiondata); } } } @@ -99,8 +99,8 @@ bool ED_view3d_context_user_region(bContext *C, View3D **r_v3d, ARegion **r_regi { ScrArea *area = CTX_wm_area(C); - *r_v3d = NULL; - *r_region = NULL; + *r_v3d = nullptr; + *r_region = nullptr; if (area && area->spacetype == SPACE_VIEW3D) { ARegion *region = CTX_wm_region(C); @@ -108,7 +108,8 @@ bool ED_view3d_context_user_region(bContext *C, View3D **r_v3d, ARegion **r_regi if (region) { RegionView3D *rv3d; - if ((region->regiontype == RGN_TYPE_WINDOW) && (rv3d = region->regiondata) && + if ((region->regiontype == RGN_TYPE_WINDOW) && + (rv3d = static_cast<RegionView3D *>(region->regiondata)) && (rv3d->viewlock & RV3D_LOCK_ROTATION) == 0) { *r_v3d = v3d; *r_region = region; @@ -127,9 +128,9 @@ bool ED_view3d_context_user_region(bContext *C, View3D **r_v3d, ARegion **r_regi bool ED_view3d_area_user_region(const ScrArea *area, const View3D *v3d, ARegion **r_region) { - RegionView3D *rv3d = NULL; - ARegion *region_unlock_user = NULL; - ARegion *region_unlock = NULL; + RegionView3D *rv3d = nullptr; + ARegion *region_unlock_user = nullptr; + ARegion *region_unlock = nullptr; const ListBase *region_list = (v3d == area->spacedata.first) ? &area->regionbase : &v3d->regionbase; @@ -138,7 +139,7 @@ bool ED_view3d_area_user_region(const ScrArea *area, const View3D *v3d, ARegion LISTBASE_FOREACH (ARegion *, region, region_list) { /* find the first unlocked rv3d */ if (region->regiondata && region->regiontype == RGN_TYPE_WINDOW) { - rv3d = region->regiondata; + rv3d = static_cast<RegionView3D *>(region->regiondata); if ((rv3d->viewlock & RV3D_LOCK_ROTATION) == 0) { region_unlock = region; if (ELEM(rv3d->persp, RV3D_PERSP, RV3D_CAMOB)) { @@ -199,7 +200,7 @@ void ED_view3d_check_mats_rv3d(struct RegionView3D *rv3d) void ED_view3d_stop_render_preview(wmWindowManager *wm, ARegion *region) { - RegionView3D *rv3d = region->regiondata; + RegionView3D *rv3d = static_cast<RegionView3D *>(region->regiondata); if (rv3d->render_engine) { #ifdef WITH_PYTHON @@ -213,7 +214,7 @@ void ED_view3d_stop_render_preview(wmWindowManager *wm, ARegion *region) #endif RE_engine_free(rv3d->render_engine); - rv3d->render_engine = NULL; + rv3d->render_engine = nullptr; } /* A bit overkill but this make sure the viewport is reset completely. (fclem) */ @@ -222,12 +223,12 @@ void ED_view3d_stop_render_preview(wmWindowManager *wm, ARegion *region) void ED_view3d_shade_update(Main *bmain, View3D *v3d, ScrArea *area) { - wmWindowManager *wm = bmain->wm.first; + wmWindowManager *wm = static_cast<wmWindowManager *>(bmain->wm.first); if (v3d->shading.type != OB_RENDER) { ARegion *region; - for (region = area->regionbase.first; region; region = region->next) { + for (region = static_cast<ARegion *>(area->regionbase.first); region; region = region->next) { if ((region->regiontype == RGN_TYPE_WINDOW) && region->regiondata) { ED_view3d_stop_render_preview(wm, region); } @@ -250,14 +251,14 @@ static SpaceLink *view3d_create(const ScrArea *UNUSED(area), const Scene *scene) } /* header */ - region = MEM_callocN(sizeof(ARegion), "header for view3d"); + region = MEM_cnew<ARegion>("header for view3d"); BLI_addtail(&v3d->regionbase, region); region->regiontype = RGN_TYPE_HEADER; region->alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_BOTTOM : RGN_ALIGN_TOP; /* tool header */ - region = MEM_callocN(sizeof(ARegion), "tool header for view3d"); + region = MEM_cnew<ARegion>("tool header for view3d"); BLI_addtail(&v3d->regionbase, region); region->regiontype = RGN_TYPE_TOOL_HEADER; @@ -265,7 +266,7 @@ static SpaceLink *view3d_create(const ScrArea *UNUSED(area), const Scene *scene) region->flag = RGN_FLAG_HIDDEN | RGN_FLAG_HIDDEN_BY_USER; /* tool shelf */ - region = MEM_callocN(sizeof(ARegion), "toolshelf for view3d"); + region = MEM_cnew<ARegion>("toolshelf for view3d"); BLI_addtail(&v3d->regionbase, region); region->regiontype = RGN_TYPE_TOOLS; @@ -273,7 +274,7 @@ static SpaceLink *view3d_create(const ScrArea *UNUSED(area), const Scene *scene) region->flag = RGN_FLAG_HIDDEN; /* buttons/list view */ - region = MEM_callocN(sizeof(ARegion), "buttons for view3d"); + region = MEM_cnew<ARegion>("buttons for view3d"); BLI_addtail(&v3d->regionbase, region); region->regiontype = RGN_TYPE_UI; @@ -281,13 +282,13 @@ static SpaceLink *view3d_create(const ScrArea *UNUSED(area), const Scene *scene) region->flag = RGN_FLAG_HIDDEN; /* main region */ - region = MEM_callocN(sizeof(ARegion), "main region for view3d"); + region = MEM_cnew<ARegion>("main region for view3d"); BLI_addtail(&v3d->regionbase, region); region->regiontype = RGN_TYPE_WINDOW; - region->regiondata = MEM_callocN(sizeof(RegionView3D), "region view3d"); - rv3d = region->regiondata; + region->regiondata = MEM_cnew<RegionView3D>("region view3d"); + rv3d = static_cast<RegionView3D *>(region->regiondata); rv3d->viewquat[0] = 1.0f; rv3d->persp = RV3D_PERSP; rv3d->view = RV3D_VIEW_USER; @@ -313,7 +314,7 @@ static void view3d_free(SpaceLink *sl) if (vd->shading.prop) { IDP_FreeProperty(vd->shading.prop); - vd->shading.prop = NULL; + vd->shading.prop = nullptr; } } @@ -325,21 +326,21 @@ static void view3d_init(wmWindowManager *UNUSED(wm), ScrArea *UNUSED(area)) static void view3d_exit(wmWindowManager *UNUSED(wm), ScrArea *area) { BLI_assert(area->spacetype == SPACE_VIEW3D); - View3D *v3d = area->spacedata.first; + View3D *v3d = static_cast<View3D *>(area->spacedata.first); MEM_SAFE_FREE(v3d->runtime.local_stats); } static SpaceLink *view3d_duplicate(SpaceLink *sl) { View3D *v3do = (View3D *)sl; - View3D *v3dn = MEM_dupallocN(sl); + View3D *v3dn = static_cast<View3D *>(MEM_dupallocN(sl)); memset(&v3dn->runtime, 0x0, sizeof(v3dn->runtime)); /* clear or remove stuff from old */ if (v3dn->localvd) { - v3dn->localvd = NULL; + v3dn->localvd = nullptr; } v3dn->local_collections_uuid = 0; @@ -459,10 +460,10 @@ static ID_Type view3d_drop_id_in_main_region_poll_get_id_type(bContext *C, const ScrArea *area = CTX_wm_area(C); if (ED_region_overlap_isect_any_xy(area, event->xy)) { - return 0; + return ID_Type(0); } if (!view3d_drop_in_main_region_poll(C, event)) { - return 0; + return ID_Type(0); } ID *local_id = WM_drag_get_local_ID(drag, 0); @@ -472,10 +473,10 @@ static ID_Type view3d_drop_id_in_main_region_poll_get_id_type(bContext *C, wmDragAsset *asset_drag = WM_drag_get_asset_data(drag, 0); if (asset_drag) { - return asset_drag->id_type; + return ID_Type(asset_drag->id_type); } - return 0; + return ID_Type(0); } static bool view3d_drop_id_in_main_region_poll(bContext *C, @@ -492,7 +493,7 @@ static bool view3d_drop_id_in_main_region_poll(bContext *C, static void view3d_ob_drop_draw_activate(struct wmDropBox *drop, wmDrag *drag) { - V3DSnapCursorState *state = drop->draw_data; + V3DSnapCursorState *state = static_cast<V3DSnapCursorState *>(drop->draw_data); if (state) { return; } @@ -503,7 +504,8 @@ static void view3d_ob_drop_draw_activate(struct wmDropBox *drop, wmDrag *drag) return; } - state = drop->draw_data = ED_view3d_cursor_snap_active(); + state = static_cast<V3DSnapCursorState *>(ED_view3d_cursor_snap_active()); + drop->draw_data = state; state->draw_plane = true; float dimensions[3] = {0.0f}; @@ -515,7 +517,7 @@ static void view3d_ob_drop_draw_activate(struct wmDropBox *drop, wmDrag *drag) struct AssetMetaData *meta_data = WM_drag_get_asset_meta_data(drag, ID_OB); IDProperty *dimensions_prop = BKE_asset_metadata_idprop_find(meta_data, "dimensions"); if (dimensions_prop) { - copy_v3_v3(dimensions, IDP_Array(dimensions_prop)); + copy_v3_v3(dimensions, static_cast<float *>(IDP_Array(dimensions_prop))); } } @@ -528,10 +530,10 @@ static void view3d_ob_drop_draw_activate(struct wmDropBox *drop, wmDrag *drag) static void view3d_ob_drop_ @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs