archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity
This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.
Files
88f4087a574c2f74b3414d47dab8be97cce4bc84
blender-archive/source/blender/bmesh/operators/extrudeops.c

312 lines
7.4 KiB
C
Raw Normal View History

Replaced unified extrude edges/faces code (the stuff specificaly for edges/faces,extrudeflag_edgess, not the entire extrude system) with a bmesh version. This stress-tested the operator api, and I had to code some new stuff,including: * An api to iterate over Mapping slots and array slots. It's modeled after the normal iterator api. * The ability to copy mapping slots. * More mapping functions. * In addition to being able to flag elements in a buffer, you can now unflag them (much clearer then passing in ~flag I think). The extrude edge/faces code has multiple layers. At the top level is a funtion in editmesh_lib.c, which takes care of selection, handles mirror modifiers, etc. It calls the extrude operator, which in turns calls split, which calls dupe/del. Note that split needed a slot to exclude things from being deleting (e.g. when extruding a single isolated face). The basic idea (reflected in original design of split/dupe/del by Briggs) is to use the split function to do the heavy work of extrude. split spits out new geometry and mappings from boundary edges, for extrude (it should also spit out other mappings, but that's for later). Briggs: you may want to look over this, hopefully I didn't do anything too evil. I probably should spend some time going over the 2.5 mesh operators and cleaning them up, splitting ones that need splitting, etc, and in general getting them to work properly.
2009-02-12 16:59:51 +00:00
#include "MEM_guardedalloc.h"
more syncing with trunk, also cleared many warnings with gcc4.6
2011-05-09 04:06:48 +00:00
#include "BLI_utildefines.h"
Replaced unified extrude edges/faces code (the stuff specificaly for edges/faces,extrudeflag_edgess, not the entire extrude system) with a bmesh version. This stress-tested the operator api, and I had to code some new stuff,including: * An api to iterate over Mapping slots and array slots. It's modeled after the normal iterator api. * The ability to copy mapping slots. * More mapping functions. * In addition to being able to flag elements in a buffer, you can now unflag them (much clearer then passing in ~flag I think). The extrude edge/faces code has multiple layers. At the top level is a funtion in editmesh_lib.c, which takes care of selection, handles mirror modifiers, etc. It calls the extrude operator, which in turns calls split, which calls dupe/del. Note that split needed a slot to exclude things from being deleting (e.g. when extruding a single isolated face). The basic idea (reflected in original design of split/dupe/del by Briggs) is to use the split function to do the heavy work of extrude. split spits out new geometry and mappings from boundary edges, for extrude (it should also spit out other mappings, but that's for later). Briggs: you may want to look over this, hopefully I didn't do anything too evil. I probably should spend some time going over the 2.5 mesh operators and cleaning them up, splitting ones that need splitting, etc, and in general getting them to work properly.
2009-02-12 16:59:51 +00:00
#include "BLI_ghash.h"
#include "BLI_memarena.h"
#include "BLI_blenlib.h"
did math lib conversion, equivilent to merge with trunk/2.5 at r24464
2009-11-23 14:41:22 +00:00
#include "BLI_math.h"
part 1 of cleaning up my little array macro library to be a formal API. also removed some extraneous selection calls from loopcut.c.
2009-09-17 23:05:33 +00:00
#include "BLI_array.h"
Replaced unified extrude edges/faces code (the stuff specificaly for edges/faces,extrudeflag_edgess, not the entire extrude system) with a bmesh version. This stress-tested the operator api, and I had to code some new stuff,including: * An api to iterate over Mapping slots and array slots. It's modeled after the normal iterator api. * The ability to copy mapping slots. * More mapping functions. * In addition to being able to flag elements in a buffer, you can now unflag them (much clearer then passing in ~flag I think). The extrude edge/faces code has multiple layers. At the top level is a funtion in editmesh_lib.c, which takes care of selection, handles mirror modifiers, etc. It calls the extrude operator, which in turns calls split, which calls dupe/del. Note that split needed a slot to exclude things from being deleting (e.g. when extruding a single isolated face). The basic idea (reflected in original design of split/dupe/del by Briggs) is to use the split function to do the heavy work of extrude. split spits out new geometry and mappings from boundary edges, for extrude (it should also spit out other mappings, but that's for later). Briggs: you may want to look over this, hopefully I didn't do anything too evil. I probably should spend some time going over the 2.5 mesh operators and cleaning them up, splitting ones that need splitting, etc, and in general getting them to work properly.
2009-02-12 16:59:51 +00:00
#include "bmesh.h"
wip commit; DO NOT USE. almost done with phase 1 of this restructuring, basically just some things that needed to be done before trunk (and some things that needed to be started, but can be finished much later).
2010-07-14 22:06:10 +00:00
#include "bmesh_private.h"
Replaced unified extrude edges/faces code (the stuff specificaly for edges/faces,extrudeflag_edgess, not the entire extrude system) with a bmesh version. This stress-tested the operator api, and I had to code some new stuff,including: * An api to iterate over Mapping slots and array slots. It's modeled after the normal iterator api. * The ability to copy mapping slots. * More mapping functions. * In addition to being able to flag elements in a buffer, you can now unflag them (much clearer then passing in ~flag I think). The extrude edge/faces code has multiple layers. At the top level is a funtion in editmesh_lib.c, which takes care of selection, handles mirror modifiers, etc. It calls the extrude operator, which in turns calls split, which calls dupe/del. Note that split needed a slot to exclude things from being deleting (e.g. when extruding a single isolated face). The basic idea (reflected in original design of split/dupe/del by Briggs) is to use the split function to do the heavy work of extrude. split spits out new geometry and mappings from boundary edges, for extrude (it should also spit out other mappings, but that's for later). Briggs: you may want to look over this, hopefully I didn't do anything too evil. I probably should spend some time going over the 2.5 mesh operators and cleaning them up, splitting ones that need splitting, etc, and in general getting them to work properly.
2009-02-12 16:59:51 +00:00
#include "bmesh_operators_private.h"
Brought Extrude all the way back. The contextual menu works, as does only edges and individual faces extrude (individual vert extrude already did). Note that I need to port this, after we all figure out how to handle operators with variable transform follow-ons. I also implemented the merge->collapse function, which is currently accessable under ctrl->v, Bmesh Test Operator. I still need to implement the other merge modes, and properly hook everything into the merge menu tool, which I plan on doing soon (tomorrow hopefully). The cool thing about the collapse tool, is not only does it handle (all) UV layers, it handles vcols as well. To do this, I had to add a few math functions to the customdata API, which seem to be working well.
2009-08-11 07:49:35 +00:00
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
Replaced unified extrude edges/faces code (the stuff specificaly for edges/faces,extrudeflag_edgess, not the entire extrude system) with a bmesh version. This stress-tested the operator api, and I had to code some new stuff,including: * An api to iterate over Mapping slots and array slots. It's modeled after the normal iterator api. * The ability to copy mapping slots. * More mapping functions. * In addition to being able to flag elements in a buffer, you can now unflag them (much clearer then passing in ~flag I think). The extrude edge/faces code has multiple layers. At the top level is a funtion in editmesh_lib.c, which takes care of selection, handles mirror modifiers, etc. It calls the extrude operator, which in turns calls split, which calls dupe/del. Note that split needed a slot to exclude things from being deleting (e.g. when extruding a single isolated face). The basic idea (reflected in original design of split/dupe/del by Briggs) is to use the split function to do the heavy work of extrude. split spits out new geometry and mappings from boundary edges, for extrude (it should also spit out other mappings, but that's for later). Briggs: you may want to look over this, hopefully I didn't do anything too evil. I probably should spend some time going over the 2.5 mesh operators and cleaning them up, splitting ones that need splitting, etc, and in general getting them to work properly.
2009-02-12 16:59:51 +00:00
#define EXT_INPUT 1
#define EXT_KEEP 2
extrude uses dupe/delete rather then split, and it detects when to not delete geometry (though this could be smarter in the future). also BMO_pop had two lines out of order, which was causing flags layer to not always be freed when they should.
2009-02-15 00:47:19 +00:00
#define EXT_DEL 4
Replaced unified extrude edges/faces code (the stuff specificaly for edges/faces,extrudeflag_edgess, not the entire extrude system) with a bmesh version. This stress-tested the operator api, and I had to code some new stuff,including: * An api to iterate over Mapping slots and array slots. It's modeled after the normal iterator api. * The ability to copy mapping slots. * More mapping functions. * In addition to being able to flag elements in a buffer, you can now unflag them (much clearer then passing in ~flag I think). The extrude edge/faces code has multiple layers. At the top level is a funtion in editmesh_lib.c, which takes care of selection, handles mirror modifiers, etc. It calls the extrude operator, which in turns calls split, which calls dupe/del. Note that split needed a slot to exclude things from being deleting (e.g. when extruding a single isolated face). The basic idea (reflected in original design of split/dupe/del by Briggs) is to use the split function to do the heavy work of extrude. split spits out new geometry and mappings from boundary edges, for extrude (it should also spit out other mappings, but that's for later). Briggs: you may want to look over this, hopefully I didn't do anything too evil. I probably should spend some time going over the 2.5 mesh operators and cleaning them up, splitting ones that need splitting, etc, and in general getting them to work properly.
2009-02-12 16:59:51 +00:00
Brought Extrude all the way back. The contextual menu works, as does only edges and individual faces extrude (individual vert extrude already did). Note that I need to port this, after we all figure out how to handle operators with variable transform follow-ons. I also implemented the merge->collapse function, which is currently accessable under ctrl->v, Bmesh Test Operator. I still need to implement the other merge modes, and properly hook everything into the merge menu tool, which I plan on doing soon (tomorrow hopefully). The cool thing about the collapse tool, is not only does it handle (all) UV layers, it handles vcols as well. To do this, I had to add a few math functions to the customdata API, which seem to be working well.
2009-08-11 07:49:35 +00:00
void bmesh_extrude_face_indiv_exec(BMesh *bm, BMOperator *op)
{
BMOIter siter;
BMIter liter, liter2;
BMFace *f, *f2, *f3;
BMLoop *l, *l2, *l3, *l4;
BMEdge **edges = NULL, *e, *laste;
BMVert *v, *lastv, *firstv;
part 1 of cleaning up my little array macro library to be a formal API. also removed some extraneous selection calls from loopcut.c.
2009-09-17 23:05:33 +00:00
BLI_array_declare(edges);
Brought Extrude all the way back. The contextual menu works, as does only edges and individual faces extrude (individual vert extrude already did). Note that I need to port this, after we all figure out how to handle operators with variable transform follow-ons. I also implemented the merge->collapse function, which is currently accessable under ctrl->v, Bmesh Test Operator. I still need to implement the other merge modes, and properly hook everything into the merge menu tool, which I plan on doing soon (tomorrow hopefully). The cool thing about the collapse tool, is not only does it handle (all) UV layers, it handles vcols as well. To do this, I had to add a few math functions to the customdata API, which seem to be working well.
2009-08-11 07:49:35 +00:00
int i;
BMO_ITER(f, &siter, bm, op, "faces", BM_FACE) {
part 1 of cleaning up my little array macro library to be a formal API. also removed some extraneous selection calls from loopcut.c.
2009-09-17 23:05:33 +00:00
BLI_array_empty(edges);
Brought Extrude all the way back. The contextual menu works, as does only edges and individual faces extrude (individual vert extrude already did). Note that I need to port this, after we all figure out how to handle operators with variable transform follow-ons. I also implemented the merge->collapse function, which is currently accessable under ctrl->v, Bmesh Test Operator. I still need to implement the other merge modes, and properly hook everything into the merge menu tool, which I plan on doing soon (tomorrow hopefully). The cool thing about the collapse tool, is not only does it handle (all) UV layers, it handles vcols as well. To do this, I had to add a few math functions to the customdata API, which seem to be working well.
2009-08-11 07:49:35 +00:00
i = 0;
firstv = lastv = NULL;
BM_ITER(l, &liter, bm, BM_LOOPS_OF_FACE, f) {
part 1 of cleaning up my little array macro library to be a formal API. also removed some extraneous selection calls from loopcut.c.
2009-09-17 23:05:33 +00:00
BLI_array_growone(edges);
Brought Extrude all the way back. The contextual menu works, as does only edges and individual faces extrude (individual vert extrude already did). Note that I need to port this, after we all figure out how to handle operators with variable transform follow-ons. I also implemented the merge->collapse function, which is currently accessable under ctrl->v, Bmesh Test Operator. I still need to implement the other merge modes, and properly hook everything into the merge menu tool, which I plan on doing soon (tomorrow hopefully). The cool thing about the collapse tool, is not only does it handle (all) UV layers, it handles vcols as well. To do this, I had to add a few math functions to the customdata API, which seem to be working well.
2009-08-11 07:49:35 +00:00
v = BM_Make_Vert(bm, l->v->co, NULL);
BM_Copy_Attributes(bm, bm, l->v, v);
if (lastv) {
e = BM_Make_Edge(bm, lastv, v, l->e, 0);
edges[i++] = e;
}
lastv = v;
laste = l->e;
if (!firstv) firstv = v;
}
part 1 of cleaning up my little array macro library to be a formal API. also removed some extraneous selection calls from loopcut.c.
2009-09-17 23:05:33 +00:00
BLI_array_growone(edges);
Brought Extrude all the way back. The contextual menu works, as does only edges and individual faces extrude (individual vert extrude already did). Note that I need to port this, after we all figure out how to handle operators with variable transform follow-ons. I also implemented the merge->collapse function, which is currently accessable under ctrl->v, Bmesh Test Operator. I still need to implement the other merge modes, and properly hook everything into the merge menu tool, which I plan on doing soon (tomorrow hopefully). The cool thing about the collapse tool, is not only does it handle (all) UV layers, it handles vcols as well. To do this, I had to add a few math functions to the customdata API, which seem to be working well.
2009-08-11 07:49:35 +00:00
e = BM_Make_Edge(bm, v, firstv, laste, 0);
edges[i++] = e;
BMO_SetFlag(bm, f, EXT_DEL);
f2 = BM_Make_Ngon(bm, edges[0]->v1, edges[0]->v2, edges, f->len, 0);
BMO_SetFlag(bm, f2, EXT_KEEP);
BM_Copy_Attributes(bm, bm, f, f2);
l2 = BMIter_New(&liter2, bm, BM_LOOPS_OF_FACE, f2);
BM_ITER(l, &liter, bm, BM_LOOPS_OF_FACE, f) {
BM_Copy_Attributes(bm, bm, l, l2);
wip commit; DO NOT USE. almost done with phase 1 of this restructuring, basically just some things that needed to be done before trunk (and some things that needed to be started, but can be finished much later).
2010-07-14 22:06:10 +00:00
l3 = l->next;
l4 = l2->next;
Brought Extrude all the way back. The contextual menu works, as does only edges and individual faces extrude (individual vert extrude already did). Note that I need to port this, after we all figure out how to handle operators with variable transform follow-ons. I also implemented the merge->collapse function, which is currently accessable under ctrl->v, Bmesh Test Operator. I still need to implement the other merge modes, and properly hook everything into the merge menu tool, which I plan on doing soon (tomorrow hopefully). The cool thing about the collapse tool, is not only does it handle (all) UV layers, it handles vcols as well. To do this, I had to add a few math functions to the customdata API, which seem to be working well.
2009-08-11 07:49:35 +00:00
f3 = BM_Make_QuadTri(bm, l3->v, l4->v, l2->v, l->v, f, 0);
wip commit; DO NOT USE. almost done with phase 1 of this restructuring, basically just some things that needed to be done before trunk (and some things that needed to be started, but can be finished much later).
2010-07-14 22:06:10 +00:00
BM_Copy_Attributes(bm, bm, l->next, bm_firstfaceloop(f3));
BM_Copy_Attributes(bm, bm, l->next, bm_firstfaceloop(f3)->next);
BM_Copy_Attributes(bm, bm, l, bm_firstfaceloop(f3)->next->next);
BM_Copy_Attributes(bm, bm, l, bm_firstfaceloop(f3)->next->next->next);
Brought Extrude all the way back. The contextual menu works, as does only edges and individual faces extrude (individual vert extrude already did). Note that I need to port this, after we all figure out how to handle operators with variable transform follow-ons. I also implemented the merge->collapse function, which is currently accessable under ctrl->v, Bmesh Test Operator. I still need to implement the other merge modes, and properly hook everything into the merge menu tool, which I plan on doing soon (tomorrow hopefully). The cool thing about the collapse tool, is not only does it handle (all) UV layers, it handles vcols as well. To do this, I had to add a few math functions to the customdata API, which seem to be working well.
2009-08-11 07:49:35 +00:00
l2 = BMIter_Step(&liter2);
}
}
BMO_CallOpf(bm, "del geom=%ff context=%d", EXT_DEL, DEL_ONLYFACES);
BMO_Flag_To_Slot(bm, op, "faceout", EXT_KEEP, BM_FACE);
}
void bmesh_extrude_onlyedge_exec(BMesh *bm, BMOperator *op)
{
BMOIter siter;
BMOperator dupeop;
BMVert *v1, *v2, *v3, *v4;
BMEdge *e, *e2;
BMFace *f;
BMO_ITER(e, &siter, bm, op, "edges", BM_EDGE) {
BMO_SetFlag(bm, e, EXT_INPUT);
BMO_SetFlag(bm, e->v1, EXT_INPUT);
BMO_SetFlag(bm, e->v2, EXT_INPUT);
}
BMO_InitOpf(bm, &dupeop, "dupe geom=%fve", EXT_INPUT);
BMO_Exec_Op(bm, &dupeop);
e = BMO_IterNew(&siter, bm, &dupeop, "boundarymap", 0);
for (; e; e=BMO_IterStep(&siter)) {
e2 = BMO_IterMapVal(&siter);
e2 = *(BMEdge**)e2;
wip commit; DO NOT USE. almost done with phase 1 of this restructuring, basically just some things that needed to be done before trunk (and some things that needed to be started, but can be finished much later).
2010-07-14 22:06:10 +00:00
if (e->l && e->v1 != e->l->v) {
Brought Extrude all the way back. The contextual menu works, as does only edges and individual faces extrude (individual vert extrude already did). Note that I need to port this, after we all figure out how to handle operators with variable transform follow-ons. I also implemented the merge->collapse function, which is currently accessable under ctrl->v, Bmesh Test Operator. I still need to implement the other merge modes, and properly hook everything into the merge menu tool, which I plan on doing soon (tomorrow hopefully). The cool thing about the collapse tool, is not only does it handle (all) UV layers, it handles vcols as well. To do this, I had to add a few math functions to the customdata API, which seem to be working well.
2009-08-11 07:49:35 +00:00
v1 = e->v1;
v2 = e->v2;
v3 = e2->v2;
v4 = e2->v1;
} else {
v1 = e2->v1;
v2 = e2->v2;
v3 = e->v2;
v4 = e->v1;
}
/*not sure what to do about example face, pass NULL for now.*/
f = BM_Make_QuadTri(bm, v1, v2, v3, v4, NULL, 0);
if (BMO_TestFlag(bm, e, EXT_INPUT))
e = e2;
BMO_SetFlag(bm, f, EXT_KEEP);
BMO_SetFlag(bm, e, EXT_KEEP);
BMO_SetFlag(bm, e->v1, EXT_KEEP);
BMO_SetFlag(bm, e->v2, EXT_KEEP);
}
BMO_Finish_Op(bm, &dupeop);
BMO_Flag_To_Slot(bm, op, "geomout", EXT_KEEP, BM_ALL);
}
some stability stuff related to undo, and more extrude stuff works
2009-05-19 00:33:54 +00:00
void extrude_vert_indiv_exec(BMesh *bm, BMOperator *op)
{
BMOIter siter;
BMVert *v, *dupev;
BMEdge *e;
Array modifier is now implemented using bmesh (though it's not completely feature-complete yet). I ported over the remove doubles code from the old bmesh branch for this, and split it into two bmops, "Weld Verts" and "Remove Doubles". Weld verts welds specific verts together, while remove doubles finds doubles and welds them. I also reverted the hotkey change I made earlier.
2009-06-23 05:35:49 +00:00
v = BMO_IterNew(&siter, bm, op, "verts", BM_VERT);
some stability stuff related to undo, and more extrude stuff works
2009-05-19 00:33:54 +00:00
for (; v; v=BMO_IterStep(&siter)) {
dupev = BM_Make_Vert(bm, v->co, NULL);
merge with/from trunk at r35190
2011-02-27 06:19:40 +00:00
copy_v3_v3(dupev->no, v->no);
some stability stuff related to undo, and more extrude stuff works
2009-05-19 00:33:54 +00:00
BM_Copy_Attributes(bm, bm, v, dupev);
e = BM_Make_Edge(bm, v, dupev, NULL, 0);
BMO_SetFlag(bm, e, EXT_KEEP);
BMO_SetFlag(bm, dupev, EXT_KEEP);
}
BMO_Flag_To_Slot(bm, op, "vertout", EXT_KEEP, BM_VERT);
BMO_Flag_To_Slot(bm, op, "edgeout", EXT_KEEP, BM_EDGE);
}
Replaced unified extrude edges/faces code (the stuff specificaly for edges/faces,extrudeflag_edgess, not the entire extrude system) with a bmesh version. This stress-tested the operator api, and I had to code some new stuff,including: * An api to iterate over Mapping slots and array slots. It's modeled after the normal iterator api. * The ability to copy mapping slots. * More mapping functions. * In addition to being able to flag elements in a buffer, you can now unflag them (much clearer then passing in ~flag I think). The extrude edge/faces code has multiple layers. At the top level is a funtion in editmesh_lib.c, which takes care of selection, handles mirror modifiers, etc. It calls the extrude operator, which in turns calls split, which calls dupe/del. Note that split needed a slot to exclude things from being deleting (e.g. when extruding a single isolated face). The basic idea (reflected in original design of split/dupe/del by Briggs) is to use the split function to do the heavy work of extrude. split spits out new geometry and mappings from boundary edges, for extrude (it should also spit out other mappings, but that's for later). Briggs: you may want to look over this, hopefully I didn't do anything too evil. I probably should spend some time going over the 2.5 mesh operators and cleaning them up, splitting ones that need splitting, etc, and in general getting them to work properly.
2009-02-12 16:59:51 +00:00
void extrude_edge_context_exec(BMesh *bm, BMOperator *op)
{
extrude uses dupe/delete rather then split, and it detects when to not delete geometry (though this could be smarter in the future). also BMO_pop had two lines out of order, which was causing flags layer to not always be freed when they should.
2009-02-15 00:47:19 +00:00
BMOperator dupeop, delop;
Replaced unified extrude edges/faces code (the stuff specificaly for edges/faces,extrudeflag_edgess, not the entire extrude system) with a bmesh version. This stress-tested the operator api, and I had to code some new stuff,including: * An api to iterate over Mapping slots and array slots. It's modeled after the normal iterator api. * The ability to copy mapping slots. * More mapping functions. * In addition to being able to flag elements in a buffer, you can now unflag them (much clearer then passing in ~flag I think). The extrude edge/faces code has multiple layers. At the top level is a funtion in editmesh_lib.c, which takes care of selection, handles mirror modifiers, etc. It calls the extrude operator, which in turns calls split, which calls dupe/del. Note that split needed a slot to exclude things from being deleting (e.g. when extruding a single isolated face). The basic idea (reflected in original design of split/dupe/del by Briggs) is to use the split function to do the heavy work of extrude. split spits out new geometry and mappings from boundary edges, for extrude (it should also spit out other mappings, but that's for later). Briggs: you may want to look over this, hopefully I didn't do anything too evil. I probably should spend some time going over the 2.5 mesh operators and cleaning them up, splitting ones that need splitting, etc, and in general getting them to work properly.
2009-02-12 16:59:51 +00:00
BMOIter siter;
extrude uses dupe/delete rather then split, and it detects when to not delete geometry (though this could be smarter in the future). also BMO_pop had two lines out of order, which was causing flags layer to not always be freed when they should.
2009-02-15 00:47:19 +00:00
BMIter iter, fiter, viter;
bmesh, less warnings
2011-03-20 14:49:16 +00:00
BMEdge *e, *newedge /* , *e2 */, *ce;
extrude handles loop customdata properly, also added a BM_Face_CopyShared function to copy loop customdata in a face from adjacent faces. it's not used (didn't work in this case) but it seemed fairly useful. may remove if it turns out to not be necassary.
2009-02-14 11:58:52 +00:00
BMLoop *l, *l2;
extrude region op now does wire vert extrudes too
2009-03-16 11:38:42 +00:00
BMVert *verts[4], *v, *v2;
Replaced unified extrude edges/faces code (the stuff specificaly for edges/faces,extrudeflag_edgess, not the entire extrude system) with a bmesh version. This stress-tested the operator api, and I had to code some new stuff,including: * An api to iterate over Mapping slots and array slots. It's modeled after the normal iterator api. * The ability to copy mapping slots. * More mapping functions. * In addition to being able to flag elements in a buffer, you can now unflag them (much clearer then passing in ~flag I think). The extrude edge/faces code has multiple layers. At the top level is a funtion in editmesh_lib.c, which takes care of selection, handles mirror modifiers, etc. It calls the extrude operator, which in turns calls split, which calls dupe/del. Note that split needed a slot to exclude things from being deleting (e.g. when extruding a single isolated face). The basic idea (reflected in original design of split/dupe/del by Briggs) is to use the split function to do the heavy work of extrude. split spits out new geometry and mappings from boundary edges, for extrude (it should also spit out other mappings, but that's for later). Briggs: you may want to look over this, hopefully I didn't do anything too evil. I probably should spend some time going over the 2.5 mesh operators and cleaning them up, splitting ones that need splitting, etc, and in general getting them to work properly.
2009-02-12 16:59:51 +00:00
BMFace *f;
bmesh, less warnings
2011-03-20 14:49:16 +00:00
int rlen, found, delorig=0 /*, i */;
Replaced unified extrude edges/faces code (the stuff specificaly for edges/faces,extrudeflag_edgess, not the entire extrude system) with a bmesh version. This stress-tested the operator api, and I had to code some new stuff,including: * An api to iterate over Mapping slots and array slots. It's modeled after the normal iterator api. * The ability to copy mapping slots. * More mapping functions. * In addition to being able to flag elements in a buffer, you can now unflag them (much clearer then passing in ~flag I think). The extrude edge/faces code has multiple layers. At the top level is a funtion in editmesh_lib.c, which takes care of selection, handles mirror modifiers, etc. It calls the extrude operator, which in turns calls split, which calls dupe/del. Note that split needed a slot to exclude things from being deleting (e.g. when extruding a single isolated face). The basic idea (reflected in original design of split/dupe/del by Briggs) is to use the split function to do the heavy work of extrude. split spits out new geometry and mappings from boundary edges, for extrude (it should also spit out other mappings, but that's for later). Briggs: you may want to look over this, hopefully I didn't do anything too evil. I probably should spend some time going over the 2.5 mesh operators and cleaning them up, splitting ones that need splitting, etc, and in general getting them to work properly.
2009-02-12 16:59:51 +00:00
/*initialize our sub-operators*/
removed all those nasty enums from the operator api. yay! I'm so happy. so now operators and their slots are referred to by string names. so much easier to remember!
2009-03-22 23:16:43 +00:00
BMO_Init_Op(&dupeop, "dupe");
Replaced unified extrude edges/faces code (the stuff specificaly for edges/faces,extrudeflag_edgess, not the entire extrude system) with a bmesh version. This stress-tested the operator api, and I had to code some new stuff,including: * An api to iterate over Mapping slots and array slots. It's modeled after the normal iterator api. * The ability to copy mapping slots. * More mapping functions. * In addition to being able to flag elements in a buffer, you can now unflag them (much clearer then passing in ~flag I think). The extrude edge/faces code has multiple layers. At the top level is a funtion in editmesh_lib.c, which takes care of selection, handles mirror modifiers, etc. It calls the extrude operator, which in turns calls split, which calls dupe/del. Note that split needed a slot to exclude things from being deleting (e.g. when extruding a single isolated face). The basic idea (reflected in original design of split/dupe/del by Briggs) is to use the split function to do the heavy work of extrude. split spits out new geometry and mappings from boundary edges, for extrude (it should also spit out other mappings, but that's for later). Briggs: you may want to look over this, hopefully I didn't do anything too evil. I probably should spend some time going over the 2.5 mesh operators and cleaning them up, splitting ones that need splitting, etc, and in general getting them to work properly.
2009-02-12 16:59:51 +00:00
Brought Extrude all the way back. The contextual menu works, as does only edges and individual faces extrude (individual vert extrude already did). Note that I need to port this, after we all figure out how to handle operators with variable transform follow-ons. I also implemented the merge->collapse function, which is currently accessable under ctrl->v, Bmesh Test Operator. I still need to implement the other merge modes, and properly hook everything into the merge menu tool, which I plan on doing soon (tomorrow hopefully). The cool thing about the collapse tool, is not only does it handle (all) UV layers, it handles vcols as well. To do this, I had to add a few math functions to the customdata API, which seem to be working well.
2009-08-11 07:49:35 +00:00
BMO_Flag_Buffer(bm, op, "edgefacein", EXT_INPUT, BM_EDGE|BM_FACE);
some cleanup of bmesh_polygon.c. there were three winding functions, now there's just one, the original testedgeside, that has some additional tests that might fix some issues I was having. still need to decided if bmesh_polygon.c stuff should be entirely double or entire floats, right now there's a little half-and-half going on.
2009-03-16 10:12:52 +00:00
/*if one flagged face is bordered by an unflagged face, then we delete
original geometry.*/
Did some code cleanups. Added BM_ITER and BMO_ITER macros to make defining iterator loops easier. Moved some files around. And also made the editmesh conversion functions tesselate ngons to triangle fans, since it's more stable for conversion, and editmeshes are never displayed to the user anyway. And ported akey to bmesh. Next up I plan on adding face iterators to DerivedMesh, since that's the last major chunk of major refactoring left, I think, except perhaps the uv editor (at the moment it's probably close to working, but it's still converting to editmeshes for everything, which is very bad).
2009-05-28 04:41:02 +00:00
BM_ITER(e, &iter, bm, BM_EDGES_OF_MESH, NULL) {
split dissolve_disk into dissolve_vert dissolve_disk as agreed. also made dissolve vert bmop use the error api, and put in some code to report it to the user in the xkey ui code. I'm not sure how this should work; I don't think we can have utility code in bmesh/ for reporting errors to the user, so it'll have to go in editors/mesh somewhere.
2009-03-01 06:23:22 +00:00
if (!BMO_TestFlag(bm, e, EXT_INPUT)) continue;
extrude uses dupe/delete rather then split, and it detects when to not delete geometry (though this could be smarter in the future). also BMO_pop had two lines out of order, which was causing flags layer to not always be freed when they should.
2009-02-15 00:47:19 +00:00
found = 0;
NOTE: do not test. work-in-progress commit with editmesh ripped out and replaced with bmesh. this is not usable by any means. for those who read through this, note the design is still fairly messy in places, and fyi BMTessMesh is the replacement for EditMesh, I need to rename it to BMEditMesh.
2009-05-16 16:18:08 +00:00
f = BMIter_New(&fiter, bm, BM_FACES_OF_EDGE, e);
extrude uses dupe/delete rather then split, and it detects when to not delete geometry (though this could be smarter in the future). also BMO_pop had two lines out of order, which was causing flags layer to not always be freed when they should.
2009-02-15 00:47:19 +00:00
for (rlen=0; f; f=BMIter_Step(&fiter), rlen++) {
if (!BMO_TestFlag(bm, f, EXT_INPUT)) {
found = 1;
delorig = 1;
break;
}
Replaced unified extrude edges/faces code (the stuff specificaly for edges/faces,extrudeflag_edgess, not the entire extrude system) with a bmesh version. This stress-tested the operator api, and I had to code some new stuff,including: * An api to iterate over Mapping slots and array slots. It's modeled after the normal iterator api. * The ability to copy mapping slots. * More mapping functions. * In addition to being able to flag elements in a buffer, you can now unflag them (much clearer then passing in ~flag I think). The extrude edge/faces code has multiple layers. At the top level is a funtion in editmesh_lib.c, which takes care of selection, handles mirror modifiers, etc. It calls the extrude operator, which in turns calls split, which calls dupe/del. Note that split needed a slot to exclude things from being deleting (e.g. when extruding a single isolated face). The basic idea (reflected in original design of split/dupe/del by Briggs) is to use the split function to do the heavy work of extrude. split spits out new geometry and mappings from boundary edges, for extrude (it should also spit out other mappings, but that's for later). Briggs: you may want to look over this, hopefully I didn't do anything too evil. I probably should spend some time going over the 2.5 mesh operators and cleaning them up, splitting ones that need splitting, etc, and in general getting them to work properly.
2009-02-12 16:59:51 +00:00
}
extrude uses dupe/delete rather then split, and it detects when to not delete geometry (though this could be smarter in the future). also BMO_pop had two lines out of order, which was causing flags layer to not always be freed when they should.
2009-02-15 00:47:19 +00:00
if (!found && (rlen > 1)) BMO_SetFlag(bm, e, EXT_DEL);
}
/*calculate verts to delete*/
Did some code cleanups. Added BM_ITER and BMO_ITER macros to make defining iterator loops easier. Moved some files around. And also made the editmesh conversion functions tesselate ngons to triangle fans, since it's more stable for conversion, and editmeshes are never displayed to the user anyway. And ported akey to bmesh. Next up I plan on adding face iterators to DerivedMesh, since that's the last major chunk of major refactoring left, I think, except perhaps the uv editor (at the moment it's probably close to working, but it's still converting to editmeshes for everything, which is very bad).
2009-05-28 04:41:02 +00:00
BM_ITER(v, &iter, bm, BM_VERTS_OF_MESH, NULL) {
extrude uses dupe/delete rather then split, and it detects when to not delete geometry (though this could be smarter in the future). also BMO_pop had two lines out of order, which was causing flags layer to not always be freed when they should.
2009-02-15 00:47:19 +00:00
found = 0;
Did some code cleanups. Added BM_ITER and BMO_ITER macros to make defining iterator loops easier. Moved some files around. And also made the editmesh conversion functions tesselate ngons to triangle fans, since it's more stable for conversion, and editmeshes are never displayed to the user anyway. And ported akey to bmesh. Next up I plan on adding face iterators to DerivedMesh, since that's the last major chunk of major refactoring left, I think, except perhaps the uv editor (at the moment it's probably close to working, but it's still converting to editmeshes for everything, which is very bad).
2009-05-28 04:41:02 +00:00
BM_ITER(e, &viter, bm, BM_EDGES_OF_VERT, v) {
if (!BMO_TestFlag(bm, e, EXT_INPUT)) {
extrude uses dupe/delete rather then split, and it detects when to not delete geometry (though this could be smarter in the future). also BMO_pop had two lines out of order, which was causing flags layer to not always be freed when they should.
2009-02-15 00:47:19 +00:00
found = 1;
break;
}
Did some code cleanups. Added BM_ITER and BMO_ITER macros to make defining iterator loops easier. Moved some files around. And also made the editmesh conversion functions tesselate ngons to triangle fans, since it's more stable for conversion, and editmeshes are never displayed to the user anyway. And ported akey to bmesh. Next up I plan on adding face iterators to DerivedMesh, since that's the last major chunk of major refactoring left, I think, except perhaps the uv editor (at the moment it's probably close to working, but it's still converting to editmeshes for everything, which is very bad).
2009-05-28 04:41:02 +00:00
}
BM_ITER(f, &viter, bm, BM_FACES_OF_VERT, v) {
if (!BMO_TestFlag(bm, f, EXT_INPUT)) {
extrude uses dupe/delete rather then split, and it detects when to not delete geometry (though this could be smarter in the future). also BMO_pop had two lines out of order, which was causing flags layer to not always be freed when they should.
2009-02-15 00:47:19 +00:00
found = 1;
break;
}
made extrude properly delete unneeded geometry
2009-02-12 18:05:34 +00:00
}
Replaced unified extrude edges/faces code (the stuff specificaly for edges/faces,extrudeflag_edgess, not the entire extrude system) with a bmesh version. This stress-tested the operator api, and I had to code some new stuff,including: * An api to iterate over Mapping slots and array slots. It's modeled after the normal iterator api. * The ability to copy mapping slots. * More mapping functions. * In addition to being able to flag elements in a buffer, you can now unflag them (much clearer then passing in ~flag I think). The extrude edge/faces code has multiple layers. At the top level is a funtion in editmesh_lib.c, which takes care of selection, handles mirror modifiers, etc. It calls the extrude operator, which in turns calls split, which calls dupe/del. Note that split needed a slot to exclude things from being deleting (e.g. when extruding a single isolated face). The basic idea (reflected in original design of split/dupe/del by Briggs) is to use the split function to do the heavy work of extrude. split spits out new geometry and mappings from boundary edges, for extrude (it should also spit out other mappings, but that's for later). Briggs: you may want to look over this, hopefully I didn't do anything too evil. I probably should spend some time going over the 2.5 mesh operators and cleaning them up, splitting ones that need splitting, etc, and in general getting them to work properly.
2009-02-12 16:59:51 +00:00
extrude uses dupe/delete rather then split, and it detects when to not delete geometry (though this could be smarter in the future). also BMO_pop had two lines out of order, which was causing flags layer to not always be freed when they should.
2009-02-15 00:47:19 +00:00
if (!found) {
BMO_SetFlag(bm, v, EXT_DEL);
}
}
Replaced unified extrude edges/faces code (the stuff specificaly for edges/faces,extrudeflag_edgess, not the entire extrude system) with a bmesh version. This stress-tested the operator api, and I had to code some new stuff,including: * An api to iterate over Mapping slots and array slots. It's modeled after the normal iterator api. * The ability to copy mapping slots. * More mapping functions. * In addition to being able to flag elements in a buffer, you can now unflag them (much clearer then passing in ~flag I think). The extrude edge/faces code has multiple layers. At the top level is a funtion in editmesh_lib.c, which takes care of selection, handles mirror modifiers, etc. It calls the extrude operator, which in turns calls split, which calls dupe/del. Note that split needed a slot to exclude things from being deleting (e.g. when extruding a single isolated face). The basic idea (reflected in original design of split/dupe/del by Briggs) is to use the split function to do the heavy work of extrude. split spits out new geometry and mappings from boundary edges, for extrude (it should also spit out other mappings, but that's for later). Briggs: you may want to look over this, hopefully I didn't do anything too evil. I probably should spend some time going over the 2.5 mesh operators and cleaning them up, splitting ones that need splitting, etc, and in general getting them to work properly.
2009-02-12 16:59:51 +00:00
Did some code cleanups. Added BM_ITER and BMO_ITER macros to make defining iterator loops easier. Moved some files around. And also made the editmesh conversion functions tesselate ngons to triangle fans, since it's more stable for conversion, and editmeshes are never displayed to the user anyway. And ported akey to bmesh. Next up I plan on adding face iterators to DerivedMesh, since that's the last major chunk of major refactoring left, I think, except perhaps the uv editor (at the moment it's probably close to working, but it's still converting to editmeshes for everything, which is very bad).
2009-05-28 04:41:02 +00:00
BM_ITER(f, &iter, bm, BM_FACES_OF_MESH, NULL) {
extrude uses dupe/delete rather then split, and it detects when to not delete geometry (though this could be smarter in the future). also BMO_pop had two lines out of order, which was causing flags layer to not always be freed when they should.
2009-02-15 00:47:19 +00:00
if (BMO_TestFlag(bm, f, EXT_INPUT))
BMO_SetFlag(bm, f, EXT_DEL);
}
Printf-style method of calling operations now take a modified format string, like so: [opname] [slotname]=%[format code] Before it was relying on the input format codes being in the same proper order as the slots, which seemed like a potential maintainance nightmare to me. Also the flags for creating buffers from bmop flags or header flags, now support additional modifiers for combining vert/edge/face inputs. E.g. %hfvef would accept all geometry with a header flag, and %fef would accept edges and faces with a certain bmop flag set. Example from the UI code: if (!EDBM_CallOpf(em, op, "del geom=%hf context=%d", BM_SELECT, DEL_ONLYFACES)) return OPERATOR_CANCELLED; (remember EDBM_CallOpf is the UI wrapper for this that does conversion, error reporting, etc). On todo is cleaning up/splitting bmesh_operators.h, since it's kindof a mesh right now. I'm thinking of adding the slot names in comments next to the slot ids, but I definitely would have to clean up bmesh_operators.h first, or it'd just be too chaotic for me. BTW, the operator API should now have enough meta info to wrap with a scripting language, not that it matters since that's not happening till much much later. Also hopefully corrected some SConscripts, fix mostly provided by Elia Sarti, though I also copied some SConscripts from 2.5 (not sure if doing so was especially helpful). Finally, I refactored a few places to use the new operator calling api, as an example of how this is beneficial.
2009-03-04 08:21:10 +00:00
if (delorig) BMO_InitOpf(bm, &delop, "del geom=%fvef context=%d",
EXT_DEL, DEL_ONLYTAGGED);
Replaced unified extrude edges/faces code (the stuff specificaly for edges/faces,extrudeflag_edgess, not the entire extrude system) with a bmesh version. This stress-tested the operator api, and I had to code some new stuff,including: * An api to iterate over Mapping slots and array slots. It's modeled after the normal iterator api. * The ability to copy mapping slots. * More mapping functions. * In addition to being able to flag elements in a buffer, you can now unflag them (much clearer then passing in ~flag I think). The extrude edge/faces code has multiple layers. At the top level is a funtion in editmesh_lib.c, which takes care of selection, handles mirror modifiers, etc. It calls the extrude operator, which in turns calls split, which calls dupe/del. Note that split needed a slot to exclude things from being deleting (e.g. when extruding a single isolated face). The basic idea (reflected in original design of split/dupe/del by Briggs) is to use the split function to do the heavy work of extrude. split spits out new geometry and mappings from boundary edges, for extrude (it should also spit out other mappings, but that's for later). Briggs: you may want to look over this, hopefully I didn't do anything too evil. I probably should spend some time going over the 2.5 mesh operators and cleaning them up, splitting ones that need splitting, etc, and in general getting them to work properly.
2009-02-12 16:59:51 +00:00
removed all those nasty enums from the operator api. yay! I'm so happy. so now operators and their slots are referred to by string names. so much easier to remember!
2009-03-22 23:16:43 +00:00
BMO_CopySlot(op, &dupeop, "edgefacein", "geom");
extrude uses dupe/delete rather then split, and it detects when to not delete geometry (though this could be smarter in the future). also BMO_pop had two lines out of order, which was causing flags layer to not always be freed when they should.
2009-02-15 00:47:19 +00:00
BMO_Exec_Op(bm, &dupeop);
extrude handles active face, and operators now properly restore unmodified mesh on failure
2009-06-18 07:11:55 +00:00
if (bm->act_face && BMO_TestFlag(bm, bm->act_face, EXT_INPUT))
bm->act_face = BMO_Get_MapPointer(bm, &dupeop, "facemap", bm->act_face);
extrude uses dupe/delete rather then split, and it detects when to not delete geometry (though this could be smarter in the future). also BMO_pop had two lines out of order, which was causing flags layer to not always be freed when they should.
2009-02-15 00:47:19 +00:00
if (delorig) BMO_Exec_Op(bm, &delop);
some fixes for extrude, to better handle customdata, winding, etc.
2009-03-16 09:41:33 +00:00
/*if not delorig, reverse loops of original faces*/
if (!delorig) {
removed all those nasty enums from the operator api. yay! I'm so happy. so now operators and their slots are referred to by string names. so much easier to remember!
2009-03-22 23:16:43 +00:00
for (f=BMIter_New(&iter, bm, BM_FACES_OF_MESH, NULL); f; f=BMIter_Step(&iter)) {
some fixes for extrude, to better handle customdata, winding, etc.
2009-03-16 09:41:33 +00:00
if (BMO_TestFlag(bm, f, EXT_INPUT)) {
BM_flip_normal(bm, f);
}
}
}
extrude handles active face, and operators now properly restore unmodified mesh on failure
2009-06-18 07:11:55 +00:00
removed all those nasty enums from the operator api. yay! I'm so happy. so now operators and their slots are referred to by string names. so much easier to remember!
2009-03-22 23:16:43 +00:00
BMO_CopySlot(&dupeop, op, "newout", "geomout");
Array modifier is now implemented using bmesh (though it's not completely feature-complete yet). I ported over the remove doubles code from the old bmesh branch for this, and split it into two bmops, "Weld Verts" and "Remove Doubles". Weld verts welds specific verts together, while remove doubles finds doubles and welds them. I also reverted the hotkey change I made earlier.
2009-06-23 05:35:49 +00:00
e = BMO_IterNew(&siter, bm, &dupeop, "boundarymap", 0);
extrude uses dupe/delete rather then split, and it detects when to not delete geometry (though this could be smarter in the future). also BMO_pop had two lines out of order, which was causing flags layer to not always be freed when they should.
2009-02-15 00:47:19 +00:00
for (; e; e=BMO_IterStep(&siter)) {
removed all those nasty enums from the operator api. yay! I'm so happy. so now operators and their slots are referred to by string names. so much easier to remember!
2009-03-22 23:16:43 +00:00
if (BMO_InMap(bm, op, "exclude", e)) continue;
Replaced unified extrude edges/faces code (the stuff specificaly for edges/faces,extrudeflag_edgess, not the entire extrude system) with a bmesh version. This stress-tested the operator api, and I had to code some new stuff,including: * An api to iterate over Mapping slots and array slots. It's modeled after the normal iterator api. * The ability to copy mapping slots. * More mapping functions. * In addition to being able to flag elements in a buffer, you can now unflag them (much clearer then passing in ~flag I think). The extrude edge/faces code has multiple layers. At the top level is a funtion in editmesh_lib.c, which takes care of selection, handles mirror modifiers, etc. It calls the extrude operator, which in turns calls split, which calls dupe/del. Note that split needed a slot to exclude things from being deleting (e.g. when extruding a single isolated face). The basic idea (reflected in original design of split/dupe/del by Briggs) is to use the split function to do the heavy work of extrude. split spits out new geometry and mappings from boundary edges, for extrude (it should also spit out other mappings, but that's for later). Briggs: you may want to look over this, hopefully I didn't do anything too evil. I probably should spend some time going over the 2.5 mesh operators and cleaning them up, splitting ones that need splitting, etc, and in general getting them to work properly.
2009-02-12 16:59:51 +00:00
made extrude properly delete unneeded geometry
2009-02-12 18:05:34 +00:00
newedge = BMO_IterMapVal(&siter);
newedge = *(BMEdge**)newedge;
connect verts now does geometric tests to perform valid splits. it also supports multiple splits in a face, going around the face boundary in a loop and performing splits.
2009-03-14 13:16:35 +00:00
if (!newedge) continue;
wip commit; DO NOT USE. almost done with phase 1 of this restructuring, basically just some things that needed to be done before trunk (and some things that needed to be started, but can be finished much later).
2010-07-14 22:06:10 +00:00
if (!newedge->l) ce = e;
extrude region op now does wire vert extrudes too
2009-03-16 11:38:42 +00:00
else ce = newedge;
Replaced unified extrude edges/faces code (the stuff specificaly for edges/faces,extrudeflag_edgess, not the entire extrude system) with a bmesh version. This stress-tested the operator api, and I had to code some new stuff,including: * An api to iterate over Mapping slots and array slots. It's modeled after the normal iterator api. * The ability to copy mapping slots. * More mapping functions. * In addition to being able to flag elements in a buffer, you can now unflag them (much clearer then passing in ~flag I think). The extrude edge/faces code has multiple layers. At the top level is a funtion in editmesh_lib.c, which takes care of selection, handles mirror modifiers, etc. It calls the extrude operator, which in turns calls split, which calls dupe/del. Note that split needed a slot to exclude things from being deleting (e.g. when extruding a single isolated face). The basic idea (reflected in original design of split/dupe/del by Briggs) is to use the split function to do the heavy work of extrude. split spits out new geometry and mappings from boundary edges, for extrude (it should also spit out other mappings, but that's for later). Briggs: you may want to look over this, hopefully I didn't do anything too evil. I probably should spend some time going over the 2.5 mesh operators and cleaning them up, splitting ones that need splitting, etc, and in general getting them to work properly.
2009-02-12 16:59:51 +00:00
wip commit; DO NOT USE. almost done with phase 1 of this restructuring, basically just some things that needed to be done before trunk (and some things that needed to be started, but can be finished much later).
2010-07-14 22:06:10 +00:00
if (ce->l && (ce->l->v == ce->v1)) {
some fixes for extrude, to better handle customdata, winding, etc.
2009-03-16 09:41:33 +00:00
verts[0] = e->v1;
verts[1] = e->v2;
verts[2] = newedge->v2;
verts[3] = newedge->v1;
} else {
verts[3] = e->v1;
verts[2] = e->v2;
verts[1] = newedge->v2;
verts[0] = newedge->v1;
}
/*not sure what to do about example face, pass NULL for now.*/
Replaced unified extrude edges/faces code (the stuff specificaly for edges/faces,extrudeflag_edgess, not the entire extrude system) with a bmesh version. This stress-tested the operator api, and I had to code some new stuff,including: * An api to iterate over Mapping slots and array slots. It's modeled after the normal iterator api. * The ability to copy mapping slots. * More mapping functions. * In addition to being able to flag elements in a buffer, you can now unflag them (much clearer then passing in ~flag I think). The extrude edge/faces code has multiple layers. At the top level is a funtion in editmesh_lib.c, which takes care of selection, handles mirror modifiers, etc. It calls the extrude operator, which in turns calls split, which calls dupe/del. Note that split needed a slot to exclude things from being deleting (e.g. when extruding a single isolated face). The basic idea (reflected in original design of split/dupe/del by Briggs) is to use the split function to do the heavy work of extrude. split spits out new geometry and mappings from boundary edges, for extrude (it should also spit out other mappings, but that's for later). Briggs: you may want to look over this, hopefully I didn't do anything too evil. I probably should spend some time going over the 2.5 mesh operators and cleaning them up, splitting ones that need splitting, etc, and in general getting them to work properly.
2009-02-12 16:59:51 +00:00
f = BM_Make_Quadtriangle(bm, verts, NULL, 4, NULL, 0);
extrude handles loop customdata properly, also added a BM_Face_CopyShared function to copy loop customdata in a face from adjacent faces. it's not used (didn't work in this case) but it seemed fairly useful. may remove if it turns out to not be necassary.
2009-02-14 11:58:52 +00:00
/*copy attributes*/
l=BMIter_New(&iter, bm, BM_LOOPS_OF_FACE, f);
for (; l; l=BMIter_Step(&iter)) {
some fixes for extrude, to better handle customdata, winding, etc.
2009-03-16 09:41:33 +00:00
if (l->e != e && l->e != newedge) continue;
wip commit; DO NOT USE. almost done with phase 1 of this restructuring, basically just some things that needed to be done before trunk (and some things that needed to be started, but can be finished much later).
2010-07-14 22:06:10 +00:00
l2 = l->radial_next;
extrude handles loop customdata properly, also added a BM_Face_CopyShared function to copy loop customdata in a face from adjacent faces. it's not used (didn't work in this case) but it seemed fairly useful. may remove if it turns out to not be necassary.
2009-02-14 11:58:52 +00:00
some fixes for extrude, to better handle customdata, winding, etc.
2009-03-16 09:41:33 +00:00
if (l2 == l) {
wip commit; DO NOT USE. almost done with phase 1 of this restructuring, basically just some things that needed to be done before trunk (and some things that needed to be started, but can be finished much later).
2010-07-14 22:06:10 +00:00
l2 = newedge->l;
some fixes for extrude, to better handle customdata, winding, etc.
2009-03-16 09:41:33 +00:00
BM_Copy_Attributes(bm, bm, l2->f, l->f);
BM_Copy_Attributes(bm, bm, l2, l);
wip commit; DO NOT USE. almost done with phase 1 of this restructuring, basically just some things that needed to be done before trunk (and some things that needed to be started, but can be finished much later).
2010-07-14 22:06:10 +00:00
l2 = (BMLoop*) l2->next;
l = (BMLoop*) l->next;
some fixes for extrude, to better handle customdata, winding, etc.
2009-03-16 09:41:33 +00:00
BM_Copy_Attributes(bm, bm, l2, l);
} else {
BM_Copy_Attributes(bm, bm, l2->f, l->f);
extrude handles loop customdata properly, also added a BM_Face_CopyShared function to copy loop customdata in a face from adjacent faces. it's not used (didn't work in this case) but it seemed fairly useful. may remove if it turns out to not be necassary.
2009-02-14 11:58:52 +00:00
/*copy data*/
if (l2->v == l->v) {
BM_Copy_Attributes(bm, bm, l2, l);
wip commit; DO NOT USE. almost done with phase 1 of this restructuring, basically just some things that needed to be done before trunk (and some things that needed to be started, but can be finished much later).
2010-07-14 22:06:10 +00:00
l2 = (BMLoop*) l2->next;
l = (BMLoop*) l->next;
extrude handles loop customdata properly, also added a BM_Face_CopyShared function to copy loop customdata in a face from adjacent faces. it's not used (didn't work in this case) but it seemed fairly useful. may remove if it turns out to not be necassary.
2009-02-14 11:58:52 +00:00
BM_Copy_Attributes(bm, bm, l2, l);
} else {
wip commit; DO NOT USE. almost done with phase 1 of this restructuring, basically just some things that needed to be done before trunk (and some things that needed to be started, but can be finished much later).
2010-07-14 22:06:10 +00:00
l2 = (BMLoop*) l2->next;
extrude handles loop customdata properly, also added a BM_Face_CopyShared function to copy loop customdata in a face from adjacent faces. it's not used (didn't work in this case) but it seemed fairly useful. may remove if it turns out to not be necassary.
2009-02-14 11:58:52 +00:00
BM_Copy_Attributes(bm, bm, l2, l);
wip commit; DO NOT USE. almost done with phase 1 of this restructuring, basically just some things that needed to be done before trunk (and some things that needed to be started, but can be finished much later).
2010-07-14 22:06:10 +00:00
l2 = (BMLoop*) l2->prev;
l = (BMLoop*) l->next;
extrude handles loop customdata properly, also added a BM_Face_CopyShared function to copy loop customdata in a face from adjacent faces. it's not used (didn't work in this case) but it seemed fairly useful. may remove if it turns out to not be necassary.
2009-02-14 11:58:52 +00:00
BM_Copy_Attributes(bm, bm, l2, l);
}
}
}
Replaced unified extrude edges/faces code (the stuff specificaly for edges/faces,extrudeflag_edgess, not the entire extrude system) with a bmesh version. This stress-tested the operator api, and I had to code some new stuff,including: * An api to iterate over Mapping slots and array slots. It's modeled after the normal iterator api. * The ability to copy mapping slots. * More mapping functions. * In addition to being able to flag elements in a buffer, you can now unflag them (much clearer then passing in ~flag I think). The extrude edge/faces code has multiple layers. At the top level is a funtion in editmesh_lib.c, which takes care of selection, handles mirror modifiers, etc. It calls the extrude operator, which in turns calls split, which calls dupe/del. Note that split needed a slot to exclude things from being deleting (e.g. when extruding a single isolated face). The basic idea (reflected in original design of split/dupe/del by Briggs) is to use the split function to do the heavy work of extrude. split spits out new geometry and mappings from boundary edges, for extrude (it should also spit out other mappings, but that's for later). Briggs: you may want to look over this, hopefully I didn't do anything too evil. I probably should spend some time going over the 2.5 mesh operators and cleaning them up, splitting ones that need splitting, etc, and in general getting them to work properly.
2009-02-12 16:59:51 +00:00
}
extrude uses dupe/delete rather then split, and it detects when to not delete geometry (though this could be smarter in the future). also BMO_pop had two lines out of order, which was causing flags layer to not always be freed when they should.
2009-02-15 00:47:19 +00:00
extrude region op now does wire vert extrudes too
2009-03-16 11:38:42 +00:00
/*link isolated verts*/
Array modifier is now implemented using bmesh (though it's not completely feature-complete yet). I ported over the remove doubles code from the old bmesh branch for this, and split it into two bmops, "Weld Verts" and "Remove Doubles". Weld verts welds specific verts together, while remove doubles finds doubles and welds them. I also reverted the hotkey change I made earlier.
2009-06-23 05:35:49 +00:00
v = BMO_IterNew(&siter, bm, &dupeop, "isovertmap", 0);
extrude region op now does wire vert extrudes too
2009-03-16 11:38:42 +00:00
for (; v; v=BMO_IterStep(&siter)) {
v2 = *((void**)BMO_IterMapVal(&siter));
wip commit; DO NOT USE. almost done with phase 1 of this restructuring, basically just some things that needed to be done before trunk (and some things that needed to be started, but can be finished much later).
2010-07-14 22:06:10 +00:00
BM_Make_Edge(bm, v, v2, v->e, 1);
extrude region op now does wire vert extrudes too
2009-03-16 11:38:42 +00:00
}
Replaced unified extrude edges/faces code (the stuff specificaly for edges/faces,extrudeflag_edgess, not the entire extrude system) with a bmesh version. This stress-tested the operator api, and I had to code some new stuff,including: * An api to iterate over Mapping slots and array slots. It's modeled after the normal iterator api. * The ability to copy mapping slots. * More mapping functions. * In addition to being able to flag elements in a buffer, you can now unflag them (much clearer then passing in ~flag I think). The extrude edge/faces code has multiple layers. At the top level is a funtion in editmesh_lib.c, which takes care of selection, handles mirror modifiers, etc. It calls the extrude operator, which in turns calls split, which calls dupe/del. Note that split needed a slot to exclude things from being deleting (e.g. when extruding a single isolated face). The basic idea (reflected in original design of split/dupe/del by Briggs) is to use the split function to do the heavy work of extrude. split spits out new geometry and mappings from boundary edges, for extrude (it should also spit out other mappings, but that's for later). Briggs: you may want to look over this, hopefully I didn't do anything too evil. I probably should spend some time going over the 2.5 mesh operators and cleaning them up, splitting ones that need splitting, etc, and in general getting them to work properly.
2009-02-12 16:59:51 +00:00
/*cleanup*/
some cleanup of bmesh_polygon.c. there were three winding functions, now there's just one, the original testedgeside, that has some additional tests that might fix some issues I was having. still need to decided if bmesh_polygon.c stuff should be entirely double or entire floats, right now there's a little half-and-half going on.
2009-03-16 10:12:52 +00:00
if (delorig) BMO_Finish_Op(bm, &delop);
extrude uses dupe/delete rather then split, and it detects when to not delete geometry (though this could be smarter in the future). also BMO_pop had two lines out of order, which was causing flags layer to not always be freed when they should.
2009-02-15 00:47:19 +00:00
BMO_Finish_Op(bm, &dupeop);
Replaced unified extrude edges/faces code (the stuff specificaly for edges/faces,extrudeflag_edgess, not the entire extrude system) with a bmesh version. This stress-tested the operator api, and I had to code some new stuff,including: * An api to iterate over Mapping slots and array slots. It's modeled after the normal iterator api. * The ability to copy mapping slots. * More mapping functions. * In addition to being able to flag elements in a buffer, you can now unflag them (much clearer then passing in ~flag I think). The extrude edge/faces code has multiple layers. At the top level is a funtion in editmesh_lib.c, which takes care of selection, handles mirror modifiers, etc. It calls the extrude operator, which in turns calls split, which calls dupe/del. Note that split needed a slot to exclude things from being deleting (e.g. when extruding a single isolated face). The basic idea (reflected in original design of split/dupe/del by Briggs) is to use the split function to do the heavy work of extrude. split spits out new geometry and mappings from boundary edges, for extrude (it should also spit out other mappings, but that's for later). Briggs: you may want to look over this, hopefully I didn't do anything too evil. I probably should spend some time going over the 2.5 mesh operators and cleaning them up, splitting ones that need splitting, etc, and in general getting them to work properly.
2009-02-12 16:59:51 +00:00
}
Copy Permalink