[Bf-blender-cvs] [80de04e3f16] transform_refactor: Initial commit
mano-wii
noreply at git.blender.org
Sat Sep 14 23:30:59 CEST 2019
Commit: 80de04e3f16a9606193f52d11b60cdc5d88922bb
Author: mano-wii
Date: Sat Sep 14 18:28:13 2019 -0300
Branches: transform_refactor
https://developer.blender.org/rB80de04e3f16a9606193f52d11b60cdc5d88922bb
Initial commit
===================================================================
M source/blender/editors/transform/CMakeLists.txt
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform.h
R100 source/blender/editors/transform/transform_convert.c source/blender/editors/transform/transform_convert/transform_convert.c
R100 source/blender/editors/transform/transform_convert_action.c source/blender/editors/transform/transform_convert/transform_convert_action.c
R100 source/blender/editors/transform/transform_convert_armature.c source/blender/editors/transform/transform_convert/transform_convert_armature.c
R100 source/blender/editors/transform/transform_convert_cursor.c source/blender/editors/transform/transform_convert/transform_convert_cursor.c
R100 source/blender/editors/transform/transform_convert_curve.c source/blender/editors/transform/transform_convert/transform_convert_curve.c
R100 source/blender/editors/transform/transform_convert_gpencil.c source/blender/editors/transform/transform_convert/transform_convert_gpencil.c
R100 source/blender/editors/transform/transform_convert_graph.c source/blender/editors/transform/transform_convert/transform_convert_graph.c
R100 source/blender/editors/transform/transform_convert_lattice.c source/blender/editors/transform/transform_convert/transform_convert_lattice.c
R100 source/blender/editors/transform/transform_convert_mask.c source/blender/editors/transform/transform_convert/transform_convert_mask.c
R100 source/blender/editors/transform/transform_convert_mball.c source/blender/editors/transform/transform_convert/transform_convert_mball.c
R100 source/blender/editors/transform/transform_convert_mesh.c source/blender/editors/transform/transform_convert/transform_convert_mesh.c
R100 source/blender/editors/transform/transform_convert_nla.c source/blender/editors/transform/transform_convert/transform_convert_nla.c
R100 source/blender/editors/transform/transform_convert_node.c source/blender/editors/transform/transform_convert/transform_convert_node.c
R100 source/blender/editors/transform/transform_convert_object.c source/blender/editors/transform/transform_convert/transform_convert_object.c
R100 source/blender/editors/transform/transform_convert_paintcurve.c source/blender/editors/transform/transform_convert/transform_convert_paintcurve.c
R100 source/blender/editors/transform/transform_convert_particle.c source/blender/editors/transform/transform_convert/transform_convert_particle.c
R100 source/blender/editors/transform/transform_convert_sculpt.c source/blender/editors/transform/transform_convert/transform_convert_sculpt.c
R100 source/blender/editors/transform/transform_convert_sequencer.c source/blender/editors/transform/transform_convert/transform_convert_sequencer.c
R100 source/blender/editors/transform/transform_convert_tracking.c source/blender/editors/transform/transform_convert/transform_convert_tracking.c
R100 source/blender/editors/transform/transform_gizmo_2d.c source/blender/editors/transform/transform_gizmo/transform_gizmo_2d.c
R100 source/blender/editors/transform/transform_gizmo_3d.c source/blender/editors/transform/transform_gizmo/transform_gizmo_3d.c
R100 source/blender/editors/transform/transform_gizmo_extrude_3d.c source/blender/editors/transform/transform_gizmo/transform_gizmo_extrude_3d.c
A source/blender/editors/transform/transform_op.h
D source/blender/editors/transform/transform_ops.c
A source/blender/editors/transform/transform_ops/transform_op.c
A source/blender/editors/transform/transform_ops/transform_op_mode.c
A source/blender/editors/transform/transform_ops/transform_op_mode_align.c
A source/blender/editors/transform/transform_ops/transform_op_mode_baketime.c
A source/blender/editors/transform/transform_ops/transform_op_mode_bend.c
A source/blender/editors/transform/transform_ops/transform_op_mode_boneenvelope.c
A source/blender/editors/transform/transform_ops/transform_op_mode_boneroll.c
A source/blender/editors/transform/transform_ops/transform_op_mode_bonesize.c
A source/blender/editors/transform/transform_ops/transform_op_mode_curveshrinkfatten.c
A source/blender/editors/transform/transform_ops/transform_op_mode_edge_bevelweight.c
A source/blender/editors/transform/transform_ops/transform_op_mode_edge_crease.c
A source/blender/editors/transform/transform_ops/transform_op_mode_edge_rotate_normal.c
A source/blender/editors/transform/transform_ops/transform_op_mode_edge_seq_slide.c
A source/blender/editors/transform/transform_ops/transform_op_mode_edge_slide.c
A source/blender/editors/transform/transform_ops/transform_op_mode_gpopacity.c
A source/blender/editors/transform/transform_ops/transform_op_mode_gpshrinkfatten.c
A source/blender/editors/transform/transform_ops/transform_op_mode_maskshrinkfatten.c
A source/blender/editors/transform/transform_ops/transform_op_mode_mirror.c
A source/blender/editors/transform/transform_ops/transform_op_mode_push_pull.c
A source/blender/editors/transform/transform_ops/transform_op_mode_resize.c
A source/blender/editors/transform/transform_ops/transform_op_mode_rotate.c
A source/blender/editors/transform/transform_ops/transform_op_mode_shear.c
A source/blender/editors/transform/transform_ops/transform_op_mode_shrink_fatten.c
A source/blender/editors/transform/transform_ops/transform_op_mode_skin_resize.c
A source/blender/editors/transform/transform_ops/transform_op_mode_tilt.c
A source/blender/editors/transform/transform_ops/transform_op_mode_timescale.c
A source/blender/editors/transform/transform_ops/transform_op_mode_timeslide.c
A source/blender/editors/transform/transform_ops/transform_op_mode_timetranslate.c
A source/blender/editors/transform/transform_ops/transform_op_mode_tosphere.c
A source/blender/editors/transform/transform_ops/transform_op_mode_trackball.c
A source/blender/editors/transform/transform_ops/transform_op_mode_translate.c
A source/blender/editors/transform/transform_ops/transform_op_mode_vert_slide.c
A source/blender/editors/transform/transform_ops/transform_op_orientation.c
R100 source/blender/editors/transform/transform_snap.c source/blender/editors/transform/transform_snap/transform_snap.c
R100 source/blender/editors/transform/transform_snap_object.c source/blender/editors/transform/transform_snap/transform_snap_object.c
===================================================================
diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt
index e3ff8b92081..98756c08fc9 100644
--- a/source/blender/editors/transform/CMakeLists.txt
+++ b/source/blender/editors/transform/CMakeLists.txt
@@ -22,6 +22,7 @@ set(INC
../../blenlib
../../blentranslation
../../bmesh
+ ../../editors/transform
../../gpu
../../ikplugin
../../makesdna
@@ -40,37 +41,73 @@ set(INC_SYS
set(SRC
transform.c
transform_constraints.c
- transform_convert.c
- transform_convert_action.c
- transform_convert_armature.c
- transform_convert_cursor.c
- transform_convert_curve.c
- transform_convert_gpencil.c
- transform_convert_graph.c
- transform_convert_lattice.c
- transform_convert_mask.c
- transform_convert_mball.c
- transform_convert_mesh.c
- transform_convert_nla.c
- transform_convert_node.c
- transform_convert_object.c
- transform_convert_paintcurve.c
- transform_convert_particle.c
- transform_convert_sculpt.c
- transform_convert_sequencer.c
- transform_convert_tracking.c
transform_generics.c
- transform_gizmo_2d.c
- transform_gizmo_3d.c
- transform_gizmo_extrude_3d.c
+ transform_gizmo/transform_gizmo_2d.c
+ transform_gizmo/transform_gizmo_3d.c
+ transform_gizmo/transform_gizmo_extrude_3d.c
transform_input.c
- transform_ops.c
transform_orientations.c
- transform_snap.c
- transform_snap_object.c
+
+ transform_convert/transform_convert.c
+ transform_convert/transform_convert_action.c
+ transform_convert/transform_convert_armature.c
+ transform_convert/transform_convert_cursor.c
+ transform_convert/transform_convert_curve.c
+ transform_convert/transform_convert_gpencil.c
+ transform_convert/transform_convert_graph.c
+ transform_convert/transform_convert_lattice.c
+ transform_convert/transform_convert_mask.c
+ transform_convert/transform_convert_mball.c
+ transform_convert/transform_convert_mesh.c
+ transform_convert/transform_convert_nla.c
+ transform_convert/transform_convert_node.c
+ transform_convert/transform_convert_object.c
+ transform_convert/transform_convert_paintcurve.c
+ transform_convert/transform_convert_particle.c
+ transform_convert/transform_convert_sculpt.c
+ transform_convert/transform_convert_sequencer.c
+ transform_convert/transform_convert_tracking.c
+
+ transform_ops/transform_op.c
+ transform_ops/transform_op_mode.c
+ transform_ops/transform_op_mode_align.c
+ transform_ops/transform_op_mode_baketime.c
+ transform_ops/transform_op_mode_bend.c
+ transform_ops/transform_op_mode_boneenvelope.c
+ transform_ops/transform_op_mode_boneroll.c
+ transform_ops/transform_op_mode_bonesize.c
+ transform_ops/transform_op_mode_curveshrinkfatten.c
+ transform_ops/transform_op_mode_edge_bevelweight.c
+ transform_ops/transform_op_mode_edge_crease.c
+ transform_ops/transform_op_mode_edge_rotate_normal.c
+ transform_ops/transform_op_mode_edge_seq_slide.c
+ transform_ops/transform_op_mode_edge_slide.c
+ transform_ops/transform_op_mode_gpopacity.c
+ transform_ops/transform_op_mode_gpshrinkfatten.c
+ transform_ops/transform_op_mode_maskshrinkfatten.c
+ transform_ops/transform_op_mode_mirror.c
+ transform_ops/transform_op_mode_push_pull.c
+ transform_ops/transform_op_mode_resize.c
+ transform_ops/transform_op_mode_rotate.c
+ transform_ops/transform_op_mode_shear.c
+ transform_ops/transform_op_mode_shrink_fatten.c
+ transform_ops/transform_op_mode_skin_resize.c
+ transform_ops/transform_op_mode_tilt.c
+ transform_ops/transform_op_mode_timescale.c
+ transform_ops/transform_op_mode_timeslide.c
+ transform_ops/transform_op_mode_timetranslate.c
+ transform_ops/transform_op_mode_tosphere.c
+ transform_ops/transform_op_mode_trackball.c
+ transform_ops/transform_op_mode_translate.c
+ transform_ops/transform_op_mode_vert_slide.c
+ transform_ops/transform_op_orientation.c
+
+ transform_snap/transform_snap.c
+ transform_snap/transform_snap_object.c
transform.h
transform_convert.h
+ transform_op.h
)
set(LIB
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index a95c7cf7456..362dc0bbefc 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -101,120 +101,7 @@
* and being able to set it to zero is handy. */
// #define USE_NUM_NO_ZERO
-static void drawTransformApply(const struct bContext *C, ARegion *ar, void *arg);
-static void doEdgeSlide(TransInfo *t, float perc);
-static void doVertSlide(TransInfo *t, float perc);
-
-static void drawEdgeSlide(TransInfo *t);
-static void drawVertSlide(TransInfo *t);
-static void postInputRotation(TransInfo *t, float values[3]);
-
-static void ElementRotation(
- TransInfo *t, TransDataContainer *tc, TransData *td, float mat[3][3], const short around);
-static void initSnapSpatial(TransInfo *t, float r_snap[3]);
-
-static void storeCustomLNorValue(TransDataContainer *t, BMesh *bm);
-
-/* Transform Callbacks */
-static void initBend(TransInfo *t);
-static eRedrawFlag handleEventBend(TransInfo *t, const struct wmEvent *event);
-static void Bend(TransInfo *t, const int mval[2]);
-
-static void initShear(TransInfo *t);
-static eRedrawFlag handleEventShear(TransInfo *t, const struct wmEvent *event);
-static void applyShear(TransInfo *t, const int mval[2]);
-
-static void initResize(TransInfo *t);
-static void applyResize(TransInfo *t, const int mval[2]);
-
-static void initSkinResize(TransInfo *t);
-static void applySkinResize(TransInfo *t, const int mval[2]);
-
-static void initTranslation(TransInfo *t);
-static void applyTranslation(TransInfo *t, const int mval[2]);
-
-static void initToSphere(TransInfo *t);
-static void applyToSphere(TransInfo *t, const int mval[2]);
-
-static void initRotation(TransInfo *t);
-static void applyRotation(TransInfo *t, const int mval[2]);
-
-static void initNormalRotation(TransInfo *t);
-static void applyNormalRotation(TransInfo *t, const int mval[2]);
-
-static void initShrinkFatten(TransInfo *t);
-static void applyShrinkFatten(TransInfo *t, const int mval[2]);
-
-static void initTilt(TransInfo *t);
-static void applyTilt(TransInfo *t, const int mval[2]);
-
-static void initCurveShrinkFatten(TransInfo *t);
-static void applyCurveShrinkFatten(TransInfo *t, const int mval[2]);
-
-static void initMaskShrinkFatten(TransInfo *t);
-static void applyMaskShrinkFatten(TransInfo *t, const int mval[2]);
-
-static void initGPShrinkFatten(TransInfo *t);
-static void applyGPShrinkFatten(TransInfo *t, const int mval[2]);
-
-static void initTrackball(TransInfo *t);
-static void applyTrackball(TransInfo *t, const int mval[2]);
-
-static void initPushPull(TransInfo *t);
-static void applyPushPull(TransInfo *t, const int mval[2]);
-
-static void initBevelWeight(TransInfo *t);
-static void applyBevelWeight(TransInfo *t, const int mval[2]);
-
-static void initCrease(TransInfo *t);
-static void applyCrease(TransInfo *t, const int mval[2]);
-
-static void initBoneSize(TransInfo *t);
-static void applyBoneSize(TransInfo *t, const int mval[2]);
-
-static void initBoneEnvelope(TransInfo *t);
-static void applyBoneEnvelope(TransInfo *t, const int mval[2]);
-
-static void initBoneRoll(TransInfo *t);
-static void applyBoneRoll(TransInfo *t, const int mval[2]);
-
-static void initEdgeSlide_ex(
- TransInfo *t, bool use_double_side, bool use_even, bool flipped, bool use_clamp);
-static void initEdgeSlide(TransInfo *t);
-static eRedrawFlag handleEventEdgeSlide(TransInfo *t, const struct wmEvent *event);
-static void applyEdgeSlide(TransInfo *t, const int mval[2]);
-
-static void initVertSlide_ex(TransInfo *t, bool use_even, bool flipped, bool use_clamp);
-static void initVertSlide(TransInfo *t);
-static eRedrawFlag handleEventVertSlide(TransInfo *t, const struct wmEvent *event);
-static void applyVertSlide(TransInfo *t, const int mval[2]);
-
-static void initTimeTranslate(TransInfo *t);
-static void applyTimeTranslate(TransInfo *t, const int mval[2]);
-
-static void initTimeSlide(TransInfo *t);
-static void applyTimeSlide(TransInfo *t, const int mval[2]);
-
-static void initTimeScale(TransInfo *t);
-static void applyTimeScale(TransInfo *t, const int mval[2]);
-
-static void initBakeTime(TransInfo *t);
-static void applyBakeTime(TransInfo *t, const int mval[2]);
-
-static void initMirror(TransInfo *t);
-static void applyMirror(TransInfo *t, const int mval[2]);
-
-static void initAlign(TransInfo *t);
-static void applyAlign(TransInfo *t, const int mval[2]);
-
-static void initSeqSlide(TransInfo *t);
-static void applySeqSlide(TransInfo *t, const int mval[2]);
-
-static void initGPOpacity(TransInfo *t);
-static void applyGPOpacity(TransInfo *t, const int mval[2]);
-/* end transform callbacks */
-
-static bool transdata_check_local_center(TransInfo *t, short around)
+bool transdata_check_local_center(TransInfo *t, short around)
{
return ((around == V3D_AROUND_LOCAL_ORIGINS) &&
((t->flag & (T_OBJECT | T_POSE)) ||
@@ -522,31 +409,6 @@ void projectFloatView(TransInfo *t, const float vec[3], float adr[2])
projectFloatViewEx(t, vec, adr, V3D_PROJ_TEST_NOP);
}
-void applyAspectRatio(TransInfo *t, float vec[2])
-{
- if ((t->spacetype == SPACE_IMAGE) && (t->mode == TFM_TRANSLATION) &&
- !(t->options & CTX_PAINT_CURVE)) {
- SpaceImage *sima = t->sa->spacedata.first;
-
- if ((sima->flag & SI_COORDFLOATS) == 0) {
- int width, height;
- ED_space_image_get_size(sima, &width, &height);
-
- vec[0] *= width;
- vec[1] *= height;
- }
-
- vec[0] /= t->aspect[0];
- vec[1] /= t->aspect[1];
- }
- else if ((t->spacetype == SPACE_CLIP) && (t->mode == TFM_TRANSLATION)) {
- if (t->options & (CTX_MOVIECLIP | CTX_MASK)) {
- vec[0] /= t->aspect[0];
- vec[1] /= t->aspect[1];
- }
- }
-}
-
void removeAspectRatio(TransInfo *t, float vec[2])
{
if ((t->spacetype == SPACE_IMAGE) && (t->mode == TFM_TRANSLATION)) {
@@ -571,8871 +433,59 @@ void removeAspectRatio(TransInfo *t, float vec[2])
}
}
-static void viewRedrawForce(const bContext *C, TransInfo *t)
-{
- if (t->options & CTX_GPENCIL_STROKES) {
- bGPdata *gpd = ED_gpencil_data_get_active(C);
- if (gpd) {
- DEG_id_tag_update(&gpd->id, ID_
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list