griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

code cleanup: remove deprecated bevel code (unused since 2.64)

Browse Source
This commit is contained in:
Campbell Barton
2013-07-23 14:28:19 +00:00
parent cbf63e4698
commit e50c37d90f
11 changed files with 30 additions and 1341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
source/blender/blenkernel/BKE_bmesh.h
View File

@@ -1,98 +0,0 @@
/*
* ***** 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) 2004 Blender Foundation.
* All rights reserved.
*
* The Original Code is: all of this file.
*
* Contributor(s): Geoffrey Bantle.
*
* ***** END GPL LICENSE BLOCK *****
*/
#ifndef __BKE_BMESH_H__
#define __BKE_BMESH_H__
/** \file BKE_bmesh.h
* \ingroup bke
* \since January 2007
* \brief BMesh modeler structure and functions.
*
*/
/*NOTE: this is the bmesh 1.0 code. it's completely outdated.*/
/* uncomment to use the new bevel operator as a modifier */
#define USE_BM_BEVEL_OP_AS_MOD
/* bevel tool defines */
/* element flags */
#define BME_BEVEL_ORIG 1
#define BME_BEVEL_BEVEL (1 << 1)
#define BME_BEVEL_NONMAN (1 << 2)
#define BME_BEVEL_WIRE (1 << 3)
/* tool options */
#define BME_BEVEL_SELECT 1
#define BME_BEVEL_VERT (1 << 1)
#define BME_BEVEL_RADIUS (1 << 2)
#define BME_BEVEL_ANGLE (1 << 3)
#define BME_BEVEL_WEIGHT (1 << 4)
#define BME_BEVEL_VGROUP (1 << 5)
//~ #define BME_BEVEL_EWEIGHT (1<<4)
//~ #define BME_BEVEL_VWEIGHT (1<<5)
#define BME_BEVEL_PERCENT (1 << 6)
#define BME_BEVEL_EMIN (1 << 7)
#define BME_BEVEL_EMAX (1 << 8)
#define BME_BEVEL_RUNNING (1 << 9)
#define BME_BEVEL_RES (1 << 10)
#define BME_BEVEL_EVEN (1 << 11) /* this is a new setting not related to old (trunk bmesh bevel code) but adding
* here because they are mixed - campbell */
#define BME_BEVEL_DIST (1 << 12) /* same as above */
#define BME_BEVEL_OVERLAP_OK (1 << 13)
typedef struct BME_TransData {
struct BMesh *bm; /* the bmesh the vert belongs to */
struct BMVert *v; /* pointer to the vert this tdata applies to */
float co[3]; /* the original coordinate */
float org[3]; /* the origin */
float vec[3]; /* a directional vector; always, always normalize! */
void *loc; /* a pointer to the data to transform (likely the vert's cos) */
float factor; /* primary scaling factor; also accumulates number of weighted edges for beveling tool */
float weight; /* another scaling factor; used primarily for propogating vertex weights to transforms; */
/* weight is also used across recursive bevels to help with the math */
float maxfactor; /* the unscaled, original factor (used only by "edge verts" in recursive beveling) */
float *max; /* the maximum distance this vert can be transformed; negative is infinite
* it points to the "parent" maxfactor (where maxfactor makes little sense)
* where the max limit is stored (limits are stored per-corner) */
} BME_TransData;
typedef struct BME_TransData_Head {
struct GHash *gh; /* the hash structure for element lookup */
struct MemArena *ma; /* the memory "pool" we will be drawing individual elements from */
int len;
} BME_TransData_Head;
struct BME_TransData *BME_get_transdata(struct BME_TransData_Head *td, struct BMVert *v);
void BME_free_transdata(struct BME_TransData_Head *td);
struct BMesh *BME_bevel(struct BMesh *bm, float value, int res, int options, int defgrp_index, float angle,
BME_TransData_Head **rtd);
#endif

1
source/blender/blenkernel/BKE_global.h
View File

@@ -46,7 +46,6 @@ extern "C" {
/* forwards */
struct Main;
struct Object;
struct BME_Glob;
typedef struct Global {

1
source/blender/blenkernel/CMakeLists.txt
View File

@@ -165,7 +165,6 @@ set(SRC
BKE_armature.h
BKE_autoexec.h
BKE_blender.h
BKE_bmesh.h
BKE_bmfont.h
BKE_bmfont_types.h
BKE_boids.h

1
source/blender/blenkernel/intern/modifiers_bmesh.c
View File

@@ -37,7 +37,6 @@
#include "BLI_array.h"
#include "BKE_DerivedMesh.h"
#include "BKE_bmesh.h"
#include "BKE_editmesh.h"
/* Static function for alloc */

5
source/blender/bmesh/CMakeLists.txt
View File

@@ -23,7 +23,7 @@
#
# ***** END GPL LICENSE BLOCK *****
set(INC
set(INC
.
../blenfont
../blenkernel
@@ -50,7 +50,7 @@ set(SRC
operators/bmo_edgenet.c
operators/bmo_extrude.c
operators/bmo_fill_edgeloop.c
operators/bmo_fill_grid.c
operators/bmo_fill_grid.c
operators/bmo_hull.c
operators/bmo_inset.c
operators/bmo_join_triangles.c
@@ -115,7 +115,6 @@ set(SRC
intern/bmesh_operator_api.h
intern/bmesh_error.h
tools/BME_bevel.c
tools/bmesh_bevel.c
tools/bmesh_bevel.h
tools/bmesh_decimate_collapse.c

1160
source/blender/bmesh/tools/BME_bevel.c
View File

@@ -1,1160 +0,0 @@
/*
* ***** 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) 2004 Blender Foundation.
* All rights reserved.
*
* The Original Code is: all of this file.
*
* Contributor(s): Geoffrey Bantle and Levi Schooley.
*
* ***** END GPL LICENSE BLOCK *****
*/
#include <math.h>
#include "MEM_guardedalloc.h"
#include "DNA_listBase.h"
#include "DNA_meshdata_types.h"
#include "DNA_mesh_types.h"
#include "BLI_math.h"
#include "BLI_blenlib.h"
#include "BLI_ghash.h"
#include "BLI_memarena.h"
#include "BKE_editmesh.h"
#include "BKE_bmesh.h"
#include "bmesh.h"
#include "intern/bmesh_private.h"
/* BMESH_TODO
*
* Date: 2011-11-24 06:25
* Sender: Andrew Wiggin
* Status update: I have code changes to actually make basic bevel modifier work. The things that still need to be done:
* - clean up the changes
* - get bevel by weight and bevel by angles working for vertex only bevel.
* - the code uses adaptations of a couple of bmesh APIs,
* that work a little differently. for example, a join faces that doesn't just create a new face and then delete the
* original two faces and all associated loops, it extends one of the original faces to cover all the original loops
* (except for the loop on the join edge which is of course deleted). the bevel code currently requires this because it
* expects to be able to continue walking loop lists and doesn't like for loops to be deleted out from under it
* while working...
* but bmesh APIs don't do it this way because it makes it trickier to manage the interp during these operations,
* so I need to decide what to do in these cases.
*/
/* BMESH_TODO - resolve this */
#define BMESH_263_VERT_BEVEL_WORKAROUND
/* ------- Bevel code starts here -------- */
static BME_TransData_Head *BME_init_transdata(int bufsize)
{
BME_TransData_Head *td;
td = MEM_callocN(sizeof(BME_TransData_Head), "BM transdata header");
td->gh = BLI_ghash_ptr_new("BME_init_transdata gh");
td->ma = BLI_memarena_new(bufsize, "BME_TransData arena");
BLI_memarena_use_calloc(td->ma);
return td;
}
void BME_free_transdata(BME_TransData_Head *td)
{
BLI_ghash_free(td->gh, NULL, NULL);
BLI_memarena_free(td->ma);
MEM_freeN(td);
}
static BME_TransData *BME_assign_transdata(BME_TransData_Head *td, BMesh *bm, BMVert *v,
float *co, float *org, float *vec, float *loc,
float factor, float weight, float maxfactor, float *max)
{
BME_TransData *vtd;
int is_new = false;
if (v == NULL) {
return NULL;
}
if ((vtd = BLI_ghash_lookup(td->gh, v)) == NULL && bm != NULL) {
vtd = BLI_memarena_alloc(td->ma, sizeof(*vtd));
BLI_ghash_insert(td->gh, v, vtd);
td->len++;
is_new = true;
}
vtd->bm = bm;
vtd->v = v;
if (co != NULL) {
copy_v3_v3(vtd->co, co);
}
if (org == NULL && is_new) {
copy_v3_v3(vtd->org, v->co); /* default */
}
else if (org != NULL) {
copy_v3_v3(vtd->org, org);
}
if (vec != NULL) {
copy_v3_v3(vtd->vec, vec);
normalize_v3(vtd->vec);
}
vtd->loc = loc;
vtd->factor = factor;
vtd->weight = weight;
vtd->maxfactor = maxfactor;
vtd->max = max;
return vtd;
}
BME_TransData *BME_get_transdata(BME_TransData_Head *td, BMVert *v)
{
BME_TransData *vtd;
vtd = BLI_ghash_lookup(td->gh, v);
return vtd;
}
/* a hack (?) to use the transdata memarena to allocate floats for use with the max limits */
static float *BME_new_transdata_float(BME_TransData_Head *td)
{
return BLI_memarena_alloc(td->ma, sizeof(float));
}
/* ported from before bmesh merge into trunk (was called)
* problem with this is it creates 2 vert faces */
static void BME_Bevel_Dissolve_Disk(BMesh *bm, BMVert *v)
{
BMFace *f;
BMEdge *e;
bool done;
if (v->e) {
done = false;
while (!done) {
done = true;
e = v->e; /*loop the edge looking for a edge to dissolve*/
do {
f = NULL;
if (BM_edge_is_manifold(e)) {
f = bmesh_jfke(bm, e->l->f, e->l->radial_next->f, e);
}
if (f) {
done = false;
break;
}
e = bmesh_disk_edge_next(e, v);
} while (e != v->e);
}
BM_vert_collapse_edge(bm, v->e, v, true);
// bmesh_jekv(bm, v->e, v, false);
}
}
static int BME_bevel_is_split_vert(BMesh *bm, BMLoop *l)
{
/* look for verts that have already been added to the edge when
* beveling other polys; this can be determined by testing the
* vert and the edges around it for originality
*/
if (!BMO_elem_flag_test(bm, l->v, BME_BEVEL_ORIG) &&
BMO_elem_flag_test(bm, l->e, BME_BEVEL_ORIG) &&
BMO_elem_flag_test(bm, l->prev->e, BME_BEVEL_ORIG))
{
return 1;
}
return 0;
}
/* get a vector, vec, that points from v1->co to wherever makes sense to
* the bevel operation as a whole based on the relationship between v1 and v2
* (won't necessarily be a vec from v1->co to v2->co, though it probably will be);
* the return value is -1 for failure, 0 if we used vert co's, and 1 if we used transform origins */
static int BME_bevel_get_vec(float vec[3], BMVert *v1, BMVert *v2, BME_TransData_Head *td)
{
BME_TransData *vtd1, *vtd2;
vtd1 = BME_get_transdata(td, v1);
vtd2 = BME_get_transdata(td, v2);
if (!vtd1 || !vtd2) {
//printf("BME_bevel_get_vec() got called without proper BME_TransData\n");
return -1;
}
/* compare the transform origins to see if we can use the vert co's;
* if they belong to different origins, then we will use the origins to determine
* the vector */
if (compare_v3v3(vtd1->org, vtd2->org, 0.000001f)) {
sub_v3_v3v3(vec, v2->co, v1->co);
if (len_v3(vec) < 0.000001f) {
zero_v3(vec);
}
return 0;
}
else {
sub_v3_v3v3(vec, vtd2->org, vtd1->org);
if (len_v3(vec) < 0.000001f) {
zero_v3(vec);
}
return 1;
}
}
/* "Projects" a vector perpendicular to vec2 against vec1, such that
* the projected vec1 + vec2 has a min distance of 1 from the "edge" defined by vec2.
* note: the direction, is_forward, is used in conjunction with up_vec to determine
* whether this is a convex or concave corner. If it is a concave corner, it will
* be projected "backwards." If vec1 is before vec2, is_forward should be 0 (we are projecting backwards).
* vec1 is the vector to project onto (expected to be normalized)
* vec2 is the direction of projection (pointing away from vec1)
* up_vec is used for orientation (expected to be normalized)
* returns the length of the projected vector that lies along vec1 */
static float BME_bevel_project_vec(float *vec1, float *vec2, float *up_vec,
int is_forward, BME_TransData_Head *UNUSED(td))
{
float factor, vec3[3], tmp[3], c1, c2;
cross_v3_v3v3(tmp, vec1, vec2);
normalize_v3(tmp);
factor = dot_v3v3(up_vec, tmp);
if ((factor > 0 && is_forward) || (factor < 0 && !is_forward)) {
cross_v3_v3v3(vec3, vec2, tmp); /* hmm, maybe up_vec should be used instead of tmp */
}
else {
cross_v3_v3v3(vec3, tmp, vec2); /* hmm, maybe up_vec should be used instead of tmp */
}
normalize_v3(vec3);
c1 = dot_v3v3(vec3, vec1);
c2 = dot_v3v3(vec1, vec1);
if (fabsf(c1) < 0.000001f || fabsf(c2) < 0.000001f) {
factor = 0.0f;
}
else {
factor = c2 / c1;
}
return factor;
}
/* BME_bevel_split_edge() is the main math work-house; its responsibilities are:
* using the vert and the loop passed, get or make the split vert, set its coordinates
* and transform properties, and set the max limits.
* Finally, return the split vert. */
static BMVert *BME_bevel_split_edge(BMesh *bm, BMVert *v, BMVert *v1, BMLoop *l,
float *up_vec, float value, BME_TransData_Head *td)
{
BME_TransData *vtd, *vtd1, *vtd2;
BMVert *sv, *v2, *v3, *ov;
BMLoop *lv1, *lv2;
BMEdge *ne, *e1, *e2;
float maxfactor, scale, len, dis, vec1[3], vec2[3], t_up_vec[3];
int is_edge, forward, is_split_vert;
/* ov, vtd2, and is_split_vert are set but UNUSED */
(void)ov, (void)vtd2, (void)is_split_vert;
if (l == NULL) {
/* what you call operator overloading in C :)
* I wanted to use the same function for both wire edges and poly loops
* so... here we walk around edges to find the needed verts */
forward = 1;
is_split_vert = 0;
if (v->e == NULL) {
//printf("We can't split a loose vert's edge!\n");
return NULL;
}
e1 = v->e; /* we just use the first two edges */
e2 = bmesh_disk_edge_next(v->e, v);
if (e1 == e2) {
//printf("You need at least two edges to use BME_bevel_split_edge()\n");
return NULL;
}
v2 = BM_edge_other_vert(e1, v);
v3 = BM_edge_other_vert(e2, v);
if (v1 != v2 && v1 != v3) {
//printf("Error: more than 2 edges in v's disk cycle, or v1 does not share an edge with v\n");
return NULL;
}
if (v1 == v2) {
v2 = v3;
}
else {
e1 = e2;
}
ov = BM_edge_other_vert(e1, v);
sv = BM_edge_split(bm, e1, v, &ne, 0.0f);
//BME_data_interp_from_verts(bm, v, ov, sv, 0.25); /* this is technically wrong.. */
//BME_data_interp_from_faceverts(bm, v, ov, sv, 0.25);
//BME_data_interp_from_faceverts(bm, ov, v, sv, 0.25);
BME_assign_transdata(td, bm, sv, sv->co, sv->co, NULL, sv->co, 0, -1, -1, NULL); /* quick default */
BMO_elem_flag_enable(bm, sv, BME_BEVEL_BEVEL);
BMO_elem_flag_enable(bm, ne, BME_BEVEL_ORIG); /* mark edge as original, even though it isn't */
BME_bevel_get_vec(vec1, v1, v, td);
BME_bevel_get_vec(vec2, v2, v, td);
cross_v3_v3v3(t_up_vec, vec1, vec2);
normalize_v3(t_up_vec);
up_vec = t_up_vec;
}
else {
/* establish loop direction */
if (l->v == v) {
forward = 1;
lv1 = l->next;
lv2 = l->prev;
v1 = l->next->v;
v2 = l->prev->v;
}
else if (l->next->v == v) {
forward = 0;
lv1 = l;
lv2 = l->next->next;
v1 = l->v;
v2 = l->next->next->v;
}
else {
//printf("ERROR: BME_bevel_split_edge() - v must be adjacent to l\n");
return NULL;
}
if (BME_bevel_is_split_vert(bm, lv1)) {
is_split_vert = 1;
sv = v1;
v1 = forward ? l->next->next->v : l->prev->v;
}
else {
is_split_vert = 0;
ov = BM_edge_other_vert(l->e, v);
sv = BM_edge_split(bm, l->e, v, &ne, 0.0f);
//BME_data_interp_from_verts(bm, v, ov, sv, 0.25); /* this is technically wrong.. */
//BME_data_interp_from_faceverts(bm, v, ov, sv, 0.25);
//BME_data_interp_from_faceverts(bm, ov, v, sv, 0.25);
BME_assign_transdata(td, bm, sv, sv->co, sv->co, NULL, sv->co, 0, -1, -1, NULL); /* quick default */
BMO_elem_flag_enable(bm, sv, BME_BEVEL_BEVEL);
BMO_elem_flag_enable(bm, ne, BME_BEVEL_ORIG); /* mark edge as original, even though it isn't */
}
if (BME_bevel_is_split_vert(bm, lv2)) {
v2 = forward ? lv2->prev->v : lv2->next->v;
}
}
is_edge = BME_bevel_get_vec(vec1, v, v1, td); /* get the vector we will be projecting onto */
BME_bevel_get_vec(vec2, v, v2, td); /* get the vector we will be projecting parallel to */
len = normalize_v3(vec1);
vtd = BME_get_transdata(td, sv);
vtd1 = BME_get_transdata(td, v);
vtd2 = BME_get_transdata(td, v1);
if (vtd1->loc == NULL) {
/* this is a vert with data only for calculating initial weights */
if (vtd1->weight < 0.0f) {
vtd1->weight = 0.0f;
}
scale = vtd1->weight / vtd1->factor;
if (!vtd1->max) {
vtd1->max = BME_new_transdata_float(td);
*vtd1->max = -1;
}
}
else {
scale = vtd1->weight;
}
vtd->max = vtd1->max;
if (is_edge && vtd1->loc != NULL) {
maxfactor = vtd1->maxfactor;
}
else {
maxfactor = scale * BME_bevel_project_vec(vec1, vec2, up_vec, forward, td);
if (vtd->maxfactor > 0 && vtd->maxfactor < maxfactor) {
maxfactor = vtd->maxfactor;
}
}
dis = BMO_elem_flag_test(bm, v1, BME_BEVEL_ORIG) ? len / 3 : len / 2;
if (is_edge || dis > maxfactor * value) {
dis = maxfactor * value;
}
madd_v3_v3v3fl(sv->co, v->co, vec1, dis);
sub_v3_v3v3(vec1, sv->co, vtd1->org);
dis = normalize_v3(vec1);
BME_assign_transdata(td, bm, sv, vtd1->org, vtd1->org, vec1, sv->co, dis, scale, maxfactor, vtd->max);
return sv;
}
#if 0 /* UNUSED */
static float BME_bevel_set_max(BMVert *v1, BMVert *v2, float value, BME_TransData_Head *td)
{
BME_TransData *vtd1, *vtd2;
float max, fac1, fac2, vec1[3], vec2[3], vec3[3];
BME_bevel_get_vec(vec1, v1, v2, td);
vtd1 = BME_get_transdata(td, v1);
vtd2 = BME_get_transdata(td, v2);
if (vtd1->loc == NULL) {
fac1 = 0;
}
else {
copy_v3_v3(vec2, vtd1->vec);
mul_v3_fl(vec2, vtd1->factor);
if (dot_v3v3(vec1, vec1)) {
project_v3_v3v3(vec2, vec2, vec1);
fac1 = len_v3(vec2) / value;
}
else {
fac1 = 0;
}
}
if (vtd2->loc == NULL) {
fac2 = 0;
}
else {
copy_v3_v3(vec3, vtd2->vec);
mul_v3_fl(vec3, vtd2->factor);
if (dot_v3v3(vec1, vec1)) {
project_v3_v3v3(vec2, vec3, vec1);
fac2 = len_v3(vec2) / value;
}
else {
fac2 = 0;
}
}
if (fac1 || fac2) {
max = len_v3(vec1) / (fac1 + fac2);
if (vtd1->max && (*vtd1->max < 0 || max < *vtd1->max)) {
*vtd1->max = max;
}
if (vtd2->max && (*vtd2->max < 0 || max < *vtd2->max)) {
*vtd2->max = max;
}
}
else {
max = -1;
}
return max;
}
#endif
#if 0 /* UNUSED */
static BMVert *BME_bevel_wire(BMesh *bm, BMVert *v, float value, int res, int UNUSED(options), BME_TransData_Head *td)
{
BMVert *ov1, *ov2, *v1, *v2;
ov1 = BM_edge_other_vert(v->e, v);
ov2 = BM_edge_other_vert(bmesh_disk_edge_next(v->e, v), v);
/* split the edges */
v1 = BME_bevel_split_edge(bm, v, ov1, NULL, NULL, value, td);
BMO_elem_flag_enable(bm, v1, BME_BEVEL_NONMAN);
v2 = BME_bevel_split_edge(bm, v, ov2, NULL, NULL, value, td);
BMO_elem_flag_enable(bm, v2, BME_BEVEL_NONMAN);
if (value > 0.5) {
BME_bevel_set_max(v1, ov1, value, td);
BME_bevel_set_max(v2, ov2, value, td);
}
/* remove the original vert */
if (res) {
/* bmesh_jekv; */
//void BM_vert_collapse_faces(BMesh *bm, BMEdge *ke, BMVert *kv, float fac, int calcnorm) {
//hrm, why is there a fac here? it just removes a vert
BM_vert_collapse_edge(bm, v->e, v);
}
return v1;
}
#endif
static BMLoop *BME_bevel_edge(BMesh *bm, BMLoop *l, float value, int UNUSED(options),
float *up_vec, BME_TransData_Head *td)
{
BMVert *v1, *v2, *kv;
BMLoop *kl = NULL, *nl;
BMEdge *e, *ke, *se;
BMFace *f, *jf;
f = l->f;
e = l->e;
/* sanity check */
if (!BMO_elem_flag_test(bm, l->e, BME_BEVEL_BEVEL) &&
(BMO_elem_flag_test(bm, l->v, BME_BEVEL_BEVEL) || BMO_elem_flag_test(bm, l->next->v, BME_BEVEL_BEVEL)))
{
return l;
}
/* checks and operations for prev edge */
/* first, check to see if this edge was inset previously */
if (!BMO_elem_flag_test(bm, l->prev->e, BME_BEVEL_ORIG) &&
!BMO_elem_flag_test(bm, l->v, BME_BEVEL_NONMAN))
{
kl = l->prev->radial_next;
kl = (kl->v == l->v) ? kl->prev : kl->next;
kv = l->v;
}
else {
kv = NULL;
}
/* get/make the first vert to be used in SFME */
if (BMO_elem_flag_test(bm, l->v, BME_BEVEL_NONMAN)) {
v1 = l->v;
}
else { /* we'll need to split the previous edge */
v1 = BME_bevel_split_edge(bm, l->v, NULL, l->prev, up_vec, value, td);
}
/* if we need to clean up geometry... */
if (kv) {
se = l->next->e;
jf = NULL;
if (kl->v == kv) {
BM_face_split(bm, kl->f, kl->prev->v, kl->next->v, &nl, kl->prev->e, true);
ke = kl->e;
/* BMESH-TODO: jfke doesn't handle customdata */
jf = bmesh_jfke(bm, kl->prev->radial_next->f, kl->f, kl->prev->e);
BM_vert_collapse_edge(bm, ke, kv, false);
}
else {
BM_face_split(bm, kl->f, kl->next->next->v, kl->v, &nl, kl->next->e, true);
ke = kl->e;
/* BMESH-TODO: jfke doesn't handle customdata */
jf = bmesh_jfke(bm, kl->next->radial_next->f, kl->f, kl->next->e);
BM_vert_collapse_edge(bm, ke, kv, false);
}
/* find saved loop pointer */
l = se->l;
while (l->f != jf) {
l = l->radial_next;
BLI_assert(l != se->l);
}
l = l->prev;
}
/* checks and operations for the next edge */
/* first, check to see if this edge was inset previously */
if (!BMO_elem_flag_test(bm, l->next->e, BME_BEVEL_ORIG) &&
!BMO_elem_flag_test(bm, l->next->v, BME_BEVEL_NONMAN))
{
kl = l->next->radial_next;
kl = (kl->v == l->next->v) ? kl->prev : kl->next;
kv = l->next->v;
}
else {
kv = NULL;
}
/* get/make the second vert to be used in SFME */
if (BMO_elem_flag_test(bm, l->next->v, BME_BEVEL_NONMAN)) {
v2 = l->next->v;
}
else { /* we'll need to split the next edge */
v2 = BME_bevel_split_edge(bm, l->next->v, NULL, l->next, up_vec, value, td);
}
/* if we need to clean up geometry... */
if (kv) {
se = l->e;
jf = NULL;
if (kl->v == kv) {
BM_face_split(bm, kl->f, kl->prev->v, kl->next->v, &nl, kl->prev->e, true);
ke = kl->e;
/* BMESH-TODO: jfke doesn't handle customdata */
jf = bmesh_jfke(bm, kl->prev->radial_next->f, kl->f, kl->prev->e);
BM_vert_collapse_edge(bm, ke, kv, false);
}
else {
BM_face_split(bm, kl->f, kl->next->next->v, kl->v, &nl, kl->next->e, true);
ke = kl->e;
/* BMESH-TODO: jfke doesn't handle customdata */
jf = bmesh_jfke(bm, kl->next->radial_next->f, kl->f, kl->next->e);
BM_vert_collapse_edge(bm, ke, kv, false);
}
/* find saved loop pointer */
l = se->l;
while (l->f != jf) {
l = l->radial_next;
BLI_assert(l != se->l);
}
}
if (!BMO_elem_flag_test(bm, v1, BME_BEVEL_NONMAN) || !BMO_elem_flag_test(bm, v2, BME_BEVEL_NONMAN)) {
BM_face_split(bm, f, v2, v1, &l, e, true);
BMO_elem_flag_enable(bm, l->e, BME_BEVEL_BEVEL);
l = l->radial_next;
}
if (l->f != f) {
//printf("Whoops! You got something out of order in BME_bevel_edge()!\n");
}
return l;
}
static BMLoop *BME_bevel_vert(BMesh *bm, BMLoop *l, float value, int UNUSED(options),
float up_vec[3], BME_TransData_Head *td)
{
BMVert *v1, *v2;
/* BMFace *f; */ /* UNUSED */
/* get/make the first vert to be used in SFME */
/* may need to split the previous edge */
v1 = BME_bevel_split_edge(bm, l->v, NULL, l->prev, up_vec, value, td);
/* get/make the second vert to be used in SFME */
/* may need to split this edge (so move l) */
l = l->prev;
v2 = BME_bevel_split_edge(bm, l->next->v, NULL, l->next, up_vec, value, td);
l = l->next->next;
/* "cut off" this corner */
/* f = */ BM_face_split(bm, l->f, v2, v1, NULL, l->e, true);
return l;
}
/*
* BME_bevel_poly
*
* Polygon inset tool:
*
* Insets a polygon/face based on the flagss of its vertices
* and edges. Used by the bevel tool only, for now.
* The parameter "value" is the distance to inset (should be negative).
* The parameter "options" is not currently used.
*
* Returns -
* A BMFace pointer to the resulting inner face.
*/
static BMFace *BME_bevel_poly(BMesh *bm, BMFace *f, float value, int options, BME_TransData_Head *td)
{
BMLoop *l /*, *o */;
BME_TransData *vtd1, *vtd2;
float up_vec[3], vec1[3], vec2[3], vec3[3], fac1, fac2, max = -1;
int len, i;
BMIter iter;
zero_v3(up_vec);
/* find a good normal for this face (there's better ways, I'm sure) */
BM_ITER_ELEM (l, &iter, f, BM_LOOPS_OF_FACE) {
#ifdef BMESH_263_VERT_BEVEL_WORKAROUND
add_newell_cross_v3_v3v3(up_vec, l->prev->v->co, l->v->co);
#else
BME_bevel_get_vec(vec1, l->v, l->next->v, td);
BME_bevel_get_vec(vec2, l->prev->v, l->v, td);
cross_v3_v3v3(vec3, vec2, vec1);
add_v3_v3(up_vec, vec3);
#endif
}
normalize_v3(up_vec);
/* Can't use a BM_LOOPS_OF_FACE iterator here, because the loops are being modified
* and so the end condition will never hi */
for (l = BM_FACE_FIRST_LOOP(f)->prev, i = 0, len = f->len; i < len; i++, l = l->next) {
if (BMO_elem_flag_test(bm, l->e, BME_BEVEL_BEVEL) && BMO_elem_flag_test(bm, l->e, BME_BEVEL_ORIG)) {
max = 1.0f;
l = BME_bevel_edge(bm, l, value, options, up_vec, td);
}
else if (BMO_elem_flag_test(bm, l->v, BME_BEVEL_BEVEL) &&
BMO_elem_flag_test(bm, l->v, BME_BEVEL_ORIG) &&
!BMO_elem_flag_test(bm, l->prev->e, BME_BEVEL_BEVEL))
{
/* avoid making double vertices [#33438] */
BME_TransData *vtd;
vtd = BME_get_transdata(td, l->v);
if (vtd->weight == 0.0f) {
BMO_elem_flag_disable(bm, l->v, BME_BEVEL_BEVEL);
}
else {
max = 1.0f;
l = BME_bevel_vert(bm, l, value, options, up_vec, td);
}
}
}
f = l->f;
/* max pass */
if (value > 0.5f && max > 0.0f) {
max = -1;
BM_ITER_ELEM (l, &iter, f, BM_LOOPS_OF_FACE) {
if (BMO_elem_flag_test(bm, l->e, BME_BEVEL_BEVEL) || BMO_elem_flag_test(bm, l->e, BME_BEVEL_ORIG)) {
BME_bevel_get_vec(vec1, l->v, l->next->v, td);
vtd1 = BME_get_transdata(td, l->v);
vtd2 = BME_get_transdata(td, l->next->v);
if (vtd1->loc == NULL) {
fac1 = 0;
}
else {
copy_v3_v3(vec2, vtd1->vec);
mul_v3_fl(vec2, vtd1->factor);
if (dot_v3v3(vec1, vec1)) {
project_v3_v3v3(vec2, vec2, vec1);
fac1 = len_v3(vec2) / value;
}
else {
fac1 = 0;
}
}
if (vtd2->loc == NULL) {
fac2 = 0;
}
else {
copy_v3_v3(vec3, vtd2->vec);
mul_v3_fl(vec3, vtd2->factor);
if (dot_v3v3(vec1, vec1)) {
project_v3_v3v3(vec2, vec3, vec1);
fac2 = len_v3(vec2) / value;
}
else {
fac2 = 0;
}
}
if (fac1 || fac2) {
max = len_v3(vec1) / (fac1 + fac2);
if (vtd1->max && (*vtd1->max < 0 || max < *vtd1->max)) {
*vtd1->max = max;
}
if (vtd2->max && (*vtd2->max < 0 || max < *vtd2->max)) {
*vtd2->max = max;
}
}
}
}
}
/* return l->f; */
return NULL;
}
static float BME_bevel_get_angle(BMEdge *e, BMVert *v)
{
BMVert *v1, *v2;
BMLoop *l1, *l2;
float vec1[3], vec2[3], vec3[3], vec4[3];
l1 = e->l;
l2 = e->l->radial_next;
if (l1->v == v) {
v1 = l1->prev->v;
v2 = l1->next->v;
}
else {
v1 = l1->next->next->v;
v2 = l1->v;
}
sub_v3_v3v3(vec1, v1->co, v->co);
sub_v3_v3v3(vec2, v2->co, v->co);
cross_v3_v3v3(vec3, vec1, vec2);
l1 = l2;
if (l1->v == v) {
v1 = l1->prev->v;
v2 = l1->next->v;
}
else {
v1 = l1->next->next->v;
v2 = l1->v;
}
sub_v3_v3v3(vec1, v1->co, v->co);
sub_v3_v3v3(vec2, v2->co, v->co);
cross_v3_v3v3(vec4, vec2, vec1);
normalize_v3(vec3);
normalize_v3(vec4);
return dot_v3v3(vec3, vec4);
}
static float BME_bevel_get_angle_vert(BMVert *v)
{
BMIter iter;
BMLoop *l;
float n[3];
float n_tmp[3];
float angle_diff = 0.0f;
float tot_angle = 0.0f;
BM_ITER_ELEM (l, &iter, v, BM_LOOPS_OF_VERT) {
const float angle = BM_loop_calc_face_angle(l);
tot_angle += angle;
BM_loop_calc_face_normal(l, n_tmp);
madd_v3_v3fl(n, n_tmp, angle);
}
normalize_v3(n);
BM_ITER_ELEM (l, &iter, v, BM_LOOPS_OF_VERT) {
/* could cache from before */
BM_loop_calc_face_normal(l, n_tmp);
angle_diff += angle_normalized_v3v3(n, n_tmp) * BM_loop_calc_face_angle(l);
}
/* return cosf(angle_diff + 0.001f); */ /* compare with dot product */
return (angle_diff / tot_angle) * (float)(M_PI / 2.0);
}
static void BME_bevel_add_vweight(BME_TransData_Head *td, BMesh *bm, BMVert *v, float weight, float factor, int options)
{
BME_TransData *vtd;
if (BMO_elem_flag_test(bm, v, BME_BEVEL_NONMAN)) {
return;
}
BMO_elem_flag_enable(bm, v, BME_BEVEL_BEVEL);
if ((vtd = BME_get_transdata(td, v))) {
if (options & BME_BEVEL_EMIN) {
vtd->factor = 1.0;
if (vtd->weight < 0 || weight < vtd->weight) {
vtd->weight = weight;
}
}
else if (options & BME_BEVEL_EMAX) {
vtd->factor = 1.0;
if (weight > vtd->weight) {
vtd->weight = weight;
}
}
else if (vtd->weight < 0.0f) {
vtd->factor = factor;
vtd->weight = weight;
}
else {
vtd->factor += factor; /* increment number of edges with weights (will be averaged) */
vtd->weight += weight; /* accumulate all the weights */
}
}
else {
/* we'll use vtd->loc == NULL to mark that this vert is not moving */
vtd = BME_assign_transdata(td, bm, v, v->co, NULL, NULL, NULL, factor, weight, -1, NULL);
}
}
static void bevel_init_verts(BMesh *bm, int options, float angle, BME_TransData_Head *td)
{
BMVert *v;
BMIter iter;
float weight;
/* const float threshold = (options & BME_BEVEL_ANGLE) ? cosf(angle + 0.001) : 0.0f; */ /* UNUSED */
BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
weight = 0.0f;
if (!BMO_elem_flag_test(bm, v, BME_BEVEL_NONMAN)) {
/* modifiers should not use selection */
if (options & BME_BEVEL_SELECT) {
if (BM_elem_flag_test(v, BM_ELEM_SELECT)) {
weight = 1.0f;
}
}
/* bevel weight NYI */
else if (options & BME_BEVEL_WEIGHT) {
weight = BM_elem_float_data_get(&bm->vdata, v, CD_BWEIGHT);
}
else if (options & BME_BEVEL_ANGLE) {
/* dont set weight_v1/weight_v2 here, add direct */
if (BME_bevel_get_angle_vert(v) > angle) {
weight = 1.0f;
}
}
else {
weight = 1.0f;
}
if (weight > 0.0f) {
BMO_elem_flag_enable(bm, v, BME_BEVEL_BEVEL);
BME_assign_transdata(td, bm, v, v->co, v->co, NULL, NULL, 1.0, weight, -1, NULL);
}
}
}
}
static void bevel_init_edges(BMesh *bm, int options, float angle, BME_TransData_Head *td)
{
BMEdge *e;
int count;
float weight;
BMIter iter;
const float threshold = (options & BME_BEVEL_ANGLE) ? cosf(angle + 0.001f) : 0.0f;
BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
weight = 0.0f;
if (!BMO_elem_flag_test(bm, e, BME_BEVEL_NONMAN)) {
if (options & BME_BEVEL_SELECT) {
if (BM_elem_flag_test(e, BM_ELEM_SELECT)) {
weight = 1.0f;
}
}
else if (options & BME_BEVEL_WEIGHT) {
weight = BM_elem_float_data_get(&bm->edata, e, CD_BWEIGHT);
}
else if (options & BME_BEVEL_ANGLE) {
/* dont set weight_v1/weight_v2 here, add direct */
if (!BMO_elem_flag_test(bm, e->v1, BME_BEVEL_NONMAN) && BME_bevel_get_angle(e, e->v1) < threshold) {
BMO_elem_flag_enable(bm, e, BME_BEVEL_BEVEL);
BME_bevel_add_vweight(td, bm, e->v1, 1.0, 1.0, options);
}
else {
BME_bevel_add_vweight(td, bm, e->v1, 0.0, 1.0, options);
}
if (!BMO_elem_flag_test(bm, e->v2, BME_BEVEL_NONMAN) && BME_bevel_get_angle(e, e->v2) < threshold) {
BMO_elem_flag_enable(bm, e, BME_BEVEL_BEVEL);
BME_bevel_add_vweight(td, bm, e->v2, 1.0, 1.0, options);
}
else {
BME_bevel_add_vweight(td, bm, e->v2, 0.0, 1.0, options);
}
}
else {
weight = 1.0f;
}
if (weight > 0.0f) {
BMO_elem_flag_enable(bm, e, BME_BEVEL_BEVEL);
BME_bevel_add_vweight(td, bm, e->v1, weight, 1.0, options);
BME_bevel_add_vweight(td, bm, e->v2, weight, 1.0, options);
}
}
}
/* clean up edges with 2 faces that share more than one edg */
BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
if (BMO_elem_flag_test(bm, e, BME_BEVEL_BEVEL)) {
count = BM_face_share_edge_count(e->l->f, e->l->radial_next->f);
if (count > 1) BMO_elem_flag_disable(bm, e, BME_BEVEL_BEVEL);
}
}
}
static BMesh *BME_bevel_initialize(BMesh *bm, int options,
int UNUSED(defgrp_index), float angle, BME_TransData_Head *td)
{
BMVert *v /*, *v2 */;
BMEdge *e /*, *curedg */;
BMFace *f;
BMIter iter;
int /* wire, */ len;
/* tag non-manifold geometry */
BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
BMO_elem_flag_enable(bm, v, BME_BEVEL_ORIG);
if (v->e) {
BME_assign_transdata(td, bm, v, v->co, v->co, NULL, NULL, 0, -1, -1, NULL);
if (!BM_vert_is_manifold(v)) {
BMO_elem_flag_enable(bm, v, BME_BEVEL_NONMAN);
}
/* test wire ver */
len = BM_vert_edge_count(v);
if (len == 2 && BM_vert_is_wire(v))
BMO_elem_flag_disable(bm, v, BME_BEVEL_NONMAN);
}
else {
BMO_elem_flag_enable(bm, v, BME_BEVEL_NONMAN);
}
}
BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
BMO_elem_flag_enable(bm, e, BME_BEVEL_ORIG);
if (!(BM_edge_is_boundary(e) || BM_edge_is_manifold(e))) {
BMO_elem_flag_enable(bm, e->v1, BME_BEVEL_NONMAN);
BMO_elem_flag_enable(bm, e->v2, BME_BEVEL_NONMAN);
BMO_elem_flag_enable(bm, e, BME_BEVEL_NONMAN);
}
if (BMO_elem_flag_test(bm, e->v1, BME_BEVEL_NONMAN) || BMO_elem_flag_test(bm, e->v2, BME_BEVEL_NONMAN)) {
BMO_elem_flag_enable(bm, e, BME_BEVEL_NONMAN);
}
}
BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
BMO_elem_flag_enable(bm, f, BME_BEVEL_ORIG);
}
if (options & BME_BEVEL_VERT) {
bevel_init_verts(bm, options, angle, td);
}
else {
bevel_init_edges(bm, options, angle, td);
}
return bm;
}
#if 0
static BMesh *BME_bevel_reinitialize(BMesh *bm)
{
BMVert *v;
BMEdge *e;
BMFace *f;
BMIter iter;
BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
BMO_elem_flag_enable(bm, v, BME_BEVEL_ORIG);
}
BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
BMO_elem_flag_enable(bm, e, BME_BEVEL_ORIG);
}
BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
BMO_elem_flag_enable(bm, f, BME_BEVEL_ORIG);
}
return bm;
}
#endif
/**
* BME_bevel_mesh
*
* Mesh beveling tool:
*
* Bevels an entire mesh. It currently uses the flags of
* its vertices and edges to track topological changes.
* The parameter "value" is the distance to inset (should be negative).
* The parameter "options" is not currently used.
*
* \return A BMesh pointer to the BM passed as a parameter.
*/
static BMesh *BME_bevel_mesh(BMesh *bm, float value, int UNUSED(res), int options,
int UNUSED(defgrp_index), BME_TransData_Head *td)
{
BMVert *v;
BMEdge *e, *curedge;
BMLoop *l, *l2;
BMFace *f;
BMIter iter;
/* unsigned int i, len; */
/* bevel poly */
BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
if (BMO_elem_flag_test(bm, f, BME_BEVEL_ORIG)) {
BME_bevel_poly(bm, f, value, options, td);
}
}
/* get rid of beveled edge */
BM_ITER_MESH (e, &iter, bm, BM_EDGES_OF_MESH) {
if (BMO_elem_flag_test(bm, e, BME_BEVEL_BEVEL) && BMO_elem_flag_test(bm, e, BME_BEVEL_ORIG)) {
BM_faces_join_pair(bm, e->l->f, e->l->radial_next->f, e, true);
}
}
/* link up corners and cli */
BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
if (BMO_elem_flag_test(bm, v, BME_BEVEL_ORIG) && BMO_elem_flag_test(bm, v, BME_BEVEL_BEVEL)) {
curedge = v->e;
do {
l = curedge->l;
l2 = l->radial_next;
if (l->v != v) l = l->next;
if (l2->v != v) l2 = l2->next;
if (l->f->len > 3)
BM_face_split(bm, l->f, l->next->v, l->prev->v, &l, l->e, true); /* clip this corner off */
if (l2->f->len > 3)
BM_face_split(bm, l2->f, l2->next->v, l2->prev->v, &l, l2->e, true); /* clip this corner off */
curedge = bmesh_disk_edge_next(curedge, v);
} while (curedge != v->e);
BME_Bevel_Dissolve_Disk(bm, v);
}
}
#ifdef DEBUG
/* Debug print, remov */
BM_ITER_MESH (f, &iter, bm, BM_FACES_OF_MESH) {
if (f->len == 2) {
printf("%s: warning, 2 edge face\n", __func__);
}
}
#endif
return bm;
}
BMesh *BME_bevel(BMesh *bm, float value, int res, int options, int defgrp_index, float angle,
BME_TransData_Head **rtd)
{
BMVert *v;
BMIter iter;
BME_TransData_Head *td;
BME_TransData *vtd;
int i;
double fac = 1.0, d;
td = BME_init_transdata(BLI_MEMARENA_STD_BUFSIZE);
/* recursion math courtesy of Martin Poirier (theeth) */
for (i = 0; i < res - 1; i++) {
if (i == 0) fac += 1.0 / 3.0;
else fac += 1.0 / (3.0 * i * 2.0);
}
d = 1.0 / fac;
BM_mesh_elem_toolflags_ensure(bm);
for (i = 0; i < res || (res == 0 && i == 0); i++) {
BMO_push(bm, NULL);
BME_bevel_initialize(bm, options, defgrp_index, angle, td);
//if (i != 0) BME_bevel_reinitialize(bm);
bmesh_edit_begin(bm, 0);
BME_bevel_mesh(bm, (float)d, res, options, defgrp_index, td);
bmesh_edit_end(bm, 0);
d /= (i == 0) ? 3.0 : 2.0;
BMO_pop(bm);
}
/* interactive preview? */
if (rtd) {
*rtd = td;
return bm;
}
/* otherwise apply transforms */
BM_ITER_MESH (v, &iter, bm, BM_VERTS_OF_MESH) {
if ((vtd = BME_get_transdata(td, v))) {
if (vtd->max && (*vtd->max > 0 && value > *vtd->max)) {
d = *vtd->max;
}
else {
d = value;
}
madd_v3_v3v3fl(v->co, vtd->org, vtd->vec, vtd->factor * (float)d);
}
}
BME_free_transdata(td);
return bm;
}

1
source/blender/editors/transform/transform.c
View File

@@ -61,7 +61,6 @@
#include "BLI_linklist.h"
#include "BKE_nla.h"
#include "BKE_bmesh.h"
#include "BKE_editmesh_bvh.h"
#include "BKE_context.h"
#include "BKE_constraint.h"

1
source/blender/editors/transform/transform_conversions.c
View File

@@ -66,7 +66,6 @@
#include "BKE_DerivedMesh.h"
#include "BKE_action.h"
#include "BKE_armature.h"
#include "BKE_bmesh.h"
#include "BKE_constraint.h"
#include "BKE_context.h"
#include "BKE_curve.h"

23
source/blender/makesdna/DNA_modifier_types.h
View File

@@ -281,16 +281,23 @@ typedef struct BevelModifierData {
short val_flags; /* flags used to interpret the bevel value */
short lim_flags; /* flags to tell the tool how to limit the bevel */
short e_flags; /* flags to direct how edge weights are applied to verts */
float bevel_angle; /* if the BME_BEVEL_ANGLE is set, this will be how "sharp" an edge must be before it gets beveled */
char defgrp_name[64]; /* if the BME_BEVEL_VWEIGHT option is set, this will be the name of the vert group, MAX_VGROUP_NAME */
float bevel_angle; /* if the MOD_BEVEL_ANGLE is set, this will be how "sharp" an edge must be before it gets beveled */
char defgrp_name[64]; /* if the MOD_BEVEL_VWEIGHT option is set, this will be the name of the vert group, MAX_VGROUP_NAME */
} BevelModifierData;
typedef struct BMeshModifierData {
ModifierData modifier;
float pad;
int type;
} BMeshModifierData;
#define MOD_BEVEL_VERT (1 << 1)
// #define MOD_BEVEL_RADIUS (1 << 2)
#define MOD_BEVEL_ANGLE (1 << 3)
#define MOD_BEVEL_WEIGHT (1 << 4)
#define MOD_BEVEL_VGROUP (1 << 5)
#define MOD_BEVEL_EMIN (1 << 7)
#define MOD_BEVEL_EMAX (1 << 8)
// #define MOD_BEVEL_RUNNING (1 << 9)
// #define MOD_BEVEL_RES (1 << 10)
// #define MOD_BEVEL_EVEN (1 << 11) /* this is a new setting not related to old (trunk bmesh bevel code) but adding
// * here because they are mixed - campbell */
// #define MOD_BEVEL_DIST (1 << 12) /* same as above */
#define MOD_BEVEL_OVERLAP_OK (1 << 13)
/* Smoke modifier flags */

25
source/blender/makesrna/intern/rna_modifier.c
View File

@@ -43,7 +43,6 @@
#include "BLF_translation.h"
#include "BKE_animsys.h"
#include "BKE_bmesh.h" /* For BevelModifierData */
#include "BKE_dynamicpaint.h"
#include "BKE_multires.h"
#include "BKE_smoke.h" /* For smokeModifier_free & smokeModifier_createType */
@@ -2300,10 +2299,10 @@ static void rna_def_modifier_bevel(BlenderRNA *brna)
static EnumPropertyItem prop_limit_method_items[] = {
{0, "NONE", 0, "None", "Bevel the entire mesh by a constant amount"},
{BME_BEVEL_ANGLE, "ANGLE", 0, "Angle", "Only bevel edges with sharp enough angles between faces"},
{BME_BEVEL_WEIGHT, "WEIGHT", 0, "Weight",
{MOD_BEVEL_ANGLE, "ANGLE", 0, "Angle", "Only bevel edges with sharp enough angles between faces"},
{MOD_BEVEL_WEIGHT, "WEIGHT", 0, "Weight",
"Use bevel weights to determine how much bevel is applied in edge mode"},
{BME_BEVEL_VGROUP, "VGROUP", 0, "Vertex Group",
{MOD_BEVEL_VGROUP, "VGROUP", 0, "Vertex Group",
"Use vertex group weights to determine how much bevel is applied in vertex mode"},
{0, NULL, 0, NULL, NULL}
};
@@ -2311,8 +2310,8 @@ static void rna_def_modifier_bevel(BlenderRNA *brna)
/* TO BE DEPRECATED */
static EnumPropertyItem prop_edge_weight_method_items[] = {
{0, "AVERAGE", 0, "Average", ""},
{BME_BEVEL_EMIN, "SHARPEST", 0, "Sharpest", ""},
{BME_BEVEL_EMAX, "LARGEST", 0, "Largest", ""},
{MOD_BEVEL_EMIN, "SHARPEST", 0, "Sharpest", ""},
{MOD_BEVEL_EMAX, "LARGEST", 0, "Largest", ""},
{0, NULL, 0, NULL, NULL}
};
@@ -2335,7 +2334,7 @@ static void rna_def_modifier_bevel(BlenderRNA *brna)
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "use_only_vertices", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flags", BME_BEVEL_VERT);
RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_BEVEL_VERT);
RNA_def_property_ui_text(prop, "Only Vertices", "Bevel verts/corners, not edges");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
@@ -2352,22 +2351,14 @@ static void rna_def_modifier_bevel(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Edge Weight Method", "What edge weight to use for weighting a vertex");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
#if 1 /* expose as radians */
prop = RNA_def_property(srna, "angle_limit", PROP_FLOAT, PROP_ANGLE);
RNA_def_property_float_funcs(prop, "rna_BevelModifier_angle_limit_get",
"rna_BevelModifier_angle_limit_set", NULL);
RNA_def_property_range(prop, 0, DEG2RAD(180));
RNA_def_property_ui_range(prop, 0, DEG2RAD(180), 100, 2);
#else
prop = RNA_def_property(srna, "angle_limit", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "bevel_angle");
RNA_def_property_range(prop, 0, 180);
RNA_def_property_ui_range(prop, 0, 180, 100, 2);
#endif
RNA_def_property_ui_text(prop, "Angle", "Angle above which to bevel edges");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
#ifdef USE_BM_BEVEL_OP_AS_MOD
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
RNA_def_property_string_sdna(prop, NULL, "defgrp_name");
RNA_def_property_ui_text(prop, "Vertex Group", "Vertex group name");
@@ -2375,11 +2366,9 @@ static void rna_def_modifier_bevel(BlenderRNA *brna)
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "use_clamp_overlap", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_negative_sdna(prop, NULL, "flags", BME_BEVEL_OVERLAP_OK);
RNA_def_property_boolean_negative_sdna(prop, NULL, "flags", MOD_BEVEL_OVERLAP_OK);
RNA_def_property_ui_text(prop, "Clamp Overlap", "Clamp the width to avoid overlap");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
#endif
}
static void rna_def_modifier_shrinkwrap(BlenderRNA *brna)

55
source/blender/modifiers/intern/MOD_bevel.c
View File

@@ -42,7 +42,6 @@
#include "BKE_deform.h"
#include "BKE_modifier.h"
#include "BKE_mesh.h"
#include "BKE_bmesh.h" /* only for defines */
#include "MOD_util.h"
@@ -91,8 +90,6 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
return dataMask;
}
#ifdef USE_BM_BEVEL_OP_AS_MOD
/*
* This calls the new bevel code (added since 2.64)
*/
@@ -110,13 +107,13 @@ static DerivedMesh *applyModifier(ModifierData *md, struct Object *ob,
MDeformVert *dvert = NULL;
BevelModifierData *bmd = (BevelModifierData *) md;
const float threshold = cosf((bmd->bevel_angle + 0.00001f) * (float)M_PI / 180.0f);
const bool vertex_only = (bmd->flags & BME_BEVEL_VERT) != 0;
const bool do_clamp = !(bmd->flags & BME_BEVEL_OVERLAP_OK);
const bool vertex_only = (bmd->flags & MOD_BEVEL_VERT) != 0;
const bool do_clamp = !(bmd->flags & MOD_BEVEL_OVERLAP_OK);
bm = DM_to_bmesh(dm, true);
if (vertex_only) {
if ((bmd->lim_flags & BME_BEVEL_VGROUP) && bmd->defgrp_name[0]) {
if ((bmd->lim_flags & MOD_BEVEL_VGROUP) && bmd->defgrp_name[0]) {
modifier_get_vgroup(ob, dm, bmd->defgrp_name, &dvert, &vgroup);
}
BM_ITER_MESH(v, &iter, bm, BM_VERTS_OF_MESH) {
@@ -131,7 +128,7 @@ static DerivedMesh *applyModifier(ModifierData *md, struct Object *ob,
BM_elem_flag_enable(v, BM_ELEM_TAG);
}
}
else if (bmd->lim_flags & BME_BEVEL_ANGLE) {
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;
@@ -148,7 +145,7 @@ static DerivedMesh *applyModifier(ModifierData *md, struct Object *ob,
/* 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 & BME_BEVEL_WEIGHT) {
if (bmd->lim_flags & MOD_BEVEL_WEIGHT) {
weight = BM_elem_float_data_get(&bm->edata, e, CD_BWEIGHT);
if (weight == 0.0f)
continue;
@@ -161,7 +158,7 @@ static DerivedMesh *applyModifier(ModifierData *md, struct Object *ob,
}
BM_mesh_bevel(bm, bmd->value, bmd->res,
vertex_only, bmd->lim_flags & BME_BEVEL_WEIGHT, do_clamp,
vertex_only, bmd->lim_flags & MOD_BEVEL_WEIGHT, do_clamp,
dvert, vgroup);
result = CDDM_from_bmesh(bm, TRUE);
@@ -176,46 +173,6 @@ static DerivedMesh *applyModifier(ModifierData *md, struct Object *ob,
return result;
}
#else /* from trunk, see note above */
static DerivedMesh *applyModifier(ModifierData *md, Object *UNUSED(ob),
DerivedMesh *derivedData,
ModifierApplyFlag UNUSED(flag))
{
DerivedMesh *result;
BMesh *bm;
/*bDeformGroup *def;*/
int /*i,*/ options, defgrp_index = -1;
BevelModifierData *bmd = (BevelModifierData *) md;
options = bmd->flags | bmd->val_flags | bmd->lim_flags | bmd->e_flags;
#if 0
if ((options & BME_BEVEL_VWEIGHT) && bmd->defgrp_name[0]) {
defgrp_index = defgroup_name_index(ob, bmd->defgrp_name);
if (defgrp_index == -1) {
options &= ~BME_BEVEL_VWEIGHT;
}
}
#endif
bm = DM_to_bmesh(derivedData);
BME_bevel(bm, bmd->value, bmd->res, options, defgrp_index, DEG2RADF(bmd->bevel_angle), NULL);
result = CDDM_from_bmesh(bm, TRUE);
BM_mesh_free(bm);
/* until we allow for dirty normal flag, always calc,
* note: calculating on the CDDM is faster then the BMesh equivalent */
result->dirty |= DM_DIRTY_NORMALS;
return result;
}
#endif
ModifierTypeInfo modifierType_Bevel = {
/* name */ "Bevel",
/* structName */ "BevelModifierData",