dcb751725e
to my previous commit (whoops). The second part covers the changes I have made to the code since then (all related to merge tools code).] # Part One: Complete Log for Commit from 2/13/06 -> Upgraded merge tools. The new merge tools add several options to blenders Merge submenu, accessed via the WKEY whilst in Editmode for meshes. The new options depend on current mode: - Vertex mode: "At First" and "At Last" When choosing "At First" or "At last" it will merge all selected vertices at the first or last selected vertex. (Note: Blender now keeps track of the last and first verts selected in editMode (G.editMesh->lastvert and G.editMesh->firstvert pointers. This meant additions were made to the undomesh code in editmesh.c as well). - Edge mode: "Collapse Edges" When choosing this option, Blender examines the current set of selected edges and groups them according whether or not they are topologically connected. It then goes through each group and merges them one by one to a single point. - Face Mode: "Collapse Faces" Works the same as "Collapse Edges", only works on groups of topologically connected faces. -> Inclusive selection mode conversion. This feature extends the ability of blenders selection mode conversions. Currently when you change selection modes from a "lower order" mode to a "higher order" one (vertex->edge, vertex->face or edge->face) blender only selects elements in the new mode whose elements were completely selected in the previous mode. This patch does not change blenders default behavior but offers implicit selection mode conversion as an alternative. To access it, hold either the left or right CTRL keys and click on a selection mode in the view 3d selection mode header buttons. This can be accessed via the CTRL-TAB selection mode switching as well, simply hold CTRL while clicking the mode you want or entering its number on the keypad. In some programs, such as Wings and Mirai, it has been demonstrated that it can also be very useful to exploit selection mode switching to implicitly select previously unselected elements as well. For instance switching selection mode from vertex to edges will select all edges currently associated with the currently selected vertices. The same behavior is applied to switching between vertex->face and edge->face. By exploiting this sort of selection conversion complex selection sets can be built quicker. Furthermore I modified blenders UndoMesh code to make selection mode switching "undo coherent". Aside from its relevance to inclusive selection mode conversion, this really counts as a "bug" in my mind. Previously selection mode switch could cause the selection state of the mesh to be invalid when certain modeling operations were undone. An example of this would be "edge subdivide-> switch to face mode-> undo"; you end up with edges selected while still in face mode! # Part Two: Log for this Commit -> Code Cleanup As per Ton's request I reformatted all my code, changed variable names and eliminated my use of "LinkNode" structs and replaced them with "ListBase" instead. There should be no warnings while compiling now either. -> Remove doubles bug Fixed small problem in removedoublesflag() in editmesh_tools.c that caused editface structs to get their UV's scrambled. Vertex colors might not be safe though? Need to investigate later. -> Small bug in in the the code for merge last/first It could cause a crash when exiting editmode, switching meshes, then entering editmode again. "lastvert" and "firstvert" pointers are now set to NULL whenever exiting editmode now (see load_editmesh() in editmesh.c). I will find a better solution to this *soon*... -> All merge tools now UV aware (optional) The default behavior is to leave UVs alone, but if you hold CTRL while clicking on the menu entry, UV's are merged. This works fine in most situations, although some investigation into how to best handle merging of UVs at the border of UV islands needs to be done. This last item brings up a point about the current state of the interface: several functions accessed through the WKEY menu now use the CTRL modifier to change how they behave (This convention has been in place for a while, see subdivide for example). Unfortunately there is no way to communicate the way modifier keys change the behavior of certain functions to the user. This makes such options invisible for all intents and purposes...
213 lines
6.7 KiB
C
213 lines
6.7 KiB
C
/**
|
|
* $Id$
|
|
*
|
|
* ***** BEGIN GPL/BL DUAL 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. The Blender
|
|
* Foundation also sells licenses for use in proprietary software under
|
|
* the Blender License. See http://www.blender.org/BL/ for information
|
|
* about this.
|
|
*
|
|
* 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*
|
|
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
|
|
* All rights reserved.
|
|
*
|
|
* The Original Code is: all of this file.
|
|
*
|
|
* Contributor(s): none yet.
|
|
*
|
|
* ***** END GPL/BL DUAL LICENSE BLOCK *****
|
|
*/
|
|
|
|
/* External for editmesh_xxxx.c functions */
|
|
|
|
#ifndef BIF_EDITMESH_H
|
|
#define BIF_EDITMESH_H
|
|
|
|
struct EditMesh;
|
|
struct EditFace;
|
|
struct EditEdge;
|
|
struct EditVert;
|
|
struct Mesh;
|
|
struct bDeformGroup;
|
|
struct View3D;
|
|
|
|
// edge and face flag both
|
|
#define EM_FGON 2
|
|
// face flag
|
|
#define EM_FGON_DRAW 1
|
|
|
|
extern unsigned int em_vertoffs, em_solidoffs, em_wireoffs;
|
|
|
|
/* ******************* editmesh.c */
|
|
extern void make_editMesh(void);
|
|
extern void load_editMesh(void);
|
|
extern void free_editMesh(struct EditMesh *);
|
|
extern void remake_editMesh(void);
|
|
|
|
/* Editmesh Undo code */
|
|
extern void undo_push_mesh(char *name);
|
|
|
|
extern void separatemenu(void);
|
|
extern void separate_mesh(void);
|
|
extern void separate_mesh_loose(void);
|
|
|
|
/* ******************* editmesh_add.c */
|
|
extern void add_primitiveMesh(int type);
|
|
extern void adduplicate_mesh(void);
|
|
extern void add_click_mesh(void);
|
|
extern void addedgeface_mesh(void);
|
|
|
|
/* ******************* editmesh_lib.c */
|
|
|
|
extern void EM_set_flag_all(int flag);
|
|
extern void EM_clear_flag_all(int flag);
|
|
|
|
extern void EM_select_face(struct EditFace *efa, int sel);
|
|
extern void EM_select_edge(struct EditEdge *eed, int sel);
|
|
|
|
extern void EM_deselect_flush(void); // vertices to edges/faces (exception!)
|
|
extern void EM_select_flush(void); // vertices to edges/faces (exception!)
|
|
extern void EM_selectmode_set(void); // when mode changes
|
|
extern void EM_selectmode_flush(void); // when selection changes
|
|
extern void EM_convertsel(short oldmode, short selectmode);
|
|
|
|
extern int EM_nfaces_selected(void);
|
|
extern int EM_nvertices_selected(void);
|
|
|
|
extern int faceselectedAND(struct EditFace *efa, int flag);
|
|
extern void recalc_editnormals(void);
|
|
extern void flip_editnormals(void);
|
|
|
|
/* ******************* editmesh_mods.c */
|
|
|
|
extern void EM_init_index_arrays(int forVert, int forEdge, int forFace);
|
|
extern void EM_free_index_arrays(void);
|
|
|
|
extern struct EditVert *EM_get_vert_for_index(int index);
|
|
extern struct EditEdge *EM_get_edge_for_index(int index);
|
|
extern struct EditFace *EM_get_face_for_index(int index);
|
|
|
|
extern void EM_select_face_fgon(struct EditFace *efa, int sel);
|
|
|
|
extern int EM_init_backbuf_border(short xmin, short ymin, short xmax, short ymax);
|
|
extern int EM_mask_init_backbuf_border(short mcords[][2], short tot, short xmin, short ymin, short xmax, short ymax);
|
|
extern int EM_init_backbuf_circle(short xs, short ys, short rads);
|
|
extern int EM_check_backbuf(unsigned int index);
|
|
extern void EM_free_backbuf(void);
|
|
|
|
extern void EM_selectmode_menu(void);
|
|
|
|
|
|
extern void vertexnoise(void);
|
|
extern void vertexsmooth(void);
|
|
extern void righthandfaces(int select);
|
|
extern void mouse_mesh(void);
|
|
|
|
extern void deselectall_mesh(void);
|
|
extern void selectconnected_mesh(int qual);
|
|
extern void selectswap_mesh(void);
|
|
|
|
extern void hide_mesh(int swap);
|
|
extern void reveal_mesh(void);
|
|
|
|
extern void vertices_to_sphere(void);
|
|
|
|
/** Aligns the selected TFace's of @a me to the @a v3d,
|
|
* using the given axis (0-2). Can give a user error.
|
|
*/
|
|
extern void faceselect_align_view_to_selected(struct View3D *v3d, struct Mesh *me, int axis);
|
|
/** Aligns the selected faces or vertices of @a me to the @a v3d,
|
|
* using the given axis (0-2). Can give a user error.
|
|
*/
|
|
extern void editmesh_align_view_to_selected(struct View3D *v3d, int axis);
|
|
|
|
/* Selection */
|
|
extern void select_non_manifold(void);
|
|
extern void select_sharp_edges(void);
|
|
extern void select_linked_flat_faces(void);
|
|
extern void select_faces_by_numverts(int numverts);
|
|
extern void select_more(void);
|
|
extern void select_less(void);
|
|
extern void selectrandom_mesh(void);
|
|
extern void editmesh_select_by_material(int index);
|
|
extern void editmesh_deselect_by_material(int index);
|
|
|
|
extern void Edge_Menu(void);
|
|
extern void editmesh_mark_seam(int clear);
|
|
|
|
|
|
/* ******************* editmesh_loop.c */
|
|
|
|
#define KNIFE_PROMPT 0
|
|
#define KNIFE_EXACT 1
|
|
#define KNIFE_MIDPOINT 2
|
|
#define KNIFE_MULTICUT 3
|
|
|
|
extern void CutEdgeloop(int numcuts);
|
|
extern void KnifeSubdivide(char mode);
|
|
extern void LoopMenu(void);
|
|
|
|
#define LOOP_SELECT 1
|
|
#define LOOP_CUT 2
|
|
|
|
extern short sharesFace(struct EditEdge* e1, struct EditEdge* e2);
|
|
|
|
/* ******************* editmesh_tools.c */
|
|
|
|
#define SUBDIV_SELECT_ORIG 0
|
|
#define SUBDIV_SELECT_INNER 1
|
|
#define SUBDIV_SELECT_INNER_SEL 2
|
|
|
|
extern void convert_to_triface(int direction);
|
|
extern int removedoublesflag(short flag, float limit);
|
|
extern void xsortvert_flag(int flag);
|
|
extern void hashvert_flag(int flag);
|
|
|
|
extern void esubdivideflag(int flag, float rad, int beauty, int numcuts, int selecttype);
|
|
|
|
extern void extrude_mesh(void);
|
|
extern void split_mesh(void);
|
|
extern void extrude_repeat_mesh(int steps, float offs);
|
|
extern void spin_mesh(int steps,int degr,float *dvec, int mode);
|
|
extern void screw_mesh(int steps,int turns);
|
|
extern void delete_mesh(void);
|
|
extern void beauty_fill(void);
|
|
extern void join_triangles(void);
|
|
extern void edge_flip(void);
|
|
extern void fill_mesh(void);
|
|
extern void bevel_menu();
|
|
extern void mesh_set_smooth_faces(short event);
|
|
void edge_rotate_selected(int dir);
|
|
int EdgeSlide(short immediate, float imperc);
|
|
int EdgeLoopDelete(void);
|
|
void mesh_rip(void);
|
|
|
|
struct EditVert *editedge_getOtherVert(struct EditEdge *eed, struct EditVert *ev);
|
|
struct EditVert *editedge_getSharedVert(struct EditEdge *eed, struct EditEdge *eed2);
|
|
int editedge_containsVert(struct EditEdge *eed, struct EditVert *eve);
|
|
int editface_containsVert(struct EditFace *efa, struct EditVert *eve);
|
|
int editface_containsEdge(struct EditFace *efa, struct EditEdge *eed);
|
|
|
|
void shape_copy_select_from(void);
|
|
void shape_propagate(void);
|
|
|
|
int collapseEdges(int uvmerge);
|
|
int collapseFaces(int uvmerge);
|
|
int merge_firstlast(int first, int uvmerge);
|
|
int merge_target( int target, int uvmerge);
|
|
|
|
#endif
|
|
|