diff options
author | Ton Roosendaal <ton@blender.org> | 2008-12-30 19:03:29 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2008-12-30 19:03:29 +0300 |
commit | 1402534ebc840c822662824b966ddb3e7e1b85f5 (patch) | |
tree | 8037fca38c52587d458ba500441fe93ef3f45298 /source/blender/editors/space_view3d/view3d_intern.h | |
parent | 3fd28ca440743109d447df1d51e368d4b8e13e06 (diff) |
2.5
EditMesh: further cleanup, made derivedmesh itterator functions
work by gathering all related data in local ViewContext struct.
(scene, editmesh, region, view3d, obedit).
Also removed bad inclusion of view3d_intern.h in mesh module.
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_intern.h')
-rw-r--r-- | source/blender/editors/space_view3d/view3d_intern.h | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index ecab49d7755..60bc89304a1 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -36,14 +36,10 @@ struct BoundBox; struct Object; struct DerivedMesh; struct wmOperatorType; -struct EditVert; -struct EditEdge; -struct EditFace; -struct Nurb; -struct BezTriple; -struct BPoint; struct bContext; struct wmWindowManager; +struct EditMesh; +struct ViewContext; typedef struct ViewDepths { unsigned short w, h; @@ -90,11 +86,6 @@ int draw_glsl_material(Scene *scene, Object *ob, View3D *v3d, int dt); void drawcircball(int mode, float *cent, float rad, float tmat[][4]); void draw_object_instance(Scene *scene, View3D *v3d, Object *ob, int dt, int outline); void drawaxes(float size, int flag, char drawtype); -void mesh_foreachScreenVert(ARegion *ar, View3D *v3d, void (*func)(void *userData, struct EditVert *eve, int x, int y, int index), void *userData, int clipVerts); -void mesh_foreachScreenEdge(ARegion *ar, View3D *v3d, void (*func)(void *userData, struct EditEdge *eed, int x0, int y0, int x1, int y1, int index), void *userData, int clipVerts); -void mesh_foreachScreenFace(ARegion *ar, View3D *v3d, void (*func)(void *userData, struct EditFace *efa, int x, int y, int index), void *userData); -void nurbs_foreachScreenVert(ARegion *ar, View3D *v3d, void (*func)(void *userData, struct Nurb *nu, struct BPoint *bp, struct BezTriple *bezt, int beztindex, int x, int y), void *userData); -void lattice_foreachScreenVert(void (*func)(void *userData, struct BPoint *bp, int x, int y), void *userData); /* drawarmature.c */ int draw_armature(Scene *scene, View3D *v3d, Base *base, int dt, int flag); @@ -105,7 +96,6 @@ void draw_mesh_textured(Scene *scene, View3D *v3d, Object *ob, struct DerivedMes /* view3d_draw.c */ void drawview3dspace(Scene *scene, ARegion *ar, View3D *v3d); void draw_depth(Scene *scene, ARegion *ar, View3D *v3d, int (* func)(void *)); -int view3d_test_clipping(View3D *v3d, float *vec); void view3d_clr_clipping(void); void view3d_set_clipping(View3D *v3d); void add_view3d_after(View3D *v3d, Base *base, int type, int flag); @@ -139,15 +129,13 @@ int get_view3d_viewplane(View3D *v3d, int winxi, int winyi, rctf *viewplane, flo void view_settings_from_ob(Object *ob, float *ofs, float *quat, float *dist, float *lens); void obmat_to_viewmat(View3D *v3d, Object *ob, short smooth); -short view3d_opengl_select(Scene *scene, ARegion *ar, View3D *v3d, unsigned int *buffer, unsigned int bufsize, rcti *input); +short view3d_opengl_select(struct ViewContext *vc, unsigned int *buffer, unsigned int bufsize, rcti *input); void initlocalview(Scene *scene, ARegion *ar, View3D *v3d); void restore_localviewdata(View3D *vd); void endlocalview(Scene *scene, ScrArea *sa); void centerview(ARegion *ar, View3D *v3d); -void view3d_align_axis_to_vector(View3D *v3d, int axisidx, float vec[3]); - void smooth_view(struct bContext *C, Object *, Object *, float *ofs, float *quat, float *dist, float *lens); void setwinmatrixview3d(View3D *v3d, int winx, int winy, rctf *rect); /* rect: for picking */ |