From 4462a84f4ab2d5f6b8ad15952105cadd3fab5c3b Mon Sep 17 00:00:00 2001 From: Recep Aslantas Date: Thu, 23 Feb 2017 09:57:28 +0300 Subject: [PATCH] rename _dup (duplicate) to _copy I think _copy is better and COMMON name for duplicating/copying vector, matrices --- include/call/cglmc-mat.h | 4 ++-- include/call/cglmc-mat3.h | 2 +- include/call/cglmc-vec.h | 6 +++--- include/cglm-affine-mat.h | 2 +- include/cglm-affine.h | 18 +++++++++--------- include/cglm-euler.h | 2 +- include/cglm-mat.h | 16 ++++++++-------- include/cglm-mat3.h | 8 ++++---- include/cglm-quat.h | 2 +- include/cglm-vec.h | 8 ++++---- src/cglm-mat.c | 8 ++++---- src/cglm-mat3.c | 4 ++-- src/cglm-vec.c | 12 ++++++------ 13 files changed, 46 insertions(+), 46 deletions(-) diff --git a/include/call/cglmc-mat.h b/include/call/cglmc-mat.h index d800d38..79cdbe4 100644 --- a/include/call/cglmc-mat.h +++ b/include/call/cglmc-mat.h @@ -15,11 +15,11 @@ extern "C" { CGLM_EXPORT void -glmc_mat4_udup(mat4 mat, mat4 dest); +glmc_mat4_ucopy(mat4 mat, mat4 dest); CGLM_EXPORT void -glmc_mat4_dup(mat4 mat, mat4 dest); +glmc_mat4_copy(mat4 mat, mat4 dest); CGLM_EXPORT void diff --git a/include/call/cglmc-mat3.h b/include/call/cglmc-mat3.h index 40049ec..4b1de0c 100644 --- a/include/call/cglmc-mat3.h +++ b/include/call/cglmc-mat3.h @@ -15,7 +15,7 @@ extern "C" { CGLM_EXPORT void -glmc_mat3_dup(mat3 mat, mat3 dest); +glmc_mat3_copy(mat3 mat, mat3 dest); CGLM_EXPORT void diff --git a/include/call/cglmc-vec.h b/include/call/cglmc-vec.h index b959092..33c787e 100644 --- a/include/call/cglmc-vec.h +++ b/include/call/cglmc-vec.h @@ -15,15 +15,15 @@ extern "C" { CGLM_EXPORT void -glmc_vec_dup(vec3 a, vec3 dest); +glmc_vec_copy(vec3 a, vec3 dest); CGLM_EXPORT void -glmc_vec4_dup3(vec4 a, vec3 dest); +glmc_vec4_copy3(vec4 a, vec3 dest); CGLM_EXPORT void -glmc_vec4_dup(vec4 v, vec4 dest); +glmc_vec4_copy(vec4 v, vec4 dest); CGLM_EXPORT float diff --git a/include/cglm-affine-mat.h b/include/cglm-affine-mat.h index 6ae5673..c30a086 100644 --- a/include/cglm-affine-mat.h +++ b/include/cglm-affine-mat.h @@ -87,7 +87,7 @@ glm_inv_tr(mat4 mat) { /* translate */ glm_mat3_mulv(r, mat[3], t); glm_vec_flipsign(t); - glm_vec_dup(t, mat[3]); + glm_vec_copy(t, mat[3]); #endif } diff --git a/include/cglm-affine.h b/include/cglm-affine.h index a52a0c9..a17115e 100644 --- a/include/cglm-affine.h +++ b/include/cglm-affine.h @@ -130,7 +130,7 @@ glm_scale_to(mat4 m, vec3 v, mat4 dest) { glm_vec4_scale(m[1], v[1], dest[1]); glm_vec4_scale(m[2], v[2], dest[2]); - glm_vec4_dup(m[3], dest[3]); + glm_vec4_copy(m[3], dest[3]); } CGLM_INLINE @@ -267,9 +267,9 @@ glm_rotate_ndc(mat4 m, float angle, vec3 axis_ndc) { glm_vec4_scale(m[2], rot[2][2], tmp[0]); glm_vec4_add(tmp[3], tmp[0], tmp[3]); - glm_vec4_dup(tmp[1], m[0]); - glm_vec4_dup(tmp[2], m[1]); - glm_vec4_dup(tmp[3], m[2]); + glm_vec4_copy(tmp[1], m[0]); + glm_vec4_copy(tmp[2], m[1]); + glm_vec4_copy(tmp[3], m[2]); } CGLM_INLINE @@ -325,10 +325,10 @@ glm_decompose_rs(mat4 m, mat4 r, vec3 s) { vec4 t = {0.0f, 0.0f, 0.0f, 1.0f}; vec3 v; - glm_vec4_dup(m[0], r[0]); - glm_vec4_dup(m[1], r[1]); - glm_vec4_dup(m[2], r[2]); - glm_vec4_dup(t, r[3]); + glm_vec4_copy(m[0], r[0]); + glm_vec4_copy(m[1], r[1]); + glm_vec4_copy(m[2], r[2]); + glm_vec4_copy(t, r[3]); s[0] = glm_vec_norm(m[0]); s[1] = glm_vec_norm(m[1]); @@ -359,7 +359,7 @@ glm_decompose_rs(mat4 m, mat4 r, vec3 s) { CGLM_INLINE void glm_decompose(mat4 m, vec4 t, mat4 r, vec3 s) { - glm_vec4_dup(m[3], t); + glm_vec4_copy(m[3], t); glm_decompose_rs(m, r, s); } diff --git a/include/cglm-euler.h b/include/cglm-euler.h index 8200296..001021a 100644 --- a/include/cglm-euler.h +++ b/include/cglm-euler.h @@ -64,7 +64,7 @@ glm_euler_angles(mat4 m, vec3 dest) { path = (fabsf(a[0][0]) + fabsf(a[0][1]) + fabsf(a[0][2])) >= (fabsf(a[1][0]) + fabsf(a[1][1]) + fabsf(a[1][2])); - glm_vec_dup(a[path], dest); + glm_vec_copy(a[path], dest); } else { dest[0] = atan2f(m[1][0], m[2][0]); dest[1] = CGLM_PI_2; diff --git a/include/cglm-mat.h b/include/cglm-mat.h index a5ea734..e80b0ef 100644 --- a/include/cglm-mat.h +++ b/include/cglm-mat.h @@ -38,7 +38,7 @@ */ CGLM_INLINE void -glm_mat4_udup(mat4 mat, mat4 dest) { +glm_mat4_ucopy(mat4 mat, mat4 dest) { glm__memcpy(float, dest, mat, sizeof(mat4)); } @@ -50,7 +50,7 @@ glm_mat4_udup(mat4 mat, mat4 dest) { */ CGLM_INLINE void -glm_mat4_dup(mat4 mat, mat4 dest) { +glm_mat4_copy(mat4 mat, mat4 dest) { #ifdef __AVX__ _mm256_store_ps(dest[0], _mm256_load_ps(mat[0])); _mm256_store_ps(dest[2], _mm256_load_ps(mat[2])); @@ -60,7 +60,7 @@ glm_mat4_dup(mat4 mat, mat4 dest) { _mm_store_ps(dest[2], _mm_load_ps(mat[2])); _mm_store_ps(dest[3], _mm_load_ps(mat[3])); #else - glm_mat4_udup(mat, dest); + glm_mat4_ucopy(mat, dest); #endif } @@ -242,7 +242,7 @@ glm_mat4_mulv(mat4 m, vec4 v, vec4 dest) { res[1] = m[0][1] * v[0] + m[1][1] * v[1] + m[2][1] * v[2] + m[3][1] * v[3]; res[2] = m[0][2] * v[0] + m[1][2] * v[1] + m[2][2] * v[2] + m[3][2] * v[3]; res[3] = m[0][3] * v[0] + m[1][3] * v[1] + m[2][3] * v[2] + m[3][3] * v[3]; - glm_vec4_dup(res, dest); + glm_vec4_copy(res, dest); #endif } @@ -260,7 +260,7 @@ glm_mat4_mulv3(mat4 m, vec3 v, vec3 dest) { res[0] = m[0][0] * v[0] + m[1][0] * v[1] + m[2][0] * v[2]; res[1] = m[0][1] * v[0] + m[1][1] * v[1] + m[2][1] * v[2]; res[2] = m[0][2] * v[0] + m[1][2] * v[1] + m[2][2] * v[2]; - glm_vec_dup(res, dest); + glm_vec_copy(res, dest); } /*! @@ -477,9 +477,9 @@ CGLM_INLINE void glm_mat4_swap_col(mat4 mat, int col1, int col2) { vec4 tmp; - glm_vec4_dup(mat[col1], tmp); - glm_vec4_dup(mat[col2], mat[col1]); - glm_vec4_dup(tmp, mat[col2]); + glm_vec4_copy(mat[col1], tmp); + glm_vec4_copy(mat[col2], mat[col1]); + glm_vec4_copy(tmp, mat[col2]); } /*! diff --git a/include/cglm-mat3.h b/include/cglm-mat3.h index fcd5342..067a0f4 100644 --- a/include/cglm-mat3.h +++ b/include/cglm-mat3.h @@ -26,7 +26,7 @@ */ CGLM_INLINE void -glm_mat3_dup(mat3 mat, mat3 dest) { +glm_mat3_copy(mat3 mat, mat3 dest) { glm__memcpy(float, dest, mat, sizeof(mat3)); } @@ -217,9 +217,9 @@ CGLM_INLINE void glm_mat3_swap_col(mat3 mat, int col1, int col2) { vec3 tmp; - glm_vec_dup(mat[col1], tmp); - glm_vec_dup(mat[col2], mat[col1]); - glm_vec_dup(tmp, mat[col2]); + glm_vec_copy(mat[col1], tmp); + glm_vec_copy(mat[col2], mat[col1]); + glm_vec_copy(tmp, mat[col2]); } /*! diff --git a/include/cglm-quat.h b/include/cglm-quat.h index 61c398d..e9e5693 100644 --- a/include/cglm-quat.h +++ b/include/cglm-quat.h @@ -19,7 +19,7 @@ CGLM_INLINE void glm_quat_identity(versor q) { - glm_vec4_dup(GLM_QUAT_IDENTITY, q); + glm_vec4_copy(GLM_QUAT_IDENTITY, q); } CGLM_INLINE diff --git a/include/cglm-vec.h b/include/cglm-vec.h index 3c83b76..be706a6 100644 --- a/include/cglm-vec.h +++ b/include/cglm-vec.h @@ -25,7 +25,7 @@ */ CGLM_INLINE void -glm_vec_dup(vec3 a, vec3 dest) { +glm_vec_copy(vec3 a, vec3 dest) { dest[0] = a[0]; dest[1] = a[1]; dest[2] = a[2]; @@ -39,7 +39,7 @@ glm_vec_dup(vec3 a, vec3 dest) { */ CGLM_INLINE void -glm_vec4_dup3(vec4 a, vec3 dest) { +glm_vec4_copy3(vec4 a, vec3 dest) { dest[0] = a[0]; dest[1] = a[1]; dest[2] = a[2]; @@ -53,7 +53,7 @@ glm_vec4_dup3(vec4 a, vec3 dest) { */ CGLM_INLINE void -glm_vec4_dup(vec4 v, vec4 dest) { +glm_vec4_copy(vec4 v, vec4 dest) { #if defined( __SSE__ ) || defined( __SSE2__ ) _mm_store_ps(dest, _mm_load_ps(v)); #else @@ -475,7 +475,7 @@ glm_vec_rotate_m4(mat4 m, vec3 v, vec3 dest) { res[1] = x[1] * v[0] + y[1] * v[1] + z[1] * v[2]; res[2] = x[2] * v[0] + y[2] * v[1] + z[2] * v[2]; - glm_vec_dup(res, dest); + glm_vec_copy(res, dest); } /*! diff --git a/src/cglm-mat.c b/src/cglm-mat.c index 9cd121c..d2991a0 100644 --- a/src/cglm-mat.c +++ b/src/cglm-mat.c @@ -9,14 +9,14 @@ CGLM_EXPORT void -glmc_mat4_udup(mat4 mat, mat4 dest) { - glm_mat4_dup(mat, dest); +glmc_mat4_ucopy(mat4 mat, mat4 dest) { + glm_mat4_copy(mat, dest); } CGLM_EXPORT void -glmc_mat4_dup(mat4 mat, mat4 dest) { - glm_mat4_dup(mat, dest); +glmc_mat4_copy(mat4 mat, mat4 dest) { + glm_mat4_copy(mat, dest); } CGLM_EXPORT diff --git a/src/cglm-mat3.c b/src/cglm-mat3.c index d22e576..e8b4a70 100644 --- a/src/cglm-mat3.c +++ b/src/cglm-mat3.c @@ -9,8 +9,8 @@ CGLM_EXPORT void -glmc_mat3_dup(mat3 mat, mat3 dest) { - glm_mat3_dup(mat, dest); +glmc_mat3_copy(mat3 mat, mat3 dest) { + glm_mat3_copy(mat, dest); } CGLM_EXPORT diff --git a/src/cglm-vec.c b/src/cglm-vec.c index cd1d306..530b482 100644 --- a/src/cglm-vec.c +++ b/src/cglm-vec.c @@ -9,20 +9,20 @@ CGLM_EXPORT void -glmc_vec_dup(vec3 a, vec3 dest) { - glm_vec_dup(a, dest); +glmc_vec_copy(vec3 a, vec3 dest) { + glm_vec_copy(a, dest); } CGLM_EXPORT void -glmc_vec4_dup3(vec4 a, vec3 dest) { - glm_vec4_dup3(a, dest); +glmc_vec4_copy3(vec4 a, vec3 dest) { + glm_vec4_copy3(a, dest); } CGLM_EXPORT void -glmc_vec4_dup(vec4 v, vec4 dest) { - glm_vec4_dup(v, dest); +glmc_vec4_copy(vec4 v, vec4 dest) { + glm_vec4_copy(v, dest); } CGLM_EXPORT