Commit: 33ae2b6c70b0f140502dc593e7882c687de2d1f4
Author: Campbell Barton
Date: Wed Nov 20 12:25:07 2013 +1100
http://developer.blender.org/rB33ae2b6c70b0f140502dc593e7882c687de2d1f4
Transform: Warp tool (rewritten)
* Can optionally warp a segment (sets min/max default so it acts as old warp
did).
* Can rotate the warp axis (old warp tool was limited to horizontal).
===================================================================
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/editors/object/CMakeLists.txt
M source/blender/editors/object/object_intern.h
M source/blender/editors/object/object_ops.c
A source/blender/editors/object/object_warp.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_view3d.py
b/release/scripts/startup/bl_ui/space_view3d.py
index 4c316c9..74d274a 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -181,6 +181,7 @@ class VIEW3D_MT_transform_base(Menu):
layout.operator("transform.shear", text="Shear")
layout.operator("transform.bend", text="Bend")
layout.operator("transform.push_pull", text="Push/Pull")
+ layout.operator("object.vertex_warp", text="Warp")
# Generic transform menu - geometry types
diff --git a/source/blender/editors/object/CMakeLists.txt
b/source/blender/editors/object/CMakeLists.txt
index 3e7aeba..143a33c 100644
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@ -53,6 +53,7 @@ set(SRC
object_select.c
object_shapekey.c
object_transform.c
+ object_warp.c
object_vgroup.c
object_intern.h
diff --git a/source/blender/editors/object/object_intern.h
b/source/blender/editors/object/object_intern.h
index 313ac1d..bfed1f2 100644
--- a/source/blender/editors/object/object_intern.h
+++ b/source/blender/editors/object/object_intern.h
@@ -234,6 +234,9 @@ void OBJECT_OT_vertex_weight_set_active(struct
wmOperatorType *ot);
void OBJECT_OT_vertex_weight_normalize_active_vertex(struct wmOperatorType
*ot);
void OBJECT_OT_vertex_weight_copy(struct wmOperatorType *ot);
+/* object_warp.c */
+void OBJECT_OT_vertex_warp(struct wmOperatorType *ot);
+
/* object_shapekey.c */
void OBJECT_OT_shape_key_add(struct wmOperatorType *ot);
void OBJECT_OT_shape_key_remove(struct wmOperatorType *ot);
diff --git a/source/blender/editors/object/object_ops.c
b/source/blender/editors/object/object_ops.c
index f5c2bcb..6d760ac 100644
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -203,6 +203,8 @@ void ED_operatortypes_object(void)
WM_operatortype_append(OBJECT_OT_vertex_weight_normalize_active_vertex);
WM_operatortype_append(OBJECT_OT_vertex_weight_copy);
+ WM_operatortype_append(OBJECT_OT_vertex_warp);
+
WM_operatortype_append(OBJECT_OT_game_property_new);
WM_operatortype_append(OBJECT_OT_game_property_remove);
WM_operatortype_append(OBJECT_OT_game_property_copy);
diff --git a/source/blender/editors/object/object_warp.c
b/source/blender/editors/object/object_warp.c
new file mode 100644
index 0000000..06b59a8
--- /dev/null
+++ b/source/blender/editors/object/object_warp.c
@@ -0,0 +1,325 @@
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2013 by Blender Foundation
+ * All rights reserved.
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file blender/editors/object/object_warp.c
+ * \ingroup edobj
+ */
+
+#include "DNA_object_types.h"
+#include "DNA_scene_types.h"
+#include "DNA_view3d_types.h"
+
+#include "BLI_math.h"
+
+#include "BKE_utildefines.h"
+#include "BKE_context.h"
+
+#include "RNA_access.h"
+#include "RNA_define.h"
+
+#include "WM_api.h"
+#include "WM_types.h"
+
+#include "ED_view3d.h"
+#include "ED_transverts.h"
+
+#include "object_intern.h"
+
+
+static void object_warp_calc_view_matrix(float r_mat_view[4][4], float
r_center_view[3],
+ Object *obedit, float viewmat[4][4],
const float center[3],
+ const float offset_angle)
+{
+ float mat_offset[4][4];
+ float viewmat_roll[4][4];
+
+ /* apply the rotation offset by rolling the view */
+ unit_m4(mat_offset);
+ rotate_m4(mat_offset, 'Z', offset_angle);
+ mul_m4_m4m4(viewmat_roll, mat_offset, viewmat);
+
+ /* apply the view and the object matrix */
+ mul_m4_m4m4(r_mat_view, viewmat_roll, obedit->obmat);
+
+ /* get the view-space cursor */
+ mul_v3_m4v3(r_center_view, viewmat_roll, center);
+}
+
+
+static void object_warp_transverts_minmax_x(TransVertStore *tvs,
+ float mat_view[4][4], const float
center_view[3],
+ float *r_min, float *r_max)
+{
+ /* no need to apply translation and cursor offset for every vertex,
delay this */
+ const float x_ofs = (mat_view[3][0] - center_view[0]);
+ float min = FLT_MAX, max = -FLT_MAX;
+
+ TransVert *tv;
+ int i;
+
+
+ tv = tvs->transverts;
+ for (i = 0; i < tvs->transverts_tot; i++, tv++) {
+ float val;
+
+ /* convert objectspace->viewspace */
+ val = dot_m4_v3_row_x(mat_view, tv->loc);
+
+ min = min_ff(min, val);
+ max = max_ff(max, val);
+ }
+
+ *r_min = min + x_ofs;
+ *r_max = max + x_ofs;
+}
+
+
+static void object_warp_transverts(TransVertStore *tvs,
+ float mat_view[4][4], const float
center_view[3],
+ const float angle_, const float min, const
float max)
+{
+ TransVert *tv;
+ int i;
+ const float angle = -angle_;
+ /* cache vars for tiny speedup */
+#if 1
+ const float range = max - min;
+ const float range_inv = 1.0f / range;
+ const float min_ofs = min + (0.5f * range);
+#endif
+
+ float dir_min[2], dir_max[2];
+ float imat_view[4][4];
+
+
+ invert_m4_m4(imat_view, mat_view);
+
+ /* calculate the direction vectors outside min/max range */
+ {
+ const float phi = angle * 0.5f;
+
+ dir_max[0] = cosf(phi);
+ dir_max[1] = sinf(phi);
+
+ dir_min[0] = -dir_max[0];
+ dir_min[1] = dir_max[1];
+ }
+
+
+ tv = tvs->transverts;
+ for (i = 0; i < tvs->transverts_tot; i++, tv++) {
+ float co[3], co_add[2];
+ float val, phi;
+
+ /* convert objectspace->viewspace */
+ mul_v3_m4v3(co, mat_view, tv->loc);
+ sub_v2_v2(co, center_view);
+
+ val = co[0];
+ /* is overwritten later anyway */
+ // co[0] = 0.0f;
+
+ if (val < min) {
+ mul_v2_v2fl(co_add, dir_min, min - val);
+ val = min;
+ }
+ else if (val > max) {
+ mul_v2_v2fl(co_add, dir_max, val - max);
+ val = max;
+ }
+ else {
+ zero_v2(co_add);
+ }
+
+ /* map from x axis to (-0.5 - 0.5) */
+#if 0
+ val = ((val - min) / (max - min)) - 0.5f;
+#else
+ val = (val - min_ofs) * range_inv;
+#endif
+
+ /* convert the x axis into a rotation */
+ phi = val * angle;
+
+ co[0] = -sinf(phi) * co[1];
+ co[1] = cosf(phi) * co[1];
+
+ add_v2_v2(co, co_add);
+
+ /* convert viewspace->objectspace */
+ add_v2_v2(co, center_view);
+ mul_v3_m4v3(tv->loc, imat_view, co);
+ }
+}
+
+static int object_warp_verts_exec(bContext *C, wmOperator *op)
+{
+ const float warp_angle = RNA_float_get(op->ptr, "warp_angle");
+ const float offset_angle = RNA_float_get(op->ptr, "offset_angle");
+
+ TransVertStore tvs = {NULL};
+ Object *obedit = CTX_data_edit_object(C);
+
+ /* typically from 'rv3d' and 3d cursor */
+ float viewmat[4][4];
+ float center[3];
+
+ /* 'viewmat' relative vars */
+ float mat_view[4][4];
+ float center_view[3];
+
+ float min, max;
+
+
+ ED_transverts_create_from_obedit(&tvs, obedit, TM_ALL_JOINTS |
TM_SKIP_HANDLES);
+ if (tvs.transverts == 0) {
+ return OPERATOR_CANCELLED;
+ }
+
+
+ /* get viewmatrix */
+ {
+ PropertyRNA *prop_viewmat = RNA_struct_find_property(op->ptr,
"viewmat");
+ if (RNA_property_is_set(op->ptr, prop_viewmat)) {
+ RNA_property_float_get_array(op->ptr, prop_viewmat,
(float *)viewmat);
+ }
+ else {
+ RegionView3D *rv3d = CTX_wm_region_view3d(C);
+
+ if (rv3d) {
+ copy_m4_m4(viewmat, rv3d->viewmat);
+ }
+ else {
+ unit_m4(viewmat);
+ }
+
+ RNA_property_float_set_array(op->ptr, prop_viewmat,
(float *)viewmat);
+ }
+ }
+
+
+ /* get center */
+ {
+ PropertyRNA *prop_center = RNA_struct_find_property(op->ptr,
"center");
+ if (RNA_property_is_set(op->ptr, prop_center)) {
+ RNA_property_float_get_array(op->ptr, prop_center,
center);
+ }
+ else {
+ Scene *scene = CTX_data_scene(C);
+ View3D *v3d = CTX_wm_view3d(C);
+ const float *cursor;
+
+ cursor = ED_view3d_cursor3d_get(scene, v3d);
+ copy_v3_v3(center, cursor);
+
+ RNA_property_float_set_array(op->ptr, prop_center,
center);
+ }
+ }
+
+
+ object_warp_calc_view_matrix(mat_view, center_view, obedit, viewmat,
center, offset_angle);
+
+
+ /* get minmax */
+ {
+ PropertyRNA *prop_min = RNA_struct_find_property(op->ptr,
"min");
+ PropertyRNA *prop_max = RNA_struct_find_property(op->ptr,
"max");
+
+ if (RNA_property_is_set(op->ptr, prop_min) ||
+ RNA_property_is_set(op->ptr, prop_max))
+ {
+ min = RNA_property_float_get(op->ptr, prop_min);
+ max = RNA_property_float_get(op->ptr, prop_max);
+ }
+ else {
+ /* handy to set the bounds of the mesh */
+ object_warp_transverts_minmax_x(&tvs, mat_view,
center_view, &min, &max);
+
+ RNA_property_float_set(op->ptr, prop_min, min);
+ RNA_property_float_set(op->ptr, prop_max, max);
+ }
+
+ if (min > max) {
+ SWAP(float, min, max);
+ }
+ }
+
+ if (min != max) {
+ object_warp_transverts(&tvs, mat_view, center_view, warp_angle,
min, max);
+ }
+
+ ED_transverts_update_obedit(&tvs, obedit);
+ ED_transverts_free(&tvs);
+
+ WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, obedit);
+
+ return OPERATOR_FINISHED;
+}
+
+static int object_warp_verts_poll(bContext *C)
+{
+ Object *obedit = CTX_data_edit_object(C);
+ if (obedit) {
+ if (ED_transverts_check_obedit(obedit)) {
+ return true;
+ }
+ }
+ return false;
+}
+
+
+void OBJECT_OT_vertex_warp(struct wmOperatorType *ot)
+{
+ PropertyRNA *prop;
+
+ /* identifiers */
+ ot->name = "Warp";
+ ot->description = "Warp vertices around the cursor";
+ ot->idname = "OBJECT_OT_vertex_warp";
+
+ /* api callbacks */
+ ot->exec = object_warp_verts_exec;
+ ot->poll = object_warp_verts_poll;
+
+ /* f
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
