Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Wed, 27 Jun 2018 21:01:19 +0000 (23:01 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 27 Jun 2018 21:01:19 +0000 (23:01 +0200)
1  2 
source/blender/editors/mesh/editmesh_bisect.c

index 43eebc9b72ca8300f22e4e6e4b25684ec82425fc,783fe93167074216c35c948bd5948d32ab654990..568983e47ee55396aacfc2dc04d4e10e2eb29412
  #include "ED_screen.h"
  #include "ED_view3d.h"
  
 +#include "UI_resources.h"
  
  #include "mesh_intern.h"  /* own include */
  
 +#define USE_MANIPULATOR
 +
 +#ifdef USE_MANIPULATOR
 +#include "ED_manipulator_library.h"
 +#include "ED_undo.h"
 +#endif
 +
  static int mesh_bisect_exec(bContext *C, wmOperator *op);
  
  /* -------------------------------------------------------------------- */
@@@ -70,7 -62,7 +70,7 @@@ typedef struct 
        /* modal only */
        BMBackup mesh_backup;
        bool is_first;
 -      short twtype;
 +      short twflag;
  } BisectData;
  
  static bool mesh_bisect_interactive_calc(
@@@ -156,11 -148,11 +156,11 @@@ static int mesh_bisect_invoke(bContext 
  
                /* misc other vars */
                G.moving = G_TRANSFORM_EDIT;
 -              opdata->twtype = v3d->twtype;
 -              v3d->twtype = 0;
 +              opdata->twflag = v3d->twflag;
 +              v3d->twflag = 0;
  
                /* initialize modal callout */
 -              ED_area_headerprint(CTX_wm_area(C), IFACE_("LMB: Click and drag to draw cut line"));
 +              ED_workspace_status_text(C, IFACE_("LMB: Click and drag to draw cut line"));
        }
        return ret;
  }
@@@ -169,7 -161,7 +169,7 @@@ static void edbm_bisect_exit(bContext *
  {
        View3D *v3d = CTX_wm_view3d(C);
        EDBM_redo_state_free(&opdata->mesh_backup, NULL, false);
 -      v3d->twtype = opdata->twtype;
 +      v3d->twflag = opdata->twflag;
        G.moving = 0;
  }
  
@@@ -185,25 -177,15 +185,25 @@@ static int mesh_bisect_modal(bContext *
        /* update or clear modal callout */
        if (event->type == EVT_MODAL_MAP) {
                if (event->val == GESTURE_MODAL_BEGIN) {
 -                      ED_area_headerprint(CTX_wm_area(C), IFACE_("LMB: Release to confirm cut line"));
 +                      ED_workspace_status_text(C, IFACE_("LMB: Release to confirm cut line"));
                }
                else {
 -                      ED_area_headerprint(CTX_wm_area(C), NULL);
 +                      ED_workspace_status_text(C, NULL);
                }
        }
  
        if (ret & (OPERATOR_FINISHED | OPERATOR_CANCELLED)) {
                edbm_bisect_exit(C, &opdata_back);
 +
 +#ifdef USE_MANIPULATOR
 +              /* Setup manipulators */
 +              {
 +                      View3D *v3d = CTX_wm_view3d(C);
 +                      if (v3d && (v3d->twflag & V3D_MANIPULATOR_DRAW)) {
 +                              WM_manipulator_group_type_ensure("MESH_WGT_bisect");
 +                      }
 +              }
 +#endif
        }
  
        return ret;
@@@ -243,7 -225,7 +243,7 @@@ static int mesh_bisect_exec(bContext *C
                RNA_property_float_get_array(op->ptr, prop_plane_co, plane_co);
        }
        else {
 -              copy_v3_v3(plane_co, ED_view3d_cursor3d_get(scene, v3d));
 +              copy_v3_v3(plane_co, ED_view3d_cursor3d_get(scene, v3d)->location);
                RNA_property_float_set_array(op->ptr, prop_plane_co, plane_co);
        }
  
        }
  }
  
 +#ifdef USE_MANIPULATOR
 +static void MESH_WGT_bisect(struct wmManipulatorGroupType *wgt);
 +#endif
  
  void MESH_OT_bisect(struct wmOperatorType *ot)
  {
        RNA_def_boolean(ot->srna, "clear_outer", false, "Clear Outer", "Remove geometry in front of the plane");
  
        RNA_def_float(ot->srna, "threshold", 0.0001, 0.0, 10.0, "Axis Threshold",
-                                                                                                       "Preserves the existing geometry along the cut plane", 0.00001, 0.1);
+                     "Preserves the existing geometry along the cut plane", 0.00001, 0.1);
  
        WM_operator_properties_gesture_straightline(ot, CURSOR_EDIT);
 +
 +#ifdef USE_MANIPULATOR
 +      WM_manipulatorgrouptype_append(MESH_WGT_bisect);
 +#endif
 +}
 +
 +
 +#ifdef USE_MANIPULATOR
 +
 +/* -------------------------------------------------------------------- */
 +
 +/** \name Bisect Manipulator
 + * \{ */
 +
 +typedef struct ManipulatorGroup {
 +      /* Arrow to change plane depth. */
 +      struct wmManipulator *translate_z;
 +      /* Translate XYZ */
 +      struct wmManipulator *translate_c;
 +      /* For grabbing the manipulator and moving freely. */
 +      struct wmManipulator *rotate_c;
 +
 +      /* We could store more vars here! */
 +      struct {
 +              bContext *context;
 +              wmOperator *op;
 +              PropertyRNA *prop_plane_co;
 +              PropertyRNA *prop_plane_no;
 +
 +              float rotate_axis[3];
 +              float rotate_up[3];
 +      } data;
 +} ManipulatorGroup;
 +
 +/**
 + * XXX. calling redo from property updates is not great.
 + * This is needed because changing the RNA doesn't cause a redo
 + * and we're not using operator UI which does just this.
 + */
 +static void manipulator_bisect_exec(ManipulatorGroup *man)
 +{
 +      wmOperator *op = man->data.op;
 +      if (op == WM_operator_last_redo((bContext *)man->data.context)) {
 +              ED_undo_operator_repeat((bContext *)man->data.context, op);
 +      }
 +}
 +
 +static void manipulator_mesh_bisect_update_from_op(ManipulatorGroup *man)
 +{
 +      wmOperator *op = man->data.op;
 +
 +      float plane_co[3], plane_no[3];
 +
 +      RNA_property_float_get_array(op->ptr, man->data.prop_plane_co, plane_co);
 +      RNA_property_float_get_array(op->ptr, man->data.prop_plane_no, plane_no);
 +
 +      WM_manipulator_set_matrix_location(man->translate_z, plane_co);
 +      WM_manipulator_set_matrix_location(man->rotate_c, plane_co);
 +      /* translate_c location comes from the property. */
 +
 +      WM_manipulator_set_matrix_rotation_from_z_axis(man->translate_z, plane_no);
 +
 +      WM_manipulator_set_scale(man->translate_c, 0.2);
 +
 +      RegionView3D *rv3d = ED_view3d_context_rv3d(man->data.context);
 +      if (rv3d) {
 +              normalize_v3_v3(man->data.rotate_axis, rv3d->viewinv[2]);
 +              normalize_v3_v3(man->data.rotate_up, rv3d->viewinv[1]);
 +
 +              /* ensure its orthogonal */
 +              project_plane_normalized_v3_v3v3(man->data.rotate_up, man->data.rotate_up, man->data.rotate_axis);
 +              normalize_v3(man->data.rotate_up);
 +
 +              WM_manipulator_set_matrix_rotation_from_z_axis(man->translate_c, plane_no);
 +
 +              float plane_no_cross[3];
 +              cross_v3_v3v3(plane_no_cross, plane_no, man->data.rotate_axis);
 +
 +              WM_manipulator_set_matrix_offset_rotation_from_yz_axis(man->rotate_c, plane_no_cross, man->data.rotate_axis);
 +              RNA_enum_set(man->rotate_c->ptr, "draw_options",
 +                           ED_MANIPULATOR_DIAL_DRAW_FLAG_ANGLE_MIRROR |
 +                           ED_MANIPULATOR_DIAL_DRAW_FLAG_ANGLE_START_Y);
 +      }
 +}
 +
 +/* depth callbacks */
 +static void manipulator_bisect_prop_depth_get(
 +        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
 +        void *value_p)
 +{
 +      ManipulatorGroup *man = mpr->parent_mgroup->customdata;
 +      wmOperator *op = man->data.op;
 +      float *value = value_p;
 +
 +      BLI_assert(mpr_prop->type->array_length == 1);
 +      UNUSED_VARS_NDEBUG(mpr_prop);
 +
 +      float plane_co[3], plane_no[3];
 +      RNA_property_float_get_array(op->ptr, man->data.prop_plane_co, plane_co);
 +      RNA_property_float_get_array(op->ptr, man->data.prop_plane_no, plane_no);
 +
 +      value[0] = dot_v3v3(plane_no, plane_co) - dot_v3v3(plane_no, mpr->matrix_basis[3]);
 +}
 +
 +static void manipulator_bisect_prop_depth_set(
 +        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
 +        const void *value_p)
 +{
 +      ManipulatorGroup *man = mpr->parent_mgroup->customdata;
 +      wmOperator *op = man->data.op;
 +      const float *value = value_p;
 +
 +      BLI_assert(mpr_prop->type->array_length == 1);
 +      UNUSED_VARS_NDEBUG(mpr_prop);
 +
 +      float plane_co[3], plane[4];
 +      RNA_property_float_get_array(op->ptr, man->data.prop_plane_co, plane_co);
 +      RNA_property_float_get_array(op->ptr, man->data.prop_plane_no, plane);
 +      normalize_v3(plane);
 +
 +      plane[3] = -value[0] - dot_v3v3(plane, mpr->matrix_basis[3]);
 +
 +      /* Keep our location, may be offset simply to be inside the viewport. */
 +      closest_to_plane_normalized_v3(plane_co, plane, plane_co);
 +
 +      RNA_property_float_set_array(op->ptr, man->data.prop_plane_co, plane_co);
 +
 +      manipulator_bisect_exec(man);
 +}
 +
 +/* translate callbacks */
 +static void manipulator_bisect_prop_translate_get(
 +        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
 +        void *value_p)
 +{
 +      ManipulatorGroup *man = mpr->parent_mgroup->customdata;
 +      wmOperator *op = man->data.op;
 +
 +      BLI_assert(mpr_prop->type->array_length == 3);
 +      UNUSED_VARS_NDEBUG(mpr_prop);
 +
 +      RNA_property_float_get_array(op->ptr, man->data.prop_plane_co, value_p);
 +}
 +
 +static void manipulator_bisect_prop_translate_set(
 +        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
 +        const void *value_p)
 +{
 +      ManipulatorGroup *man = mpr->parent_mgroup->customdata;
 +      wmOperator *op = man->data.op;
 +
 +      BLI_assert(mpr_prop->type->array_length == 3);
 +      UNUSED_VARS_NDEBUG(mpr_prop);
 +
 +      RNA_property_float_set_array(op->ptr, man->data.prop_plane_co, value_p);
 +
 +      manipulator_bisect_exec(man);
 +}
 +
 +/* angle callbacks */
 +static void manipulator_bisect_prop_angle_get(
 +        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
 +        void *value_p)
 +{
 +      ManipulatorGroup *man = mpr->parent_mgroup->customdata;
 +      wmOperator *op = man->data.op;
 +      float *value = value_p;
 +
 +      BLI_assert(mpr_prop->type->array_length == 1);
 +      UNUSED_VARS_NDEBUG(mpr_prop);
 +
 +      float plane_no[4];
 +      RNA_property_float_get_array(op->ptr, man->data.prop_plane_no, plane_no);
 +      normalize_v3(plane_no);
 +
 +      float plane_no_proj[3];
 +      project_plane_normalized_v3_v3v3(plane_no_proj, plane_no, man->data.rotate_axis);
 +
 +      if (!is_zero_v3(plane_no_proj)) {
 +              const float angle = -angle_signed_on_axis_v3v3_v3(plane_no_proj, man->data.rotate_up, man->data.rotate_axis);
 +              value[0] = angle;
 +      }
 +      else {
 +              value[0] = 0.0f;
 +      }
 +}
 +
 +static void manipulator_bisect_prop_angle_set(
 +        const wmManipulator *mpr, wmManipulatorProperty *mpr_prop,
 +        const void *value_p)
 +{
 +      ManipulatorGroup *man = mpr->parent_mgroup->customdata;
 +      wmOperator *op = man->data.op;
 +      const float *value = value_p;
 +
 +      BLI_assert(mpr_prop->type->array_length == 1);
 +      UNUSED_VARS_NDEBUG(mpr_prop);
 +
 +      float plane_no[4];
 +      RNA_property_float_get_array(op->ptr, man->data.prop_plane_no, plane_no);
 +      normalize_v3(plane_no);
 +
 +      float plane_no_proj[3];
 +      project_plane_normalized_v3_v3v3(plane_no_proj, plane_no, man->data.rotate_axis);
 +
 +      if (!is_zero_v3(plane_no_proj)) {
 +              const float angle = -angle_signed_on_axis_v3v3_v3(plane_no_proj, man->data.rotate_up, man->data.rotate_axis);
 +              const float angle_delta = angle - angle_compat_rad(value[0], angle);
 +              if (angle_delta != 0.0f) {
 +                      float mat[3][3];
 +                      axis_angle_normalized_to_mat3(mat, man->data.rotate_axis, angle_delta);
 +                      mul_m3_v3(mat, plane_no);
 +
 +                      /* re-normalize - seems acceptable */
 +                      RNA_property_float_set_array(op->ptr, man->data.prop_plane_no, plane_no);
 +
 +                      manipulator_bisect_exec(man);
 +              }
 +      }
 +}
 +
 +static bool manipulator_mesh_bisect_poll(const bContext *C, wmManipulatorGroupType *wgt)
 +{
 +      wmOperator *op = WM_operator_last_redo(C);
 +      if (op == NULL || !STREQ(op->type->idname, "MESH_OT_bisect")) {
 +              WM_manipulator_group_type_unlink_delayed_ptr(wgt);
 +              return false;
 +      }
 +      return true;
  }
 +
 +static void manipulator_mesh_bisect_setup(const bContext *C, wmManipulatorGroup *mgroup)
 +{
 +      wmOperator *op = WM_operator_last_redo(C);
 +
 +      if (op == NULL || !STREQ(op->type->idname, "MESH_OT_bisect")) {
 +              return;
 +      }
 +
 +      struct ManipulatorGroup *man = MEM_callocN(sizeof(ManipulatorGroup), __func__);
 +      mgroup->customdata = man;
 +
 +      const wmManipulatorType *wt_arrow = WM_manipulatortype_find("MANIPULATOR_WT_arrow_3d", true);
 +      const wmManipulatorType *wt_grab = WM_manipulatortype_find("MANIPULATOR_WT_grab_3d", true);
 +      const wmManipulatorType *wt_dial = WM_manipulatortype_find("MANIPULATOR_WT_dial_3d", true);
 +
 +      man->translate_z = WM_manipulator_new_ptr(wt_arrow, mgroup, NULL);
 +      man->translate_c = WM_manipulator_new_ptr(wt_grab, mgroup, NULL);
 +      man->rotate_c = WM_manipulator_new_ptr(wt_dial, mgroup, NULL);
 +
 +      UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, man->translate_z->color);
 +      UI_GetThemeColor3fv(TH_MANIPULATOR_PRIMARY, man->translate_c->color);
 +      UI_GetThemeColor3fv(TH_MANIPULATOR_SECONDARY, man->rotate_c->color);
 +
 +      RNA_enum_set(man->translate_z->ptr, "draw_style", ED_MANIPULATOR_ARROW_STYLE_NORMAL);
 +      RNA_enum_set(man->translate_c->ptr, "draw_style", ED_MANIPULATOR_GRAB_STYLE_RING_2D);
 +
 +      WM_manipulator_set_flag(man->translate_c, WM_MANIPULATOR_DRAW_VALUE, true);
 +      WM_manipulator_set_flag(man->rotate_c, WM_MANIPULATOR_DRAW_VALUE, true);
 +
 +      {
 +              man->data.context = (bContext *)C;
 +              man->data.op = op;
 +              man->data.prop_plane_co = RNA_struct_find_property(op->ptr, "plane_co");
 +              man->data.prop_plane_no = RNA_struct_find_property(op->ptr, "plane_no");
 +      }
 +
 +      manipulator_mesh_bisect_update_from_op(man);
 +
 +      /* Setup property callbacks */
 +      {
 +              WM_manipulator_target_property_def_func(
 +                      man->translate_z, "offset",
 +                      &(const struct wmManipulatorPropertyFnParams) {
 +                          .value_get_fn = manipulator_bisect_prop_depth_get,
 +                          .value_set_fn = manipulator_bisect_prop_depth_set,
 +                          .range_get_fn = NULL,
 +                          .user_data = NULL,
 +                      });
 +
 +              WM_manipulator_target_property_def_func(
 +                      man->translate_c, "offset",
 +                      &(const struct wmManipulatorPropertyFnParams) {
 +                          .value_get_fn = manipulator_bisect_prop_translate_get,
 +                          .value_set_fn = manipulator_bisect_prop_translate_set,
 +                          .range_get_fn = NULL,
 +                          .user_data = NULL,
 +                      });
 +
 +              WM_manipulator_target_property_def_func(
 +                      man->rotate_c, "offset",
 +                      &(const struct wmManipulatorPropertyFnParams) {
 +                          .value_get_fn = manipulator_bisect_prop_angle_get,
 +                          .value_set_fn = manipulator_bisect_prop_angle_set,
 +                          .range_get_fn = NULL,
 +                          .user_data = NULL,
 +                      });
 +      }
 +}
 +
 +static void manipulator_mesh_bisect_draw_prepare(
 +        const bContext *UNUSED(C), wmManipulatorGroup *mgroup)
 +{
 +      ManipulatorGroup *man = mgroup->customdata;
 +      if (man->data.op->next) {
 +              man->data.op = WM_operator_last_redo((bContext *)man->data.context);
 +      }
 +      manipulator_mesh_bisect_update_from_op(man);
 +}
 +
 +static void MESH_WGT_bisect(struct wmManipulatorGroupType *wgt)
 +{
 +      wgt->name = "Mesh Bisect";
 +      wgt->idname = "MESH_WGT_bisect";
 +
 +      wgt->flag = WM_MANIPULATORGROUPTYPE_3D;
 +
 +      wgt->mmap_params.spaceid = SPACE_VIEW3D;
 +      wgt->mmap_params.regionid = RGN_TYPE_WINDOW;
 +
 +      wgt->poll = manipulator_mesh_bisect_poll;
 +      wgt->setup = manipulator_mesh_bisect_setup;
 +      wgt->draw_prepare = manipulator_mesh_bisect_draw_prepare;
 +}
 +
 +/** \} */
 +
 +#endif  /* USE_MANIPULATOR */