Commit: 71b70b23b36008b4ac03001b7e691a0189b4d158
Author: Campbell Barton
Date: Sat Jun 17 06:38:51 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB71b70b23b36008b4ac03001b7e691a0189b4d158
Manipulator: initial manipulator for spin operator
===================================================================
M source/blender/editors/mesh/editmesh_bisect.c
M source/blender/editors/mesh/editmesh_extrude.c
===================================================================
diff --git a/source/blender/editors/mesh/editmesh_bisect.c
b/source/blender/editors/mesh/editmesh_bisect.c
index 2ad457f1190..24dfc9aa92c 100644
--- a/source/blender/editors/mesh/editmesh_bisect.c
+++ b/source/blender/editors/mesh/editmesh_bisect.c
@@ -197,7 +197,7 @@ static int mesh_bisect_modal(bContext *C, wmOperator *op,
const wmEvent *event)
/* Setup manipulators */
{
View3D *v3d = CTX_wm_view3d(C);
- if (v3d->twtype & V3D_USE_MANIPULATOR) {
+ if (v3d && (v3d->twtype & V3D_USE_MANIPULATOR)) {
WM_manipulator_group_add("MESH_WGT_bisect");
}
}
@@ -371,10 +371,7 @@ void MESH_OT_bisect(struct wmOperatorType *ot)
WM_operator_properties_gesture_straightline(ot, CURSOR_EDIT);
#ifdef USE_MANIPULATOR
- /* Widget for this operator. */
- {
- WM_manipulatorgrouptype_append(MESH_WGT_bisect);
- }
+ WM_manipulatorgrouptype_append(MESH_WGT_bisect);
#endif
}
@@ -516,7 +513,6 @@ static void manipulator_bisect_prop_translate_set(
manipulator_bisect_exec(man);
}
-
/* angle callbacks */
static void manipulator_bisect_prop_angle_get(
const wmManipulator *mpr, wmManipulatorProperty *UNUSED(mpr_prop),
void *UNUSED(user_data),
diff --git a/source/blender/editors/mesh/editmesh_extrude.c
b/source/blender/editors/mesh/editmesh_extrude.c
index 0f1badd93cd..9d87e16fc06 100644
--- a/source/blender/editors/mesh/editmesh_extrude.c
+++ b/source/blender/editors/mesh/editmesh_extrude.c
@@ -45,6 +45,7 @@
#include "RNA_define.h"
#include "RNA_access.h"
+#include "WM_api.h"
#include "WM_types.h"
#include "ED_mesh.h"
@@ -52,8 +53,17 @@
#include "ED_transform.h"
#include "ED_view3d.h"
+#include "MEM_guardedalloc.h"
+
#include "mesh_intern.h" /* own include */
+#define USE_MANIPULATOR
+
+#ifdef USE_MANIPULATOR
+#include "ED_manipulator_library.h"
+#include "ED_util.h"
+#endif
+
static void edbm_extrude_edge_exclude_mirror(
Object *obedit, BMEditMesh *em,
const char hflag,
@@ -743,9 +753,25 @@ static int edbm_spin_invoke(bContext *C, wmOperator *op,
const wmEvent *UNUSED(e
}
}
- return edbm_spin_exec(C, op);
+ int ret = edbm_spin_exec(C, op);
+
+#ifdef USE_MANIPULATOR
+ if (ret & OPERATOR_FINISHED) {
+ /* Setup manipulators */
+ if (v3d && (v3d->twtype & V3D_USE_MANIPULATOR)) {
+ WM_manipulator_group_add("MESH_WGT_spin");
+ }
+ }
+#endif
+
+ return ret;
+
}
+#ifdef USE_MANIPULATOR
+static void MESH_WGT_spin(struct wmManipulatorGroupType *wgt);
+#endif
+
void MESH_OT_spin(wmOperatorType *ot)
{
PropertyRNA *prop;
@@ -774,8 +800,343 @@ void MESH_OT_spin(wmOperatorType *ot)
"Center", "Center in global view space", -1e4f,
1e4f);
RNA_def_float_vector(ot->srna, "axis", 3, NULL, -1.0f, 1.0f, "Axis",
"Axis in global view space", -1.0f, 1.0f);
+#ifdef USE_MANIPULATOR
+ WM_manipulatorgrouptype_append(MESH_WGT_spin);
+#endif
+}
+
+
+#ifdef USE_MANIPULATOR
+
+/* -------------------------------------------------------------------- */
+
+/** \name Spin Manipulator
+ * \{ */
+
+typedef struct ManipulatorSpinGroup {
+ /* 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;
+ /* Spin angle */
+ struct wmManipulator *angle_z;
+
+ /* We could store more vars here! */
+ struct {
+ bContext *context;
+ wmOperator *op;
+ PropertyRNA *prop_axis_co;
+ PropertyRNA *prop_axis_no;
+ PropertyRNA *prop_angle;
+
+ float rotate_axis[3];
+ float rotate_up[3];
+ } data;
+} ManipulatorSpinGroup;
+
+/**
+ * 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_spin_exec(ManipulatorSpinGroup *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_spin_update_from_op(ManipulatorSpinGroup *man)
+{
+ wmOperator *op = man->data.op;
+
+ float plane_co[3], plane_no[3];
+
+ RNA_property_float_get_array(op->ptr, man->data.prop_axis_co, plane_co);
+ RNA_property_float_get_array(op->ptr, man->data.prop_axis_no, plane_no);
+
+ WM_manipulator_set_origin(man->translate_z, plane_co);
+ WM_manipulator_set_origin(man->translate_c, plane_co);
+ WM_manipulator_set_origin(man->rotate_c, plane_co);
+ WM_manipulator_set_origin(man->angle_z, plane_co);
+
+ ED_manipulator_arrow3d_set_direction(man->translate_z, plane_no);
+ ED_manipulator_dial3d_set_up_vector(man->angle_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);
+
+ ED_manipulator_grab3d_set_up_vector(man->translate_c, plane_no);
+ ED_manipulator_dial3d_set_up_vector(man->rotate_c,
man->data.rotate_axis);
+ }
+}
+
+/* depth callbacks */
+static void manipulator_spin_prop_depth_get(
+ const wmManipulator *mpr, wmManipulatorProperty *UNUSED(mpr_prop),
void *UNUSED(user_data),
+ float *value, uint value_len)
+{
+ ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
+ wmOperator *op = man->data.op;
+
+ BLI_assert(value_len == 1);
+
+ float plane_co[3], plane_no[3];
+ RNA_property_float_get_array(op->ptr, man->data.prop_axis_co, plane_co);
+ RNA_property_float_get_array(op->ptr, man->data.prop_axis_no, plane_no);
+
+ value[0] = dot_v3v3(plane_no, plane_co) - dot_v3v3(plane_no,
mpr->origin);
+}
+
+static void manipulator_spin_prop_depth_set(
+ const wmManipulator *mpr, wmManipulatorProperty *UNUSED(mpr_prop),
void *UNUSED(user_data),
+ const float *value, uint value_len)
+{
+ ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
+ wmOperator *op = man->data.op;
+
+ BLI_assert(value_len == 1);
+
+ float plane_co[3], plane[4];
+ RNA_property_float_get_array(op->ptr, man->data.prop_axis_co, plane_co);
+ RNA_property_float_get_array(op->ptr, man->data.prop_axis_no, plane);
+ normalize_v3(plane);
+
+ plane[3] = -value[0] - dot_v3v3(plane, mpr->origin);
+
+ /* 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_axis_co, plane_co);
+
+ manipulator_spin_exec(man);
+}
+
+/* translate callbacks */
+static void manipulator_spin_prop_translate_get(
+ const wmManipulator *mpr, wmManipulatorProperty *UNUSED(mpr_prop),
void *UNUSED(user_data),
+ float *value, uint value_len)
+{
+ ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
+ wmOperator *op = man->data.op;
+
+ BLI_assert(value_len == 3);
+ RNA_property_float_get_array(op->ptr, man->data.prop_axis_co, value);
+}
+
+static void manipulator_spin_prop_translate_set(
+ const wmManipulator *mpr, wmManipulatorProperty *UNUSED(mpr_prop),
void *UNUSED(user_data),
+ const float *value, uint value_len)
+{
+ ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
+ wmOperator *op = man->data.op;
+
+ BLI_assert(value_len == 3);
+ RNA_property_float_set_array(op->ptr, man->data.prop_axis_co, value);
+
+ manipulator_spin_exec(man);
+}
+
+/* angle callbacks */
+static void manipulator_spin_prop_axis_angle_get(
+ const wmManipulator *mpr, wmManipulatorProperty *UNUSED(mpr_prop),
void *UNUSED(user_data),
+ float *value, uint value_len)
+{
+ ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
+ wmOperator *op = man->data.op;
+ BLI_assert(value_len == 1);
+
+ float plane_no[4];
+ RNA_property_float_get_array(op->ptr, man->data.prop_axis_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_spin_prop_axis_angle_set(
+ const wmManipulator *mpr, wmManipulatorProperty *UNUSED(mpr_prop),
void *UNUSED(user_data),
+ const float *value, uint value_len)
+{
+ ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
+ wmOperator *op = man->data.op;
+ BLI_assert(value_len == 1);
+
+ float plane_no[4];
+ RNA_property_float_get_array(op->ptr, man->data.prop_axis_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_axis_no, plane_no);
+
+ manipulator_spin_exec(man);
+ }
+ }
+}
+
+/* angle callbacks */
+static void manipulator_spin_prop_angle_get(
+ const wmManipulator *mpr, wmManipulatorProperty *UNUSED(mpr_prop),
void *UNUSED(user_data),
+ float *value, uint value_len)
+{
+ ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
+ wmOperator *op = man->data.op;
+ BLI_assert(value_len == 1);
+ value[0] = RNA_property_float_get(op->ptr, man->data.prop_angle);
+}
+
+static void manipulator_spin_prop_angle_set(
+ const wmManipulator *mpr, wmManipulatorProperty *UNUSED(mpr_prop),
void *UNUSED(user_data),
+ const float *value, uint value_len)
+{
+ ManipulatorSpinGroup *man = mpr->parent_mgroup->customdata;
+ wmOperator *op = man->data.op;
+ BLI_assert(value_len == 1);
+ RNA_property_float_set(op->ptr, man->data.p
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
