From 113ea4368e8f0b8036c59354837afe5d68e0111a Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 22 Mar 2010 15:55:12 +0000 Subject: Math Lib: make some more vector functions use const arguments. --- source/blender/blenlib/BLI_math_vector.h | 32 +++++++++++----------- source/blender/blenlib/intern/math_vector_inline.c | 30 ++++++++++---------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/source/blender/blenlib/BLI_math_vector.h b/source/blender/blenlib/BLI_math_vector.h index c77f76a6674..7780c51095f 100644 --- a/source/blender/blenlib/BLI_math_vector.h +++ b/source/blender/blenlib/BLI_math_vector.h @@ -44,7 +44,7 @@ MINLINE void zero_v4(float r[4]); MINLINE void copy_v2_v2(float r[2], const float a[2]); MINLINE void copy_v3_v3(float r[3], const float a[3]); -MINLINE void copy_v4_v4(float r[4], float a[4]); +MINLINE void copy_v4_v4(float r[4], const float a[4]); MINLINE void swap_v2_v2(float a[2], float b[2]); MINLINE void swap_v3_v3(float a[3], float b[3]); @@ -52,14 +52,14 @@ MINLINE void swap_v4_v4(float a[4], float b[4]); /********************************* Arithmetic ********************************/ -MINLINE void add_v2_v2(float r[2], float a[2]); -MINLINE void add_v2_v2v2(float r[2], float a[2], float b[2]); -MINLINE void add_v3_v3(float r[3], float a[3]); -MINLINE void add_v3_v3v3(float r[3], float a[3], float b[3]); +MINLINE void add_v2_v2(float r[2], const float a[2]); +MINLINE void add_v2_v2v2(float r[2], const float a[2], const float b[2]); +MINLINE void add_v3_v3(float r[3], const float a[3]); +MINLINE void add_v3_v3v3(float r[3], const float a[3], const float b[3]); -MINLINE void sub_v2_v2(float r[2], float a[2]); -MINLINE void sub_v2_v2v2(float r[2], float a[2], float b[2]); -MINLINE void sub_v3_v3(float r[3], float a[3]); +MINLINE void sub_v2_v2(float r[2], const float a[2]); +MINLINE void sub_v2_v2v2(float r[2], const float a[2], const float b[2]); +MINLINE void sub_v3_v3(float r[3], const float a[3]); MINLINE void sub_v3_v3v3(float r[3], const float a[3], const float b[3]); MINLINE void mul_v2_fl(float r[2], float f); @@ -67,14 +67,14 @@ MINLINE void mul_v2_v2fl(float r[2], const float a[2], float f); MINLINE void mul_v3_fl(float r[3], float f); MINLINE void mul_v3_v3fl(float r[3], const float a[3], float f); MINLINE void mul_v2_v2(float r[2], const float a[2]); -MINLINE void mul_v3_v3(float r[3], float a[3]); -MINLINE void mul_v3_v3v3(float r[3], float a[3], float b[3]); - -MINLINE void madd_v3_v3fl(float r[3], float a[3], float f); -MINLINE void madd_v3_v3v3(float r[3], float a[3], float b[3]); -MINLINE void madd_v2_v2v2fl(float r[2], const float a[2], const float b[2], const float f); -MINLINE void madd_v3_v3v3fl(float r[3], float a[3], float b[3], float f); -MINLINE void madd_v3_v3v3v3(float r[3], float a[3], float b[3], float c[3]); +MINLINE void mul_v3_v3(float r[3], const float a[3]); +MINLINE void mul_v3_v3v3(float r[3], const float a[3], const float b[3]); + +MINLINE void madd_v3_v3fl(float r[3], const float a[3], float f); +MINLINE void madd_v3_v3v3(float r[3], const float a[3], const float b[3]); +MINLINE void madd_v2_v2v2fl(float r[2], const float a[2], const float b[2], float f); +MINLINE void madd_v3_v3v3fl(float r[3], const float a[3], const float b[3], float f); +MINLINE void madd_v3_v3v3v3(float r[3], const float a[3], const float b[3], const float c[3]); MINLINE void negate_v3(float r[3]); MINLINE void negate_v3_v3(float r[3], const float a[3]); diff --git a/source/blender/blenlib/intern/math_vector_inline.c b/source/blender/blenlib/intern/math_vector_inline.c index 1a50234ef1e..f82daaa8af6 100644 --- a/source/blender/blenlib/intern/math_vector_inline.c +++ b/source/blender/blenlib/intern/math_vector_inline.c @@ -66,7 +66,7 @@ MINLINE void copy_v3_v3(float r[3], const float a[3]) r[2]= a[2]; } -MINLINE void copy_v4_v4(float r[4], float a[4]) +MINLINE void copy_v4_v4(float r[4], const float a[4]) { r[0]= a[0]; r[1]= a[1]; @@ -97,45 +97,45 @@ MINLINE void swap_v4_v4(float a[4], float b[4]) /********************************* Arithmetic ********************************/ -MINLINE void add_v2_v2(float *r, float *a) +MINLINE void add_v2_v2(float *r, const float *a) { r[0] += a[0]; r[1] += a[1]; } -MINLINE void add_v2_v2v2(float *r, float *a, float *b) +MINLINE void add_v2_v2v2(float *r, const float *a, const float *b) { r[0]= a[0] + b[0]; r[1]= a[1] + b[1]; } -MINLINE void add_v3_v3(float *r, float *a) +MINLINE void add_v3_v3(float *r, const float *a) { r[0] += a[0]; r[1] += a[1]; r[2] += a[2]; } -MINLINE void add_v3_v3v3(float *r, float *a, float *b) +MINLINE void add_v3_v3v3(float *r, const float *a, const float *b) { r[0]= a[0] + b[0]; r[1]= a[1] + b[1]; r[2]= a[2] + b[2]; } -MINLINE void sub_v2_v2(float *r, float *a) +MINLINE void sub_v2_v2(float *r, const float *a) { r[0] -= a[0]; r[1] -= a[1]; } -MINLINE void sub_v2_v2v2(float *r, float *a, float *b) +MINLINE void sub_v2_v2v2(float *r, const float *a, const float *b) { r[0]= a[0] - b[0]; r[1]= a[1] - b[1]; } -MINLINE void sub_v3_v3(float *r, float *a) +MINLINE void sub_v3_v3(float *r, const float *a) { r[0] -= a[0]; r[1] -= a[1]; @@ -181,48 +181,48 @@ MINLINE void mul_v2_v2(float r[2], const float a[2]) r[1] *= a[1]; } -MINLINE void mul_v3_v3(float r[3], float a[3]) +MINLINE void mul_v3_v3(float r[3], const float a[3]) { r[0] *= a[0]; r[1] *= a[1]; r[2] *= a[2]; } -MINLINE void madd_v3_v3fl(float r[3], float a[3], float f) +MINLINE void madd_v3_v3fl(float r[3], const float a[3], float f) { r[0] += a[0]*f; r[1] += a[1]*f; r[2] += a[2]*f; } -MINLINE void madd_v3_v3v3(float r[3], float a[3], float b[3]) +MINLINE void madd_v3_v3v3(float r[3], const float a[3], const float b[3]) { r[0] += a[0]*b[0]; r[1] += a[1]*b[1]; r[2] += a[2]*b[2]; } -MINLINE void madd_v2_v2v2fl(float r[2], const float a[2], const float b[2], const float f) +MINLINE void madd_v2_v2v2fl(float r[2], const float a[2], const float b[2], float f) { r[0] = a[0] + b[0]*f; r[1] = a[1] + b[1]*f; } -MINLINE void madd_v3_v3v3fl(float r[3], float a[3], float b[3], float f) +MINLINE void madd_v3_v3v3fl(float r[3], const float a[3], const float b[3], float f) { r[0] = a[0] + b[0]*f; r[1] = a[1] + b[1]*f; r[2] = a[2] + b[2]*f; } -MINLINE void madd_v3_v3v3v3(float r[3], float a[3], float b[3], float c[3]) +MINLINE void madd_v3_v3v3v3(float r[3], const float a[3], const float b[3], const float c[3]) { r[0] = a[0] + b[0]*c[0]; r[1] = a[1] + b[1]*c[1]; r[2] = a[2] + b[2]*c[2]; } -MINLINE void mul_v3_v3v3(float *v, float *v1, float *v2) +MINLINE void mul_v3_v3v3(float *v, const float *v1, const float *v2) { v[0] = v1[0] * v2[0]; v[1] = v1[1] * v2[1]; -- cgit v1.2.3