As described in T95966, the goal is to move to a "struct of arrays" approach rather than gathering an arbitrary set of data in hard-coded structs. This has performance benefits, but also code complexity benefits (this patch removes plenty of code, though the boilerplate for the new operators outweighs that here). To mirror the internal change, the options for storing mesh bevel weights are converted into operators that add or remove the layer, like for some other layers. The most complex change is to the solidify modifier, where bevel weights had special handling. Other than that, most changes are removing clearing of the weights, boilerplate for the add/remove operators, and removing the manual transfer of bevel weights in bmesh - mesh conversion. Eventually bevel weights can become a fully generic attribute, but for now this patch aims to avoid most functional changes. Bevel weights are still written and read from the mesh in the old way, so neither forward nor backward compatibility are affected. As described in T95965, writing in the old format will be done until 4.0. Differential Revision: https://developer.blender.org/D14077
453 lines
15 KiB
C
453 lines
15 KiB
C
/* SPDX-License-Identifier: GPL-2.0-or-later
|
|
* Copyright 2005 Blender Foundation. All rights reserved. */
|
|
|
|
/** \file
|
|
* \ingroup modifiers
|
|
*/
|
|
|
|
#include "MEM_guardedalloc.h"
|
|
|
|
#include "BLI_utildefines.h"
|
|
|
|
#include "BLI_math.h"
|
|
|
|
#include "BLT_translation.h"
|
|
|
|
#include "DNA_curveprofile_types.h"
|
|
#include "DNA_defaults.h"
|
|
#include "DNA_mesh_types.h"
|
|
#include "DNA_meshdata_types.h"
|
|
#include "DNA_object_types.h"
|
|
#include "DNA_scene_types.h"
|
|
#include "DNA_screen_types.h"
|
|
|
|
#include "BKE_context.h"
|
|
#include "BKE_curveprofile.h"
|
|
#include "BKE_deform.h"
|
|
#include "BKE_mesh.h"
|
|
#include "BKE_modifier.h"
|
|
#include "BKE_screen.h"
|
|
|
|
#include "UI_interface.h"
|
|
#include "UI_resources.h"
|
|
|
|
#include "RNA_access.h"
|
|
#include "RNA_prototypes.h"
|
|
|
|
#include "MOD_ui_common.h"
|
|
#include "MOD_util.h"
|
|
|
|
#include "BLO_read_write.h"
|
|
|
|
#include "bmesh.h"
|
|
#include "bmesh_tools.h"
|
|
|
|
#include "DEG_depsgraph_query.h"
|
|
|
|
static void initData(ModifierData *md)
|
|
{
|
|
BevelModifierData *bmd = (BevelModifierData *)md;
|
|
|
|
BLI_assert(MEMCMP_STRUCT_AFTER_IS_ZERO(bmd, modifier));
|
|
|
|
MEMCPY_STRUCT_AFTER(bmd, DNA_struct_default_get(BevelModifierData), modifier);
|
|
|
|
bmd->custom_profile = BKE_curveprofile_add(PROF_PRESET_LINE);
|
|
}
|
|
|
|
static void copyData(const ModifierData *md_src, ModifierData *md_dst, const int flag)
|
|
{
|
|
const BevelModifierData *bmd_src = (const BevelModifierData *)md_src;
|
|
BevelModifierData *bmd_dst = (BevelModifierData *)md_dst;
|
|
|
|
BKE_modifier_copydata_generic(md_src, md_dst, flag);
|
|
bmd_dst->custom_profile = BKE_curveprofile_copy(bmd_src->custom_profile);
|
|
}
|
|
|
|
static void requiredDataMask(Object *UNUSED(ob),
|
|
ModifierData *md,
|
|
CustomData_MeshMasks *r_cddata_masks)
|
|
{
|
|
BevelModifierData *bmd = (BevelModifierData *)md;
|
|
|
|
/* ask for vertexgroups if we need them */
|
|
if (bmd->defgrp_name[0] != '\0') {
|
|
r_cddata_masks->vmask |= CD_MASK_MDEFORMVERT;
|
|
}
|
|
if (bmd->lim_flags & MOD_BEVEL_WEIGHT) {
|
|
r_cddata_masks->vmask |= CD_MASK_BWEIGHT;
|
|
r_cddata_masks->emask |= CD_MASK_BWEIGHT;
|
|
}
|
|
}
|
|
|
|
/*
|
|
* This calls the new bevel code (added since 2.64)
|
|
*/
|
|
static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh)
|
|
{
|
|
Mesh *result;
|
|
BMesh *bm;
|
|
BMIter iter;
|
|
BMEdge *e;
|
|
BMVert *v;
|
|
float weight, weight2;
|
|
int vgroup = -1;
|
|
const MDeformVert *dvert = NULL;
|
|
BevelModifierData *bmd = (BevelModifierData *)md;
|
|
const float threshold = cosf(bmd->bevel_angle + 0.000000175f);
|
|
const bool do_clamp = !(bmd->flags & MOD_BEVEL_OVERLAP_OK);
|
|
const int offset_type = bmd->val_flags;
|
|
const int profile_type = bmd->profile_type;
|
|
const float value = bmd->value;
|
|
const int mat = CLAMPIS(bmd->mat, -1, ctx->object->totcol - 1);
|
|
const bool loop_slide = (bmd->flags & MOD_BEVEL_EVEN_WIDTHS) == 0;
|
|
const bool mark_seam = (bmd->edge_flags & MOD_BEVEL_MARK_SEAM);
|
|
const bool mark_sharp = (bmd->edge_flags & MOD_BEVEL_MARK_SHARP);
|
|
bool harden_normals = (bmd->flags & MOD_BEVEL_HARDEN_NORMALS);
|
|
const int face_strength_mode = bmd->face_str_mode;
|
|
const int miter_outer = bmd->miter_outer;
|
|
const int miter_inner = bmd->miter_inner;
|
|
const float spread = bmd->spread;
|
|
const bool invert_vgroup = (bmd->flags & MOD_BEVEL_INVERT_VGROUP) != 0;
|
|
|
|
bm = BKE_mesh_to_bmesh_ex(mesh,
|
|
&(struct BMeshCreateParams){0},
|
|
&(struct BMeshFromMeshParams){
|
|
.calc_face_normal = true,
|
|
.calc_vert_normal = true,
|
|
.add_key_index = false,
|
|
.use_shapekey = false,
|
|
.active_shapekey = 0,
|
|
/* XXX We probably can use CD_MASK_BAREMESH_ORIGDINDEX here instead
|
|
* (also for other modifiers cases)? */
|
|
.cd_mask_extra = {.vmask = CD_MASK_ORIGINDEX,
|
|
.emask = CD_MASK_ORIGINDEX,
|
|
.pmask = CD_MASK_ORIGINDEX},
|
|
});
|
|
|
|
if ((bmd->lim_flags & MOD_BEVEL_VGROUP) && bmd->defgrp_name[0]) {
|
|
MOD_get_vgroup(ctx->object, mesh, bmd->defgrp_name, &dvert, &vgroup);
|
|
}
|
|
|
|
if (bmd->affect_type == MOD_BEVEL_AFFECT_VERTICES) {
|
|
BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
|
|
if (bmd->lim_flags & MOD_BEVEL_WEIGHT) {
|
|
weight = BM_elem_float_data_get(&bm->vdata, v, CD_BWEIGHT);
|
|
if (weight == 0.0f) {
|
|
continue;
|
|
}
|
|
}
|
|
else if (vgroup != -1) {
|
|
weight = invert_vgroup ?
|
|
1.0f -
|
|
BKE_defvert_array_find_weight_safe(dvert, BM_elem_index_get(v), vgroup) :
|
|
BKE_defvert_array_find_weight_safe(dvert, BM_elem_index_get(v), vgroup);
|
|
/* Check is against 0.5 rather than != 0.0 because cascaded bevel modifiers will
|
|
* interpolate weights for newly created vertices, and may cause unexpected "selection" */
|
|
if (weight < 0.5f) {
|
|
continue;
|
|
}
|
|
}
|
|
BM_elem_flag_enable(v, BM_ELEM_TAG);
|
|
}
|
|
}
|
|
else if (bmd->lim_flags & MOD_BEVEL_ANGLE) {
|
|
BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
|
|
/* check for 1 edge having 2 face users */
|
|
BMLoop *l_a, *l_b;
|
|
if (BM_edge_loop_pair(e, &l_a, &l_b)) {
|
|
if (dot_v3v3(l_a->f->no, l_b->f->no) < threshold) {
|
|
BM_elem_flag_enable(e, BM_ELEM_TAG);
|
|
BM_elem_flag_enable(e->v1, BM_ELEM_TAG);
|
|
BM_elem_flag_enable(e->v2, BM_ELEM_TAG);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
else {
|
|
/* crummy, is there a way just to operator on all? - campbell */
|
|
BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
|
|
if (BM_edge_is_manifold(e)) {
|
|
if (bmd->lim_flags & MOD_BEVEL_WEIGHT) {
|
|
weight = BM_elem_float_data_get(&bm->edata, e, CD_BWEIGHT);
|
|
if (weight == 0.0f) {
|
|
continue;
|
|
}
|
|
}
|
|
else if (vgroup != -1) {
|
|
weight = invert_vgroup ?
|
|
1.0f - BKE_defvert_array_find_weight_safe(
|
|
dvert, BM_elem_index_get(e->v1), vgroup) :
|
|
BKE_defvert_array_find_weight_safe(dvert, BM_elem_index_get(e->v1), vgroup);
|
|
weight2 = invert_vgroup ? 1.0f - BKE_defvert_array_find_weight_safe(
|
|
dvert, BM_elem_index_get(e->v2), vgroup) :
|
|
BKE_defvert_array_find_weight_safe(
|
|
dvert, BM_elem_index_get(e->v2), vgroup);
|
|
if (weight < 0.5f || weight2 < 0.5f) {
|
|
continue;
|
|
}
|
|
}
|
|
BM_elem_flag_enable(e, BM_ELEM_TAG);
|
|
BM_elem_flag_enable(e->v1, BM_ELEM_TAG);
|
|
BM_elem_flag_enable(e->v2, BM_ELEM_TAG);
|
|
}
|
|
}
|
|
}
|
|
|
|
Object *ob = ctx->object;
|
|
|
|
if (harden_normals && (ob->type == OB_MESH) && !(((Mesh *)ob->data)->flag & ME_AUTOSMOOTH)) {
|
|
BKE_modifier_set_error(ob, md, "Enable 'Auto Smooth' in Object Data Properties");
|
|
harden_normals = false;
|
|
}
|
|
|
|
BM_mesh_bevel(bm,
|
|
value,
|
|
offset_type,
|
|
profile_type,
|
|
bmd->res,
|
|
bmd->profile,
|
|
bmd->affect_type,
|
|
bmd->lim_flags & MOD_BEVEL_WEIGHT,
|
|
do_clamp,
|
|
dvert,
|
|
vgroup,
|
|
mat,
|
|
loop_slide,
|
|
mark_seam,
|
|
mark_sharp,
|
|
harden_normals,
|
|
face_strength_mode,
|
|
miter_outer,
|
|
miter_inner,
|
|
spread,
|
|
mesh->smoothresh,
|
|
bmd->custom_profile,
|
|
bmd->vmesh_method);
|
|
|
|
result = BKE_mesh_from_bmesh_for_eval_nomain(bm, NULL, mesh);
|
|
|
|
/* Make sure we never alloc'd these. */
|
|
BLI_assert(bm->vtoolflagpool == NULL && bm->etoolflagpool == NULL && bm->ftoolflagpool == NULL);
|
|
|
|
BM_mesh_free(bm);
|
|
|
|
return result;
|
|
}
|
|
|
|
static bool dependsOnNormals(ModifierData *UNUSED(md))
|
|
{
|
|
return true;
|
|
}
|
|
|
|
static void freeData(ModifierData *md)
|
|
{
|
|
BevelModifierData *bmd = (BevelModifierData *)md;
|
|
BKE_curveprofile_free(bmd->custom_profile);
|
|
}
|
|
|
|
static bool isDisabled(const Scene *UNUSED(scene), ModifierData *md, bool UNUSED(userRenderParams))
|
|
{
|
|
BevelModifierData *bmd = (BevelModifierData *)md;
|
|
return (bmd->value == 0.0f);
|
|
}
|
|
|
|
static void panel_draw(const bContext *UNUSED(C), Panel *panel)
|
|
{
|
|
uiLayout *col, *sub;
|
|
uiLayout *layout = panel->layout;
|
|
|
|
PointerRNA ob_ptr;
|
|
PointerRNA *ptr = modifier_panel_get_property_pointers(panel, &ob_ptr);
|
|
|
|
bool edge_bevel = RNA_enum_get(ptr, "affect") != MOD_BEVEL_AFFECT_VERTICES;
|
|
|
|
uiItemR(layout, ptr, "affect", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
|
|
|
|
uiLayoutSetPropSep(layout, true);
|
|
|
|
col = uiLayoutColumn(layout, false);
|
|
uiItemR(col, ptr, "offset_type", 0, NULL, ICON_NONE);
|
|
if (RNA_enum_get(ptr, "offset_type") == BEVEL_AMT_PERCENT) {
|
|
uiItemR(col, ptr, "width_pct", 0, NULL, ICON_NONE);
|
|
}
|
|
else {
|
|
uiItemR(col, ptr, "width", 0, IFACE_("Amount"), ICON_NONE);
|
|
}
|
|
|
|
uiItemR(layout, ptr, "segments", 0, NULL, ICON_NONE);
|
|
|
|
uiItemS(layout);
|
|
|
|
col = uiLayoutColumn(layout, false);
|
|
uiItemR(col, ptr, "limit_method", 0, NULL, ICON_NONE);
|
|
int limit_method = RNA_enum_get(ptr, "limit_method");
|
|
if (limit_method == MOD_BEVEL_ANGLE) {
|
|
sub = uiLayoutColumn(col, false);
|
|
uiLayoutSetActive(sub, edge_bevel);
|
|
uiItemR(col, ptr, "angle_limit", 0, NULL, ICON_NONE);
|
|
}
|
|
else if (limit_method == MOD_BEVEL_VGROUP) {
|
|
modifier_vgroup_ui(col, ptr, &ob_ptr, "vertex_group", "invert_vertex_group", NULL);
|
|
}
|
|
|
|
modifier_panel_end(layout, ptr);
|
|
}
|
|
|
|
static void profile_panel_draw(const bContext *UNUSED(C), Panel *panel)
|
|
{
|
|
uiLayout *row;
|
|
uiLayout *layout = panel->layout;
|
|
|
|
PointerRNA *ptr = modifier_panel_get_property_pointers(panel, NULL);
|
|
|
|
int profile_type = RNA_enum_get(ptr, "profile_type");
|
|
int miter_inner = RNA_enum_get(ptr, "miter_inner");
|
|
int miter_outer = RNA_enum_get(ptr, "miter_outer");
|
|
bool edge_bevel = RNA_enum_get(ptr, "affect") != MOD_BEVEL_AFFECT_VERTICES;
|
|
|
|
uiItemR(layout, ptr, "profile_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
|
|
|
|
uiLayoutSetPropSep(layout, true);
|
|
|
|
if (ELEM(profile_type, MOD_BEVEL_PROFILE_SUPERELLIPSE, MOD_BEVEL_PROFILE_CUSTOM)) {
|
|
row = uiLayoutRow(layout, false);
|
|
uiLayoutSetActive(
|
|
row,
|
|
profile_type == MOD_BEVEL_PROFILE_SUPERELLIPSE ||
|
|
(profile_type == MOD_BEVEL_PROFILE_CUSTOM && edge_bevel &&
|
|
!((miter_inner == MOD_BEVEL_MITER_SHARP) && (miter_outer == MOD_BEVEL_MITER_SHARP))));
|
|
uiItemR(row,
|
|
ptr,
|
|
"profile",
|
|
UI_ITEM_R_SLIDER,
|
|
(profile_type == MOD_BEVEL_PROFILE_SUPERELLIPSE) ? IFACE_("Shape") :
|
|
IFACE_("Miter Shape"),
|
|
ICON_NONE);
|
|
|
|
if (profile_type == MOD_BEVEL_PROFILE_CUSTOM) {
|
|
uiLayout *sub = uiLayoutColumn(layout, false);
|
|
uiLayoutSetPropDecorate(sub, false);
|
|
uiTemplateCurveProfile(sub, ptr, "custom_profile");
|
|
}
|
|
}
|
|
}
|
|
|
|
static void geometry_panel_draw(const bContext *UNUSED(C), Panel *panel)
|
|
{
|
|
uiLayout *row;
|
|
uiLayout *layout = panel->layout;
|
|
|
|
PointerRNA *ptr = modifier_panel_get_property_pointers(panel, NULL);
|
|
|
|
bool edge_bevel = RNA_enum_get(ptr, "affect") != MOD_BEVEL_AFFECT_VERTICES;
|
|
|
|
uiLayoutSetPropSep(layout, true);
|
|
|
|
row = uiLayoutRow(layout, false);
|
|
uiLayoutSetActive(row, edge_bevel);
|
|
uiItemR(row, ptr, "miter_outer", 0, IFACE_("Miter Outer"), ICON_NONE);
|
|
row = uiLayoutRow(layout, false);
|
|
uiLayoutSetActive(row, edge_bevel);
|
|
uiItemR(row, ptr, "miter_inner", 0, IFACE_("Inner"), ICON_NONE);
|
|
if (RNA_enum_get(ptr, "miter_inner") == BEVEL_MITER_ARC) {
|
|
row = uiLayoutRow(layout, false);
|
|
uiLayoutSetActive(row, edge_bevel);
|
|
uiItemR(row, ptr, "spread", 0, NULL, ICON_NONE);
|
|
}
|
|
uiItemS(layout);
|
|
|
|
row = uiLayoutRow(layout, false);
|
|
uiLayoutSetActive(row, edge_bevel);
|
|
uiItemR(row, ptr, "vmesh_method", 0, IFACE_("Intersections"), ICON_NONE);
|
|
uiItemR(layout, ptr, "use_clamp_overlap", 0, NULL, ICON_NONE);
|
|
row = uiLayoutRow(layout, false);
|
|
uiLayoutSetActive(row, edge_bevel);
|
|
uiItemR(row, ptr, "loop_slide", 0, NULL, ICON_NONE);
|
|
}
|
|
|
|
static void shading_panel_draw(const bContext *UNUSED(C), Panel *panel)
|
|
{
|
|
uiLayout *col;
|
|
uiLayout *layout = panel->layout;
|
|
|
|
PointerRNA *ptr = modifier_panel_get_property_pointers(panel, NULL);
|
|
|
|
bool edge_bevel = RNA_enum_get(ptr, "affect") != MOD_BEVEL_AFFECT_VERTICES;
|
|
|
|
uiLayoutSetPropSep(layout, true);
|
|
|
|
uiItemR(layout, ptr, "harden_normals", 0, NULL, ICON_NONE);
|
|
|
|
col = uiLayoutColumnWithHeading(layout, true, IFACE_("Mark"));
|
|
uiLayoutSetActive(col, edge_bevel);
|
|
uiItemR(col, ptr, "mark_seam", 0, IFACE_("Seam"), ICON_NONE);
|
|
uiItemR(col, ptr, "mark_sharp", 0, IFACE_("Sharp"), ICON_NONE);
|
|
|
|
uiItemR(layout, ptr, "material", 0, NULL, ICON_NONE);
|
|
uiItemR(layout, ptr, "face_strength_mode", 0, NULL, ICON_NONE);
|
|
}
|
|
|
|
static void panelRegister(ARegionType *region_type)
|
|
{
|
|
PanelType *panel_type = modifier_panel_register(region_type, eModifierType_Bevel, panel_draw);
|
|
modifier_subpanel_register(
|
|
region_type, "profile", "Profile", NULL, profile_panel_draw, panel_type);
|
|
modifier_subpanel_register(
|
|
region_type, "geometry", "Geometry", NULL, geometry_panel_draw, panel_type);
|
|
modifier_subpanel_register(
|
|
region_type, "shading", "Shading", NULL, shading_panel_draw, panel_type);
|
|
}
|
|
|
|
static void blendWrite(BlendWriter *writer, const ID *UNUSED(id_owner), const ModifierData *md)
|
|
{
|
|
const BevelModifierData *bmd = (const BevelModifierData *)md;
|
|
|
|
BLO_write_struct(writer, BevelModifierData, bmd);
|
|
|
|
if (bmd->custom_profile) {
|
|
BKE_curveprofile_blend_write(writer, bmd->custom_profile);
|
|
}
|
|
}
|
|
|
|
static void blendRead(BlendDataReader *reader, ModifierData *md)
|
|
{
|
|
BevelModifierData *bmd = (BevelModifierData *)md;
|
|
|
|
BLO_read_data_address(reader, &bmd->custom_profile);
|
|
if (bmd->custom_profile) {
|
|
BKE_curveprofile_blend_read(reader, bmd->custom_profile);
|
|
}
|
|
}
|
|
|
|
ModifierTypeInfo modifierType_Bevel = {
|
|
/* name */ N_("Bevel"),
|
|
/* structName */ "BevelModifierData",
|
|
/* structSize */ sizeof(BevelModifierData),
|
|
/* srna */ &RNA_BevelModifier,
|
|
/* type */ eModifierTypeType_Constructive,
|
|
/* flags */ eModifierTypeFlag_AcceptsMesh | eModifierTypeFlag_SupportsEditmode |
|
|
eModifierTypeFlag_EnableInEditmode | eModifierTypeFlag_AcceptsCVs,
|
|
/* icon */ ICON_MOD_BEVEL,
|
|
/* copyData */ copyData,
|
|
/* deformVerts */ NULL,
|
|
/* deformMatrices */ NULL,
|
|
/* deformVertsEM */ NULL,
|
|
/* deformMatricesEM */ NULL,
|
|
/* modifyMesh */ modifyMesh,
|
|
/* modifyGeometrySet */ NULL,
|
|
/* initData */ initData,
|
|
/* requiredDataMask */ requiredDataMask,
|
|
/* freeData */ freeData,
|
|
/* isDisabled */ isDisabled,
|
|
/* updateDepsgraph */ NULL,
|
|
/* dependsOnTime */ NULL,
|
|
/* dependsOnNormals */ dependsOnNormals,
|
|
/* foreachIDLink */ NULL,
|
|
/* foreachTexLink */ NULL,
|
|
/* freeRuntimeData */ NULL,
|
|
/* uiPanel */ panelRegister,
|
|
/* blendWrite */ blendWrite,
|
|
/* blendRead */ blendRead,
|
|
};
|