diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-11-10 22:13:05 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-11-10 22:13:05 +0300 |
commit | 385875632d7953080375ef4bf74f894c1053fc4b (patch) | |
tree | 8f7d69622d67953cfc413f0d5b2e87ef013042d7 /source/blender/blenlib/BLI_math_geom.h | |
parent | d611dd373558814ea2fc21bcd5418404f1c77a4d (diff) |
Math Lib
* Fix remaining issues before conversion.
* Inline various vector functions, currently enabled for all platforms.
I expect this to work in GCC/MSVC at least, if other platforms don't
support it, #ifdef's can be added.
Diffstat (limited to 'source/blender/blenlib/BLI_math_geom.h')
-rw-r--r-- | source/blender/blenlib/BLI_math_geom.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/blenlib/BLI_math_geom.h b/source/blender/blenlib/BLI_math_geom.h index 05530bce0e5..d54be9d5e03 100644 --- a/source/blender/blenlib/BLI_math_geom.h +++ b/source/blender/blenlib/BLI_math_geom.h @@ -43,7 +43,7 @@ float normal_quad_v3(float r[3], float a[3], float b[3], float c[3], float d[3]) float area_tri_v2(float a[2], float b[2], float c[2]); float area_tri_v3(float a[3], float b[3], float c[3]); float area_quad_v3(float a[3], float b[3], float c[3], float d[3]); -float area_poly_v3(int nr, float *verts, float normal[3]); // TODO float verts[][3] +float area_poly_v3(int nr, float verts[][3], float normal[3]); /********************************* Distance **********************************/ @@ -56,7 +56,6 @@ void closest_to_line_segment_v3(float r[3], float p[3], float l1[3], float l2[3] /******************************* Intersection ********************************/ -/* TODO return values are not always first yet */ /* TODO int return value consistency */ /* line-line */ @@ -65,8 +64,8 @@ void closest_to_line_segment_v3(float r[3], float p[3], float l1[3], float l2[3] #define ISECT_LINE_LINE_EXACT 1 #define ISECT_LINE_LINE_CROSS 2 -short isect_line_line_v2(float a1[2], float a2[2], float b1[2], float b2[2]); // TODO return int -short isect_line_line_v2_short(short a1[2], short a2[2], short b1[2], short b2[2]); // TODO return int +int isect_line_line_v2(float a1[2], float a2[2], float b1[2], float b2[2]); +int isect_line_line_v2_short(short a1[2], short a2[2], short b1[2], short b2[2]); /* Returns the number of point of interests * 0 - lines are colinear |