diff options
author | Joseph Eagar <joeedh@gmail.com> | 2009-07-21 12:39:58 +0400 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2009-07-21 12:39:58 +0400 |
commit | 19a2da9303d9ccb0ac28abe5ef2f70f638844ea1 (patch) | |
tree | d83b96b2c375869b8cd0967ac8bbf957cef4413a /source/blender/editors/uvedit/uvedit_intern.h | |
parent | dc78be0d104890d99e506e49f6afe6d8f2a1b9fd (diff) |
first pass at the uv code. uv editor now mostly uses new bmesh structures for uvs.
Diffstat (limited to 'source/blender/editors/uvedit/uvedit_intern.h')
-rw-r--r-- | source/blender/editors/uvedit/uvedit_intern.h | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/source/blender/editors/uvedit/uvedit_intern.h b/source/blender/editors/uvedit/uvedit_intern.h index cca357c8685..a203fc9b55b 100644 --- a/source/blender/editors/uvedit/uvedit_intern.h +++ b/source/blender/editors/uvedit/uvedit_intern.h @@ -30,12 +30,16 @@ #define ED_UVEDIT_INTERN_H struct SpaceImage; -struct EditFace; -struct MTFace; +struct MTexPoly; struct Scene; struct Image; struct Object; struct wmOperatorType; +struct BMEditMesh; +struct BMFace; +struct BMLoop; +struct BMEdge; +struct BMVert; #define UV_SELECT_ALL 1 #define UV_SELECT_PINNED 2 @@ -45,26 +49,28 @@ struct wmOperatorType; #define TF_SEL_MASK(id) (TF_SEL1 << id) /* visibility and selection */ -int uvedit_face_visible_nolocal(struct Scene *scene, struct EditFace *efa); -int uvedit_face_visible(struct Scene *scene, struct Image *ima, struct EditFace *efa, struct MTFace *tf); +int uvedit_face_visible_nolocal(struct Scene *scene, struct BMFace *efa); -int uvedit_face_selected(struct Scene *scene, struct EditFace *efa, struct MTFace *tf); -void uvedit_face_select(struct Scene *scene, struct EditFace *efa, struct MTFace *tf); -void uvedit_face_deselect(struct Scene *scene, struct EditFace *efa, struct MTFace *tf); +/*all the uvedit_xxxx_[de]selected functions are + declared in ED_uvedit.h*/ +int uvedit_face_select(struct Scene *scene, struct BMEditMesh *em, struct BMFace *efa); +int uvedit_face_deselect(struct Scene *scene, struct BMEditMesh *em, struct BMFace *efa); -int uvedit_edge_selected(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i); -void uvedit_edge_select(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i); -void uvedit_edge_deselect(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i); +void uvedit_edge_select(struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l); +void uvedit_edge_deselect(struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l); -int uvedit_uv_selected(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i); -void uvedit_uv_select(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i); -void uvedit_uv_deselect(struct Scene *scene, struct EditFace *efa, struct MTFace *tf, int i); +void uvedit_uv_select(struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l); +void uvedit_uv_deselect(struct BMEditMesh *em, struct Scene *scene, struct BMLoop *l); /* geometric utilities */ void uv_center(float uv[][2], float cent[2], int quad); float uv_area(float uv[][2], int quad); void uv_copy_aspect(float uv_orig[][2], float uv[][2], float aspx, float aspy); +float poly_uv_area(float uv[][2], int len); +void poly_copy_aspect(float uv_orig[][2], float uv[][2], float aspx, float aspy, int len); +void poly_uv_center(struct BMEditMesh *em, struct BMFace *f, float cent[2]); + /* operators */ void UV_OT_average_islands_scale(struct wmOperatorType *ot); void UV_OT_cube_project(struct wmOperatorType *ot); |