Revision: 36530 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36530 Author: joeedh Date: 2011-05-07 02:48:14 +0000 (Sat, 07 May 2011) Log Message: ----------- =bmesh=
Cut out some unwanted differences with trunk in preparation for merge. Also fixed some warnings, though many remain. Modified Paths: -------------- branches/bmesh/blender/intern/audaspace/Python/AUD_PyAPI.cpp branches/bmesh/blender/source/blender/blenlib/BLI_math_geom.h branches/bmesh/blender/source/blender/blenlib/intern/BLI_cellalloc.c branches/bmesh/blender/source/blender/blenlib/intern/math_geom.c branches/bmesh/blender/source/blender/bmesh/operators/bevel.c branches/bmesh/blender/source/blender/collada/CMakeLists.txt branches/bmesh/blender/source/blender/collada/DocumentExporter.cpp branches/bmesh/blender/source/blender/editors/curve/editcurve.c branches/bmesh/blender/source/blender/editors/curve/editfont.c branches/bmesh/blender/source/blender/editors/gpencil/drawgpencil.c branches/bmesh/blender/source/blender/editors/gpencil/gpencil_paint.c branches/bmesh/blender/source/blender/editors/include/ED_curve.h branches/bmesh/blender/source/blender/editors/interface/interface_style.c branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c branches/bmesh/blender/source/blender/editors/mesh/bmeshutils.c branches/bmesh/blender/source/blender/editors/mesh/editbmesh_add.c branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.c branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c branches/bmesh/blender/source/blender/editors/metaball/mball_edit.c branches/bmesh/blender/source/blender/editors/screen/screen_edit.c branches/bmesh/blender/source/blender/editors/space_view3d/drawarmature.c branches/bmesh/blender/source/blender/makesdna/DNA_modifier_types.h branches/bmesh/blender/source/blender/makesdna/DNA_object_types.h branches/bmesh/blender/source/blender/makesrna/rna_cleanup/rna_properties.txt branches/bmesh/blender/source/blender/makesrna/rna_cleanup/rna_update.sh branches/bmesh/blender/source/blender/python/generic/mathutils_geometry.c Modified: branches/bmesh/blender/intern/audaspace/Python/AUD_PyAPI.cpp =================================================================== --- branches/bmesh/blender/intern/audaspace/Python/AUD_PyAPI.cpp 2011-05-07 02:33:57 UTC (rev 36529) +++ branches/bmesh/blender/intern/audaspace/Python/AUD_PyAPI.cpp 2011-05-07 02:48:14 UTC (rev 36530) @@ -2214,6 +2214,7 @@ switch(device) { case AUD_DEVICE_NULL: + (void)specs; /* quiet warning when others disabled */ self->device = new AUD_NULLDevice(); break; case AUD_DEVICE_OPENAL: Modified: branches/bmesh/blender/source/blender/blenlib/BLI_math_geom.h =================================================================== --- branches/bmesh/blender/source/blender/blenlib/BLI_math_geom.h 2011-05-07 02:33:57 UTC (rev 36529) +++ branches/bmesh/blender/source/blender/blenlib/BLI_math_geom.h 2011-05-07 02:48:14 UTC (rev 36530) @@ -44,8 +44,8 @@ /********************************** Polygons *********************************/ -void cent_tri_v3(float r[3], float a[3], float b[3], float c[3]); -void cent_quad_v3(float r[3], float a[3], float b[3], float c[3], float d[3]); +void cent_tri_v3(float r[3], const float a[3], const float b[3], const float c[3]); +void cent_quad_v3(float r[3], const float a[3], const float b[3], const float c[3], const float d[3]); float normal_tri_v3(float r[3], const float a[3], const float b[3], const float c[3]); float normal_quad_v3(float r[3], const float a[3], const float b[3], const float c[3], const float d[3]); @@ -54,24 +54,24 @@ float area_tri_signed_v2(const float v1[2], const float v2[2], const float v3[2]); float area_tri_v3(const float a[3], const float b[3], const float c[3]); float area_quad_v3(const float a[3], const float b[3], const float c[3], const float d[3]); -float area_poly_v3(int nr, float verts[][3], float normal[3]); +float area_poly_v3(int nr, float verts[][3], const float normal[3]); +int is_quad_convex_v3(const float *v1, const float *v2, const float *v3, const float *v4); + /********************************* Distance **********************************/ -float dist_to_line_v2(float p[2], float l1[2], float l2[2]); -float dist_to_line_segment_v2(float p[2], float l1[2], float l2[2]); +float dist_to_line_v2(const float p[2], const float l1[2], const float l2[2]); +float dist_to_line_segment_v2(const float p[2], const float l1[2], const float l2[2]); -float dist_to_line_segment_v3(float p[3], float l1[3], float l2[3]); +float dist_to_line_segment_v3(const float p[3], const float l1[3], const float l2[3]); float closest_to_line_v3(float r[3], const float p[3], const float l1[3], const float l2[3]); float closest_to_line_v2(float r[2], const float p[2], const float l1[2], const float l2[2]); -void closest_to_line_segment_v3(float r[3], float p[3], float l1[3], float l2[3]); +void closest_to_line_segment_v3(float r[3], const float p[3], const float l1[3], const float l2[3]); /******************************* Intersection ********************************/ /* TODO int return value consistency */ - int is_quad_convex_v3(float *v1, float *v2, float *v3, float *v4); - /* line-line */ #define ISECT_LINE_LINE_COLINEAR -1 #define ISECT_LINE_LINE_NONE 0 @@ -80,7 +80,7 @@ int isect_line_line_v2(const float a1[2], const float a2[2], const float b1[2], const float b2[2]); int isect_line_line_v2_short(const short a1[2], const short a2[2], const short b1[2], const short b2[2]); -int isect_seg_seg_v2_point(const float *v1, const float *v2, const float *v3, const float *v4, float vi[2]); +int isect_seg_seg_v2_point(const float v1[2], const float v2[2], const float v3[2], const float v4[2], float vi[2]); /* Returns the number of point of interests * 0 - lines are colinear @@ -88,57 +88,57 @@ * 2 - i1 and i2 are the nearest points on line 1 (v1, v2) and line 2 (v3, v4) respectively * */ -int isect_line_line_v3(float v1[3], float v2[3], - float v3[3], float v4[3], float i1[3], float i2[3]); -int isect_line_line_strict_v3(float v1[3], float v2[3], - float v3[3], float v4[3], float vi[3], float *lambda); +int isect_line_line_v3(const float v1[3], const float v2[3], + const float v3[3], const float v4[3], float i1[3], float i2[3]); +int isect_line_line_strict_v3(const float v1[3], const float v2[3], + const float v3[3], const float v4[3], float vi[3], float *lambda); /* line/ray triangle */ -int isect_line_tri_v3(float p1[3], float p2[3], - float v0[3], float v1[3], float v2[3], float *lambda, float *uv); -int isect_ray_tri_v3(float p1[3], float d[3], - float v0[3], float v1[3], float v2[3], float *lambda, float *uv); -int isect_ray_tri_threshold_v3(float p1[3], float d[3], - float v0[3], float v1[3], float v2[3], float *lambda, float *uv, float threshold); -int isect_ray_tri_epsilon_v3(float p1[3], float d[3], - float v0[3], float v1[3], float v2[3], float *lambda, float *uv, float epsilon); +int isect_line_tri_v3(const float p1[3], const float p2[3], + const float v0[3], const float v1[3], const float v2[3], float *lambda, float uv[2]); +int isect_ray_tri_v3(const float p1[3], const float d[3], + const float v0[3], const float v1[3], const float v2[3], float *lambda, float uv[2]); +int isect_ray_tri_threshold_v3(const float p1[3], const float d[3], + const float v0[3], const float v1[3], const float v2[3], float *lambda, float uv[2], const float threshold); +int isect_ray_tri_epsilon_v3(const float p1[3], const float d[3], + const float v0[3], const float v1[3], const float v2[3], float *lambda, float uv[2], const float epsilon); /* point in polygon */ -int isect_point_quad_v2(float p[2], float a[2], float b[2], float c[2], float d[2]); +int isect_point_quad_v2(const float p[2], const float a[2], const float b[2], const float c[2], const float d[2]); -int isect_point_tri_v2(float v1[2], float v2[2], float v3[2], float pt[2]); -int isect_point_tri_v2_int(int x1, int y1, int x2, int y2, int a, int b); -int isect_point_tri_prism_v3(float p[3], float v1[3], float v2[3], float v3[3]); +int isect_point_tri_v2(const float v1[2], const float v2[2], const float v3[2], const float pt[2]); +int isect_point_tri_v2_int(const int x1, const int y1, const int x2, const int y2, const int a, const int b); +int isect_point_tri_prism_v3(const float p[3], const float v1[3], const float v2[3], const float v3[3]); -void isect_point_quad_uv_v2(float v0[2], float v1[2], float v2[2], float v3[2], - float pt[2], float *uv); -void isect_point_face_uv_v2(int isquad, float v0[2], float v1[2], float v2[2], - float v3[2], float pt[2], float *uv); +void isect_point_quad_uv_v2(const float v0[2], const float v1[2], const float v2[2], const float v3[2], + const float pt[2], float *uv); +void isect_point_face_uv_v2(const int isquad, const float v0[2], const float v1[2], const float v2[2], + const float v3[2], const float pt[2], float *uv); /* other */ -int isect_sweeping_sphere_tri_v3(float p1[3], float p2[3], float radius, - float v0[3], float v1[3], float v2[3], float *lambda, float *ipoint); +int isect_sweeping_sphere_tri_v3(const float p1[3], const float p2[3], const float radius, + const float v0[3], const float v1[3], const float v2[3], float *lambda, float ipoint[3]); -int isect_axial_line_tri_v3(int axis, float co1[3], float co2[3], - float v0[3], float v1[3], float v2[3], float *lambda); +int isect_axial_line_tri_v3(const int axis, const float co1[3], const float co2[3], + const float v0[3], const float v1[3], const float v2[3], float *lambda); -int isect_aabb_aabb_v3(float min1[3], float max1[3], float min2[3], float max2[3]); +int isect_aabb_aabb_v3(const float min1[3], const float max1[3], const float min2[3], const float max2[3]); -int clip_line_plane(float clipco[3], float plane[4], float co[3]); +int clip_line_plane(float p1[3], float p2[3], const float plane[4]); -void plot_line_v2v2i(int p1[2], int p2[2], int (*callback)(int, int, void *), void *userData); +void plot_line_v2v2i(const int p1[2], const int p2[2], int (*callback)(int, int, void *), void *userData); /****************************** Interpolation ********************************/ /* tri or quad, d can be NULL */ void interp_weights_face_v3(float w[4], - float a[3], float b[3], float c[3], float d[3], float p[3]); -void interp_weights_poly_v3(float w[], float v[][3], int n, float p[3]); + const float a[3], const float b[3], const float c[3], const float d[3], const float p[3]); +void interp_weights_poly_v3(float w[], float v[][3], const int n, const float p[3]); void interp_cubic_v3(float x[3], float v[3], - float x1[3], float v1[3], float x2[3], float v2[3], float t); + const float x1[3], const float v1[3], const float x2[3], const float v2[3], const float t); -int interp_sparse_array(float *array, int list_size, float invalid); +int interp_sparse_array(float *array, const int list_size, const float invalid); void barycentric_transform(float pt_tar[3], float const pt_src[3], const float tri_tar_p1[3], const float tri_tar_p2[3], const float tri_tar_p3[3], @@ -154,22 +154,22 @@ void polarview_m4(float mat[4][4], float dist, float azimuth, float incidence, float twist); -void perspective_m4(float mat[4][4], float left, float right, - float bottom, float top, float nearClip, float farClip); -void orthographic_m4(float mat[4][4], float left, float right, - float bottom, float top, float nearClip, float farClip); +void perspective_m4(float mat[4][4], const float left, const float right, + const float bottom, const float top, const float nearClip, const float farClip); +void orthographic_m4(float mat[4][4], const float left, const float right, + const float bottom, const float top, const float nearClip, const float farClip); void window_translate_m4(float winmat[][4], float perspmat[][4], - float x, float y); + const float x, const float y); int box_clip_bounds_m4(float boundbox[2][3], - float bounds[4], float winmat[4][4]); + const float bounds[4], float winmat[4][4]); void box_minmax_bounds_m4(float min[3], float max[3], float boundbox[2][3], float mat[4][4]); /********************************** Mapping **********************************/ -void map_to_tube(float *u, float *v, float x, float y, float z); -void map_to_sphere(float *u, float *v, float x, float y, float z); +void map_to_tube(float *u, float *v, const float x, const float y, const float z); @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs