Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source/blender/editors/object/object_data_transform.c
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/object/object_data_transform.c')
-rw-r--r--source/blender/editors/object/object_data_transform.c213
1 files changed, 211 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_data_transform.c b/source/blender/editors/object/object_data_transform.c
index 54fd1fe6671..8ea35c7a92c 100644
--- a/source/blender/editors/object/object_data_transform.c
+++ b/source/blender/editors/object/object_data_transform.c
@@ -33,6 +33,7 @@
#include "DNA_anim_types.h"
#include "DNA_armature_types.h"
#include "DNA_collection_types.h"
+#include "DNA_gpencil_types.h"
#include "DNA_lattice_types.h"
#include "DNA_mesh_types.h"
#include "DNA_meta_types.h"
@@ -46,6 +47,8 @@
#include "BKE_armature.h"
#include "BKE_curve.h"
#include "BKE_editmesh.h"
+#include "BKE_gpencil_geom.h"
+#include "BKE_key.h"
#include "BKE_lattice.h"
#include "BKE_mball.h"
#include "BKE_mesh.h"
@@ -280,16 +283,22 @@ struct XFormObjectData {
struct XFormObjectData_Mesh {
struct XFormObjectData base;
+ /* Optional data for shape keys. */
+ void *key_data;
float elem_array[0][3];
};
struct XFormObjectData_Lattice {
struct XFormObjectData base;
+ /* Optional data for shape keys. */
+ void *key_data;
float elem_array[0][3];
};
struct XFormObjectData_Curve {
struct XFormObjectData base;
+ /* Optional data for shape keys. */
+ void *key_data;
float elem_array[0][3];
};
@@ -303,54 +312,109 @@ struct XFormObjectData_MetaBall {
struct ElemData_MetaBall elem_array[0];
};
+struct XFormObjectData_GPencil {
+ struct XFormObjectData base;
+ struct GPencilPointCoordinates elem_array[0];
+};
+
struct XFormObjectData *ED_object_data_xform_create_ex(ID *id, bool is_edit_mode)
{
struct XFormObjectData *xod_base = NULL;
if (id == NULL) {
return xod_base;
}
+
switch (GS(id->name)) {
case ID_ME: {
Mesh *me = (Mesh *)id;
+ struct Key *key = me->key;
+ const int key_index = -1;
+
if (is_edit_mode) {
BMesh *bm = me->edit_mesh->bm;
+ /* Always operate on all keys for the moment. */
+ // key_index = bm->shapenr - 1;
const int elem_array_len = bm->totvert;
struct XFormObjectData_Mesh *xod = MEM_mallocN(
sizeof(*xod) + (sizeof(*xod->elem_array) * elem_array_len), __func__);
+ memset(xod, 0x0, sizeof(*xod));
+
BM_mesh_vert_coords_get(bm, xod->elem_array);
xod_base = &xod->base;
+
+ if (key != NULL) {
+ const size_t key_size = BKE_keyblock_element_calc_size_from_shape(key, key_index);
+ if (key_size) {
+ xod->key_data = MEM_mallocN(key_size, __func__);
+ BKE_keyblock_data_get_from_shape(key, xod->key_data, key_index);
+ }
+ }
}
else {
const int elem_array_len = me->totvert;
struct XFormObjectData_Mesh *xod = MEM_mallocN(
sizeof(*xod) + (sizeof(*xod->elem_array) * elem_array_len), __func__);
+ memset(xod, 0x0, sizeof(*xod));
+
BKE_mesh_vert_coords_get(me, xod->elem_array);
xod_base = &xod->base;
+
+ if (key != NULL) {
+ const size_t key_size = BKE_keyblock_element_calc_size_from_shape(key, key_index);
+ if (key_size) {
+ xod->key_data = MEM_mallocN(key_size, __func__);
+ BKE_keyblock_data_get_from_shape(key, xod->key_data, key_index);
+ }
+ }
}
break;
}
case ID_LT: {
Lattice *lt_orig = (Lattice *)id;
Lattice *lt = is_edit_mode ? lt_orig->editlatt->latt : lt_orig;
+ struct Key *key = lt->key;
+ const int key_index = -1;
+
+ if (is_edit_mode) {
+ /* Always operate on all keys for the moment. */
+ // key_index = lt_orig->editlatt->shapenr - 1;
+ }
+
const int elem_array_len = lt->pntsu * lt->pntsv * lt->pntsw;
struct XFormObjectData_Lattice *xod = MEM_mallocN(
sizeof(*xod) + (sizeof(*xod->elem_array) * elem_array_len), __func__);
+ memset(xod, 0x0, sizeof(*xod));
+
BKE_lattice_vert_coords_get(lt, xod->elem_array);
xod_base = &xod->base;
+
+ if (key != NULL) {
+ const size_t key_size = BKE_keyblock_element_calc_size_from_shape(key, key_index);
+ if (key_size) {
+ xod->key_data = MEM_mallocN(key_size, __func__);
+ BKE_keyblock_data_get_from_shape(key, xod->key_data, key_index);
+ }
+ }
+
break;
}
case ID_CU: {
Curve *cu = (Curve *)id;
+ struct Key *key = cu->key;
+
const short ob_type = BKE_curve_type_get(cu);
if (ob_type == OB_FONT) {
/* We could support translation. */
break;
}
+ const int key_index = -1;
ListBase *nurbs;
if (is_edit_mode) {
EditNurb *editnurb = cu->editnurb;
nurbs = &editnurb->nurbs;
+ /* Always operate on all keys for the moment. */
+ // key_index = editnurb->shapenr - 1;
}
else {
nurbs = &cu->nurb;
@@ -359,8 +423,19 @@ struct XFormObjectData *ED_object_data_xform_create_ex(ID *id, bool is_edit_mode
const int elem_array_len = BKE_nurbList_verts_count(nurbs);
struct XFormObjectData_Curve *xod = MEM_mallocN(
sizeof(*xod) + (sizeof(*xod->elem_array) * elem_array_len), __func__);
+ memset(xod, 0x0, sizeof(*xod));
+
BKE_curve_nurbs_vert_coords_get(nurbs, xod->elem_array, elem_array_len);
xod_base = &xod->base;
+
+ if (key != NULL) {
+ const size_t key_size = BKE_keyblock_element_calc_size_from_shape(key, key_index);
+ if (key_size) {
+ xod->key_data = MEM_mallocN(key_size, __func__);
+ BKE_keyblock_data_get_from_shape(key, xod->key_data, key_index);
+ }
+ }
+
break;
}
case ID_AR: {
@@ -369,6 +444,8 @@ struct XFormObjectData *ED_object_data_xform_create_ex(ID *id, bool is_edit_mode
const int elem_array_len = BLI_listbase_count(arm->edbo);
struct XFormObjectData_Armature *xod = MEM_mallocN(
sizeof(*xod) + (sizeof(*xod->elem_array) * elem_array_len), __func__);
+ memset(xod, 0x0, sizeof(*xod));
+
edit_armature_coords_and_quats_get(arm, xod->elem_array);
xod_base = &xod->base;
}
@@ -376,6 +453,8 @@ struct XFormObjectData *ED_object_data_xform_create_ex(ID *id, bool is_edit_mode
const int elem_array_len = BKE_armature_bonelist_count(&arm->bonebase);
struct XFormObjectData_Armature *xod = MEM_mallocN(
sizeof(*xod) + (sizeof(*xod->elem_array) * elem_array_len), __func__);
+ memset(xod, 0x0, sizeof(*xod));
+
armature_coords_and_quats_get(arm, xod->elem_array);
xod_base = &xod->base;
}
@@ -387,10 +466,23 @@ struct XFormObjectData *ED_object_data_xform_create_ex(ID *id, bool is_edit_mode
const int elem_array_len = BLI_listbase_count(&mb->elems);
struct XFormObjectData_MetaBall *xod = MEM_mallocN(
sizeof(*xod) + (sizeof(*xod->elem_array) * elem_array_len), __func__);
+ memset(xod, 0x0, sizeof(*xod));
+
metaball_coords_and_quats_get(mb, xod->elem_array);
xod_base = &xod->base;
break;
}
+ case ID_GD: {
+ bGPdata *gpd = (bGPdata *)id;
+ const int elem_array_len = BKE_gpencil_stroke_point_count(gpd);
+ struct XFormObjectData_GPencil *xod = MEM_mallocN(
+ sizeof(*xod) + (sizeof(*xod->elem_array) * elem_array_len), __func__);
+ memset(xod, 0x0, sizeof(*xod));
+
+ BKE_gpencil_point_coords_get(gpd, xod->elem_array);
+ xod_base = &xod->base;
+ break;
+ }
default: {
break;
}
@@ -412,9 +504,35 @@ struct XFormObjectData *ED_object_data_xform_create_from_edit_mode(ID *id)
return ED_object_data_xform_create_ex(id, true);
}
-void ED_object_data_xform_destroy(struct XFormObjectData *xod)
+void ED_object_data_xform_destroy(struct XFormObjectData *xod_base)
{
- MEM_freeN(xod);
+ switch (GS(xod_base->id->name)) {
+ case ID_ME: {
+ struct XFormObjectData_Mesh *xod = (struct XFormObjectData_Mesh *)xod_base;
+ if (xod->key_data != NULL) {
+ MEM_freeN(xod->key_data);
+ }
+ break;
+ }
+ case ID_LT: {
+ struct XFormObjectData_Lattice *xod = (struct XFormObjectData_Lattice *)xod_base;
+ if (xod->key_data != NULL) {
+ MEM_freeN(xod->key_data);
+ }
+ break;
+ }
+ case ID_CU: {
+ struct XFormObjectData_Curve *xod = (struct XFormObjectData_Curve *)xod_base;
+ if (xod->key_data != NULL) {
+ MEM_freeN(xod->key_data);
+ }
+ break;
+ }
+ default: {
+ break;
+ }
+ }
+ MEM_freeN(xod_base);
}
void ED_object_data_xform_by_mat4(struct XFormObjectData *xod_base, const float mat[4][4])
@@ -422,34 +540,72 @@ void ED_object_data_xform_by_mat4(struct XFormObjectData *xod_base, const float
switch (GS(xod_base->id->name)) {
case ID_ME: {
Mesh *me = (Mesh *)xod_base->id;
+
+ struct Key *key = me->key;
+ const int key_index = -1;
+
struct XFormObjectData_Mesh *xod = (struct XFormObjectData_Mesh *)xod_base;
if (xod_base->is_edit_mode) {
BMesh *bm = me->edit_mesh->bm;
BM_mesh_vert_coords_apply_with_mat4(bm, xod->elem_array, mat);
+ /* Always operate on all keys for the moment. */
+ // key_index = bm->shapenr - 1;
}
else {
BKE_mesh_vert_coords_apply_with_mat4(me, xod->elem_array, mat);
}
+
+ if (key != NULL) {
+ BKE_keyblock_data_set_with_mat4(key, key_index, xod->key_data, mat);
+ }
+
break;
}
case ID_LT: {
Lattice *lt_orig = (Lattice *)xod_base->id;
Lattice *lt = xod_base->is_edit_mode ? lt_orig->editlatt->latt : lt_orig;
+
+ struct Key *key = lt->key;
+ const int key_index = -1;
+
struct XFormObjectData_Lattice *xod = (struct XFormObjectData_Lattice *)xod_base;
BKE_lattice_vert_coords_apply_with_mat4(lt, xod->elem_array, mat);
+ if (xod_base->is_edit_mode) {
+ /* Always operate on all keys for the moment. */
+ // key_index = lt_orig->editlatt->shapenr - 1;
+ }
+
+ if ((key != NULL) && (xod->key_data != NULL)) {
+ BKE_keyblock_data_set_with_mat4(key, key_index, xod->key_data, mat);
+ }
+
break;
}
case ID_CU: {
BLI_assert(xod_base->is_edit_mode == false); /* Not used currently. */
Curve *cu = (Curve *)xod_base->id;
+
+ struct Key *key = cu->key;
+ const int key_index = -1;
+ ListBase *nurb = NULL;
+
struct XFormObjectData_Curve *xod = (struct XFormObjectData_Curve *)xod_base;
if (xod_base->is_edit_mode) {
EditNurb *editnurb = cu->editnurb;
+ nurb = &editnurb->nurbs;
BKE_curve_nurbs_vert_coords_apply_with_mat4(&editnurb->nurbs, xod->elem_array, mat, true);
+ /* Always operate on all keys for the moment. */
+ // key_index = editnurb->shapenr - 1;
}
else {
+ nurb = &cu->nurb;
BKE_curve_nurbs_vert_coords_apply_with_mat4(&cu->nurb, xod->elem_array, mat, true);
}
+
+ if ((key != NULL) && (xod->key_data != NULL)) {
+ BKE_keyblock_curve_data_set_with_mat4(key, nurb, key_index, xod->key_data, mat);
+ }
+
break;
}
case ID_AR: {
@@ -471,6 +627,12 @@ void ED_object_data_xform_by_mat4(struct XFormObjectData *xod_base, const float
metaball_coords_and_quats_apply_with_mat4(mb, xod->elem_array, mat);
break;
}
+ case ID_GD: {
+ bGPdata *gpd = (bGPdata *)xod_base->id;
+ struct XFormObjectData_GPencil *xod = (struct XFormObjectData_GPencil *)xod_base;
+ BKE_gpencil_point_coords_apply_with_mat4(gpd, xod->elem_array, mat);
+ break;
+ }
default: {
break;
}
@@ -482,33 +644,68 @@ void ED_object_data_xform_restore(struct XFormObjectData *xod_base)
switch (GS(xod_base->id->name)) {
case ID_ME: {
Mesh *me = (Mesh *)xod_base->id;
+
+ struct Key *key = me->key;
+ const int key_index = -1;
+
struct XFormObjectData_Mesh *xod = (struct XFormObjectData_Mesh *)xod_base;
if (xod_base->is_edit_mode) {
BMesh *bm = me->edit_mesh->bm;
BM_mesh_vert_coords_apply(bm, xod->elem_array);
+ /* Always operate on all keys for the moment. */
+ // key_index = bm->shapenr - 1;
}
else {
BKE_mesh_vert_coords_apply(me, xod->elem_array);
}
+
+ if ((key != NULL) && (xod->key_data != NULL)) {
+ BKE_keyblock_data_set(key, key_index, xod->key_data);
+ }
+
break;
}
case ID_LT: {
Lattice *lt_orig = (Lattice *)xod_base->id;
Lattice *lt = xod_base->is_edit_mode ? lt_orig->editlatt->latt : lt_orig;
+
+ struct Key *key = lt->key;
+ const int key_index = -1;
+
struct XFormObjectData_Lattice *xod = (struct XFormObjectData_Lattice *)xod_base;
BKE_lattice_vert_coords_apply(lt, xod->elem_array);
+ if (xod_base->is_edit_mode) {
+ /* Always operate on all keys for the moment. */
+ // key_index = lt_orig->editlatt->shapenr - 1;
+ }
+
+ if ((key != NULL) && (xod->key_data != NULL)) {
+ BKE_keyblock_data_set(key, key_index, xod->key_data);
+ }
+
break;
}
case ID_CU: {
Curve *cu = (Curve *)xod_base->id;
+
+ struct Key *key = cu->key;
+ const int key_index = -1;
+
struct XFormObjectData_Curve *xod = (struct XFormObjectData_Curve *)xod_base;
if (xod_base->is_edit_mode) {
EditNurb *editnurb = cu->editnurb;
BKE_curve_nurbs_vert_coords_apply(&editnurb->nurbs, xod->elem_array, true);
+ /* Always operate on all keys for the moment. */
+ // key_index = editnurb->shapenr - 1;
}
else {
BKE_curve_nurbs_vert_coords_apply(&cu->nurb, xod->elem_array, true);
}
+
+ if ((key != NULL) && (xod->key_data != NULL)) {
+ BKE_keyblock_data_set(key, key_index, xod->key_data);
+ }
+
break;
}
case ID_AR: {
@@ -529,6 +726,12 @@ void ED_object_data_xform_restore(struct XFormObjectData *xod_base)
metaball_coords_and_quats_apply(mb, xod->elem_array);
break;
}
+ case ID_GD: {
+ bGPdata *gpd = (bGPdata *)xod_base->id;
+ struct XFormObjectData_GPencil *xod = (struct XFormObjectData_GPencil *)xod_base;
+ BKE_gpencil_point_coords_apply(gpd, xod->elem_array);
+ break;
+ }
default: {
break;
}
@@ -572,6 +775,12 @@ void ED_object_data_xform_tag_update(struct XFormObjectData *xod_base)
DEG_id_tag_update(&mb->id, ID_RECALC_GEOMETRY | ID_RECALC_COPY_ON_WRITE);
break;
}
+ case ID_GD: {
+ /* Generic update. */
+ bGPdata *gpd = (bGPdata *)xod_base->id;
+ DEG_id_tag_update(&gpd->id, ID_RECALC_GEOMETRY | ID_RECALC_COPY_ON_WRITE);
+ break;
+ }
default: {
break;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 06:56:19 +0300