diff --git a/basic-geometry/dual-number.c b/basic-geometry/dual-number.c index adc4a82..d8fd6bf 100644 --- a/basic-geometry/dual-number.c +++ b/basic-geometry/dual-number.c @@ -1,34 +1,43 @@ #include "dual-number.h" -inline void bgc_fp32_dual_number_reset(BGC_FP32_DualNumber* number); -inline void bgc_fp64_dual_number_reset(BGC_FP64_DualNumber* number); +extern inline void bgc_fp32_dual_number_reset(BGC_FP32_DualNumber* number); +extern inline void bgc_fp64_dual_number_reset(BGC_FP64_DualNumber* number); -inline void bgc_fp32_dual_number_make(BGC_FP32_DualNumber* number, const float real, const float dual); -inline void bgc_fp64_dual_number_make(BGC_FP64_DualNumber* number, const double real, const double dual); +extern inline void bgc_fp32_dual_number_make(BGC_FP32_DualNumber* number, const float real, const float dual); +extern inline void bgc_fp64_dual_number_make(BGC_FP64_DualNumber* number, const double real, const double dual); -inline void bgc_fp32_dual_number_copy(BGC_FP32_DualNumber* destination, const BGC_FP32_DualNumber* source); -inline void bgc_fp64_dual_number_copy(BGC_FP64_DualNumber* destination, const BGC_FP64_DualNumber* source); +extern inline void bgc_fp32_dual_number_copy(BGC_FP32_DualNumber* destination, const BGC_FP32_DualNumber* source); +extern inline void bgc_fp64_dual_number_copy(BGC_FP64_DualNumber* destination, const BGC_FP64_DualNumber* source); -inline void bgc_fp32_dual_number_swap(BGC_FP32_DualNumber* first, BGC_FP32_DualNumber* second); -inline void bgc_fp64_dual_number_swap(BGC_FP64_DualNumber* first, BGC_FP64_DualNumber* second); +extern inline void bgc_fp32_dual_number_swap(BGC_FP32_DualNumber* first, BGC_FP32_DualNumber* second); +extern inline void bgc_fp64_dual_number_swap(BGC_FP64_DualNumber* first, BGC_FP64_DualNumber* second); -inline void bgc_fp32_dual_number_add(BGC_FP32_DualNumber* sum, const BGC_FP32_DualNumber* first, const BGC_FP32_DualNumber* second); -inline void bgc_fp64_dual_number_add(BGC_FP64_DualNumber* sum, const BGC_FP64_DualNumber* first, const BGC_FP64_DualNumber* second); +extern inline void bgc_fp32_dual_number_add(BGC_FP32_DualNumber* sum, const BGC_FP32_DualNumber* first, const BGC_FP32_DualNumber* second); +extern inline void bgc_fp64_dual_number_add(BGC_FP64_DualNumber* sum, const BGC_FP64_DualNumber* first, const BGC_FP64_DualNumber* second); -inline void bgc_fp32_dual_number_add_scaled(BGC_FP32_DualNumber* sum, const BGC_FP32_DualNumber* base_number, const BGC_FP32_DualNumber* scalable_number, const float scale); -inline void bgc_fp64_dual_number_add_scaled(BGC_FP64_DualNumber* sum, const BGC_FP64_DualNumber* base_number, const BGC_FP64_DualNumber* scalable_number, const double scale); +extern inline void bgc_fp32_dual_number_add_scaled(BGC_FP32_DualNumber* sum, const BGC_FP32_DualNumber* base_number, const BGC_FP32_DualNumber* scalable_number, const float scale); +extern inline void bgc_fp64_dual_number_add_scaled(BGC_FP64_DualNumber* sum, const BGC_FP64_DualNumber* base_number, const BGC_FP64_DualNumber* scalable_number, const double scale); -inline void bgc_fp32_dual_number_subtract(BGC_FP32_DualNumber* difference, const BGC_FP32_DualNumber* minuend, const BGC_FP32_DualNumber* subtrahend); -inline void bgc_fp64_dual_number_subtract(BGC_FP64_DualNumber* difference, const BGC_FP64_DualNumber* minuend, const BGC_FP64_DualNumber* subtrahend); +extern inline void bgc_fp32_dual_number_subtract(BGC_FP32_DualNumber* difference, const BGC_FP32_DualNumber* minuend, const BGC_FP32_DualNumber* subtrahend); +extern inline void bgc_fp64_dual_number_subtract(BGC_FP64_DualNumber* difference, const BGC_FP64_DualNumber* minuend, const BGC_FP64_DualNumber* subtrahend); -inline void bgc_fp32_dual_number_multiply(BGC_FP32_DualNumber* product, const BGC_FP32_DualNumber* multiplicand, const float multiplier); -inline void bgc_fp64_dual_number_multiply(BGC_FP64_DualNumber* product, const BGC_FP64_DualNumber* multiplicand, const double multiplier); +extern inline void bgc_fp32_dual_number_multiply(BGC_FP32_DualNumber* product, const BGC_FP32_DualNumber* multiplicand, const float multiplier); +extern inline void bgc_fp64_dual_number_multiply(BGC_FP64_DualNumber* product, const BGC_FP64_DualNumber* multiplicand, const double multiplier); -inline void bgc_fp32_dual_number_divide(BGC_FP32_DualNumber* quotient, const BGC_FP32_DualNumber* dividend, const float divisor); -inline void bgc_fp64_dual_number_divide(BGC_FP64_DualNumber* quotient, const BGC_FP64_DualNumber* dividend, const double divisor); +extern inline void bgc_fp32_dual_number_divide(BGC_FP32_DualNumber* quotient, const BGC_FP32_DualNumber* dividend, const float divisor); +extern inline void bgc_fp64_dual_number_divide(BGC_FP64_DualNumber* quotient, const BGC_FP64_DualNumber* dividend, const double divisor); -inline void bgc_fp32_dual_number_get_mean2(BGC_FP32_DualNumber* mean, const BGC_FP32_DualNumber* first, const BGC_FP32_DualNumber* second); -inline void bgc_fp64_dual_number_get_mean2(BGC_FP64_DualNumber* mean, const BGC_FP64_DualNumber* first, const BGC_FP64_DualNumber* second); +extern inline void bgc_fp32_dual_number_get_mean2(BGC_FP32_DualNumber* mean, const BGC_FP32_DualNumber* first, const BGC_FP32_DualNumber* second); +extern inline void bgc_fp64_dual_number_get_mean2(BGC_FP64_DualNumber* mean, const BGC_FP64_DualNumber* first, const BGC_FP64_DualNumber* second); -inline void bgc_fp32_dual_number_get_mean3(BGC_FP32_DualNumber* mean, const BGC_FP32_DualNumber* first, const BGC_FP32_DualNumber* second, const BGC_FP32_DualNumber* third); -inline void bgc_fp64_dual_number_get_mean3(BGC_FP64_DualNumber* mean, const BGC_FP64_DualNumber* first, const BGC_FP64_DualNumber* second, const BGC_FP64_DualNumber* third); +extern inline void bgc_fp32_dual_number_get_mean3(BGC_FP32_DualNumber* mean, const BGC_FP32_DualNumber* first, const BGC_FP32_DualNumber* second, const BGC_FP32_DualNumber* third); +extern inline void bgc_fp64_dual_number_get_mean3(BGC_FP64_DualNumber* mean, const BGC_FP64_DualNumber* first, const BGC_FP64_DualNumber* second, const BGC_FP64_DualNumber* third); + +extern inline void bgc_fp32_dual_number_interpolate(BGC_FP32_DualNumber* interpolation, const BGC_FP32_DualNumber* first, const BGC_FP32_DualNumber* second, const float phase); +extern inline void bgc_fp64_dual_number_interpolate(BGC_FP64_DualNumber* interpolation, const BGC_FP64_DualNumber* first, const BGC_FP64_DualNumber* second, const double phase); + +extern inline void bgc_fp32_dual_number_revert(BGC_FP32_DualNumber* number); +extern inline void bgc_fp64_dual_number_revert(BGC_FP64_DualNumber* number); + +extern inline void bgc_fp32_number_get_reverse(BGC_FP32_DualNumber* reverse, const BGC_FP32_DualNumber* number); +extern inline void bgc_fp64_number_get_reverse(BGC_FP64_DualNumber* reverse, const BGC_FP64_DualNumber* number); diff --git a/basic-geometry/dual-number.h b/basic-geometry/dual-number.h index 98a961a..f1a4e2a 100644 --- a/basic-geometry/dual-number.h +++ b/basic-geometry/dual-number.h @@ -165,4 +165,50 @@ inline void bgc_fp64_dual_number_get_mean3(BGC_FP64_DualNumber* mean, const BGC_ mean->dual = (first->dual + second->dual + third->dual) * BGC_FP64_ONE_THIRD; } +// ============ Linear Interpolation ============ // + +inline void bgc_fp32_dual_number_interpolate(BGC_FP32_DualNumber* interpolation, const BGC_FP32_DualNumber* first, const BGC_FP32_DualNumber* second, const float phase) +{ + const float counter_phase = 1.0f - phase; + + interpolation->real = first->real *counter_phase + second->real * phase; + interpolation->dual = first->dual *counter_phase + second->dual * phase; +} + +inline void bgc_fp64_dual_number_interpolate(BGC_FP64_DualNumber* interpolation, const BGC_FP64_DualNumber* first, const BGC_FP64_DualNumber* second, const double phase) +{ + const double counter_phase = 1.0 - phase; + + interpolation->real = first->real * counter_phase + second->real * phase; + interpolation->dual = first->dual * counter_phase + second->dual * phase; +} + +// =================== Revert =================== // + +inline void bgc_fp32_dual_number_revert(BGC_FP32_DualNumber* number) +{ + number->real = -number->real; + number->dual = -number->dual; +} + +inline void bgc_fp64_dual_number_revert(BGC_FP64_DualNumber* number) +{ + number->real = -number->real; + number->dual = -number->dual; +} + +// ================ Get Reverse ================= // + +inline void bgc_fp32_number_get_reverse(BGC_FP32_DualNumber* reverse, const BGC_FP32_DualNumber* number) +{ + reverse->real = -number->real; + reverse->dual = -number->dual; +} + +inline void bgc_fp64_number_get_reverse(BGC_FP64_DualNumber* reverse, const BGC_FP64_DualNumber* number) +{ + reverse->real = -number->real; + reverse->dual = -number->dual; +} + #endif diff --git a/basic-geometry/dual-quaternion.c b/basic-geometry/dual-quaternion.c index 74d8b4c..4db7e44 100644 --- a/basic-geometry/dual-quaternion.c +++ b/basic-geometry/dual-quaternion.c @@ -33,5 +33,11 @@ extern inline void bgc_fp64_dual_quaternion_get_mean2(BGC_FP64_DualQuaternion* m extern inline void bgc_fp32_dual_quaternion_get_mean3(BGC_FP32_DualQuaternion* mean, const BGC_FP32_DualQuaternion* quaternion1, const BGC_FP32_DualQuaternion* quaternion2, const BGC_FP32_DualQuaternion* quaternion3); extern inline void bgc_fp64_dual_quaternion_get_mean3(BGC_FP64_DualQuaternion* mean, const BGC_FP64_DualQuaternion* quaternion1, const BGC_FP64_DualQuaternion* quaternion2, const BGC_FP64_DualQuaternion* quaternion3); -extern inline void bgc_fp32_dual_quaternion_interpolate(BGC_FP32_DualQuaternion* interpolation, const BGC_FP32_DualQuaternion* quaternion1, const BGC_FP32_DualQuaternion* quaternion2, const float phase); -extern inline void bgc_fp64_dual_quaternion_interpolate(BGC_FP64_DualQuaternion* interpolation, const BGC_FP64_DualQuaternion* quaternion1, const BGC_FP64_DualQuaternion* quaternion2, const double phase); +extern inline void bgc_fp32_dual_quaternion_interpolate(BGC_FP32_DualQuaternion* interpolation, const BGC_FP32_DualQuaternion* first, const BGC_FP32_DualQuaternion* second, const float phase); +extern inline void bgc_fp64_dual_quaternion_interpolate(BGC_FP64_DualQuaternion* interpolation, const BGC_FP64_DualQuaternion* first, const BGC_FP64_DualQuaternion* second, const double phase); + +extern inline void bgc_fp32_dual_quaternion_revert(BGC_FP32_DualQuaternion* quaternion); +extern inline void bgc_fp64_dual_quaternion_revert(BGC_FP64_DualQuaternion* quaternion); + +extern inline void bgc_fp32_dual_quaternion_get_reverse(BGC_FP32_DualQuaternion* reverse, const BGC_FP32_DualQuaternion* quaternion); +extern inline void bgc_fp64_dual_quaternion_get_reverse(BGC_FP64_DualQuaternion* reverse, const BGC_FP64_DualQuaternion* quaternion); diff --git a/basic-geometry/dual-quaternion.h b/basic-geometry/dual-quaternion.h index 97784b6..e3f3357 100644 --- a/basic-geometry/dual-quaternion.h +++ b/basic-geometry/dual-quaternion.h @@ -167,16 +167,44 @@ inline void bgc_fp64_dual_quaternion_get_mean3(BGC_FP64_DualQuaternion* mean, co // ============ Linear Interpolation ============ // -inline void bgc_fp32_dual_quaternion_interpolate(BGC_FP32_DualQuaternion* interpolation, const BGC_FP32_DualQuaternion* quaternion1, const BGC_FP32_DualQuaternion* quaternion2, const float phase) +inline void bgc_fp32_dual_quaternion_interpolate(BGC_FP32_DualQuaternion* interpolation, const BGC_FP32_DualQuaternion* first, const BGC_FP32_DualQuaternion* second, const float phase) { - bgc_fp32_quaternion_interpolate(&interpolation->real, &quaternion1->real, &quaternion2->real, phase); - bgc_fp32_quaternion_interpolate(&interpolation->dual, &quaternion1->dual, &quaternion2->dual, phase); + bgc_fp32_quaternion_interpolate(&interpolation->real, &first->real, &second->real, phase); + bgc_fp32_quaternion_interpolate(&interpolation->dual, &first->dual, &second->dual, phase); } -inline void bgc_fp64_dual_quaternion_interpolate(BGC_FP64_DualQuaternion* interpolation, const BGC_FP64_DualQuaternion* quaternion1, const BGC_FP64_DualQuaternion* quaternion2, const double phase) +inline void bgc_fp64_dual_quaternion_interpolate(BGC_FP64_DualQuaternion* interpolation, const BGC_FP64_DualQuaternion* first, const BGC_FP64_DualQuaternion* second, const double phase) { - bgc_fp64_quaternion_interpolate(&interpolation->real, &quaternion1->real, &quaternion2->real, phase); - bgc_fp64_quaternion_interpolate(&interpolation->dual, &quaternion1->dual, &quaternion2->dual, phase); + bgc_fp64_quaternion_interpolate(&interpolation->real, &first->real, &second->real, phase); + bgc_fp64_quaternion_interpolate(&interpolation->dual, &first->dual, &second->dual, phase); +} + +// =================== Revert =================== // + +inline void bgc_fp32_dual_quaternion_revert(BGC_FP32_DualQuaternion* quaternion) +{ + bgc_fp32_quaternion_revert(&quaternion->real); + bgc_fp32_quaternion_revert(&quaternion->dual); +} + +inline void bgc_fp64_dual_quaternion_revert(BGC_FP64_DualQuaternion* quaternion) +{ + bgc_fp64_quaternion_revert(&quaternion->real); + bgc_fp64_quaternion_revert(&quaternion->dual); +} + +// ================ Get Reverse ================= // + +inline void bgc_fp32_dual_quaternion_get_reverse(BGC_FP32_DualQuaternion* reverse, const BGC_FP32_DualQuaternion* quaternion) +{ + bgc_fp32_quaternion_get_reverse(&reverse->real, &quaternion->real); + bgc_fp32_quaternion_get_reverse(&reverse->dual, &quaternion->dual); +} + +inline void bgc_fp64_dual_quaternion_get_reverse(BGC_FP64_DualQuaternion* reverse, const BGC_FP64_DualQuaternion* quaternion) +{ + bgc_fp64_quaternion_get_reverse(&reverse->real, &quaternion->real); + bgc_fp64_quaternion_get_reverse(&reverse->dual, &quaternion->dual); } #endif diff --git a/basic-geometry/dual-vector3.c b/basic-geometry/dual-vector3.c index 7e5d379..8b2b8cf 100644 --- a/basic-geometry/dual-vector3.c +++ b/basic-geometry/dual-vector3.c @@ -39,5 +39,11 @@ extern inline void bgc_fp64_dual_vector3_get_mean2(BGC_FP64_DualVector3* mean, c extern inline void bgc_fp32_dual_vector3_get_mean3(BGC_FP32_DualVector3* mean, const BGC_FP32_DualVector3* vector1, const BGC_FP32_DualVector3* vector2, const BGC_FP32_DualVector3* vector3); extern inline void bgc_fp64_dual_vector3_get_mean3(BGC_FP64_DualVector3* mean, const BGC_FP64_DualVector3* vector1, const BGC_FP64_DualVector3* vector2, const BGC_FP64_DualVector3* vector3); -extern inline void bgc_fp32_dual_vector3_interpolate(BGC_FP32_DualVector3* interpolation, const BGC_FP32_DualVector3* quaternion1, const BGC_FP32_DualVector3* quaternion2, const float phase); -extern inline void bgc_fp64_dual_vector3_interpolate(BGC_FP64_DualVector3* interpolation, const BGC_FP64_DualVector3* quaternion1, const BGC_FP64_DualVector3* quaternion2, const double phase); +extern inline void bgc_fp32_dual_vector3_interpolate(BGC_FP32_DualVector3* interpolation, const BGC_FP32_DualVector3* first, const BGC_FP32_DualVector3* second, const float phase); +extern inline void bgc_fp64_dual_vector3_interpolate(BGC_FP64_DualVector3* interpolation, const BGC_FP64_DualVector3* first, const BGC_FP64_DualVector3* second, const double phase); + +extern inline void bgc_fp32_dual_vector3_revert(BGC_FP32_DualVector3* vector); +extern inline void bgc_fp64_dual_vector3_revert(BGC_FP64_DualVector3* vector); + +extern inline void bgc_fp32_dual_vector3_get_reverse(BGC_FP32_DualVector3* reverse, const BGC_FP32_DualVector3* vector); +extern inline void bgc_fp64_dual_vector3_get_reverse(BGC_FP64_DualVector3* reverse, const BGC_FP64_DualVector3* vector); diff --git a/basic-geometry/dual-vector3.h b/basic-geometry/dual-vector3.h index b62efaa..5125099 100644 --- a/basic-geometry/dual-vector3.h +++ b/basic-geometry/dual-vector3.h @@ -169,7 +169,7 @@ inline void bgc_fp64_dual_vector3_divide(BGC_FP64_DualVector3* quotient, const B bgc_fp64_dual_vector3_multiply(quotient, dividend, 1.0 / divisor); } -// ================== Average2 ================== // +// ================ Mean of Two ================= // inline void bgc_fp32_dual_vector3_get_mean2(BGC_FP32_DualVector3* mean, const BGC_FP32_DualVector3* vector1, const BGC_FP32_DualVector3* vector2) { @@ -183,7 +183,7 @@ inline void bgc_fp64_dual_vector3_get_mean2(BGC_FP64_DualVector3* mean, const BG bgc_fp64_vector3_get_mean2(&mean->dual, &vector1->dual, &vector2->dual); } -// ================== Average3 ================== // +// =============== Mean of Three ================ // inline void bgc_fp32_dual_vector3_get_mean3(BGC_FP32_DualVector3* mean, const BGC_FP32_DualVector3* vector1, const BGC_FP32_DualVector3* vector2, const BGC_FP32_DualVector3* vector3) { @@ -199,16 +199,44 @@ inline void bgc_fp64_dual_vector3_get_mean3(BGC_FP64_DualVector3* mean, const BG // ============ Linear Interpolation ============ // -inline void bgc_fp32_dual_vector3_interpolate(BGC_FP32_DualVector3* interpolation, const BGC_FP32_DualVector3* quaternion1, const BGC_FP32_DualVector3* quaternion2, const float phase) +inline void bgc_fp32_dual_vector3_interpolate(BGC_FP32_DualVector3* interpolation, const BGC_FP32_DualVector3* first, const BGC_FP32_DualVector3* second, const float phase) { - bgc_fp32_vector3_interpolate(&interpolation->real, &quaternion1->real, &quaternion2->real, phase); - bgc_fp32_vector3_interpolate(&interpolation->dual, &quaternion1->dual, &quaternion2->dual, phase); + bgc_fp32_vector3_interpolate(&interpolation->real, &first->real, &second->real, phase); + bgc_fp32_vector3_interpolate(&interpolation->dual, &first->dual, &second->dual, phase); } -inline void bgc_fp64_dual_vector3_interpolate(BGC_FP64_DualVector3* interpolation, const BGC_FP64_DualVector3* quaternion1, const BGC_FP64_DualVector3* quaternion2, const double phase) +inline void bgc_fp64_dual_vector3_interpolate(BGC_FP64_DualVector3* interpolation, const BGC_FP64_DualVector3* first, const BGC_FP64_DualVector3* second, const double phase) { - bgc_fp64_vector3_interpolate(&interpolation->real, &quaternion1->real, &quaternion2->real, phase); - bgc_fp64_vector3_interpolate(&interpolation->dual, &quaternion1->dual, &quaternion2->dual, phase); + bgc_fp64_vector3_interpolate(&interpolation->real, &first->real, &second->real, phase); + bgc_fp64_vector3_interpolate(&interpolation->dual, &first->dual, &second->dual, phase); +} + +// =================== Revert =================== // + +inline void bgc_fp32_dual_vector3_revert(BGC_FP32_DualVector3* vector) +{ + bgc_fp32_vector3_revert(&vector->real); + bgc_fp32_vector3_revert(&vector->dual); +} + +inline void bgc_fp64_dual_vector3_revert(BGC_FP64_DualVector3* vector) +{ + bgc_fp64_vector3_revert(&vector->real); + bgc_fp64_vector3_revert(&vector->dual); +} + +// ================ Get Reverse ================= // + +inline void bgc_fp32_dual_vector3_get_reverse(BGC_FP32_DualVector3* reverse, const BGC_FP32_DualVector3* vector) +{ + bgc_fp32_vector3_get_reverse(&reverse->real, &vector->real); + bgc_fp32_vector3_get_reverse(&reverse->dual, &vector->dual); +} + +inline void bgc_fp64_dual_vector3_get_reverse(BGC_FP64_DualVector3* reverse, const BGC_FP64_DualVector3* vector) +{ + bgc_fp64_vector3_get_reverse(&reverse->real, &vector->real); + bgc_fp64_vector3_get_reverse(&reverse->dual, &vector->dual); } #endif diff --git a/basic-geometry/vector2.c b/basic-geometry/vector2.c index bb854bb..a80308d 100644 --- a/basic-geometry/vector2.c +++ b/basic-geometry/vector2.c @@ -48,8 +48,8 @@ extern inline void bgc_fp64_vector2_get_mean2(BGC_FP64_Vector2* mean, const BGC_ extern inline void bgc_fp32_vector2_get_mean3(BGC_FP32_Vector2* mean, const BGC_FP32_Vector2* vector1, const BGC_FP32_Vector2* vector2, const BGC_FP32_Vector2* vector3); extern inline void bgc_fp64_vector2_get_mean3(BGC_FP64_Vector2* mean, const BGC_FP64_Vector2* vector1, const BGC_FP64_Vector2* vector2, const BGC_FP64_Vector2* vector3); -extern inline void bgc_fp32_vector2_interpolate(BGC_FP32_Vector2* interpolation, const BGC_FP32_Vector2* vector1, const BGC_FP32_Vector2* vector2, const float phase); -extern inline void bgc_fp64_vector2_interpolate(BGC_FP64_Vector2* interpolation, const BGC_FP64_Vector2* vector1, const BGC_FP64_Vector2* vector2, const double phase); +extern inline void bgc_fp32_vector2_interpolate(BGC_FP32_Vector2* interpolation, const BGC_FP32_Vector2* first, const BGC_FP32_Vector2* second, const float phase); +extern inline void bgc_fp64_vector2_interpolate(BGC_FP64_Vector2* interpolation, const BGC_FP64_Vector2* first, const BGC_FP64_Vector2* second, const double phase); extern inline void bgc_fp32_vector2_revert(BGC_FP32_Vector2* vector); extern inline void bgc_fp64_vector2_revert(BGC_FP64_Vector2* vector); diff --git a/basic-geometry/vector2.h b/basic-geometry/vector2.h index 7b1b38a..0dc1096 100644 --- a/basic-geometry/vector2.h +++ b/basic-geometry/vector2.h @@ -240,20 +240,20 @@ inline void bgc_fp64_vector2_get_mean3(BGC_FP64_Vector2* mean, const BGC_FP64_Ve // =================== Linear =================== // -inline void bgc_fp32_vector2_interpolate(BGC_FP32_Vector2* interpolation, const BGC_FP32_Vector2* vector1, const BGC_FP32_Vector2* vector2, const float phase) +inline void bgc_fp32_vector2_interpolate(BGC_FP32_Vector2* interpolation, const BGC_FP32_Vector2* first, const BGC_FP32_Vector2* second, const float phase) { const float counter_phase = 1.0f - phase; - interpolation->x1 = vector1->x1 * counter_phase + vector2->x1 * phase; - interpolation->x2 = vector1->x2 * counter_phase + vector2->x2 * phase; + interpolation->x1 = first->x1 * counter_phase + second->x1 * phase; + interpolation->x2 = first->x2 * counter_phase + second->x2 * phase; } -inline void bgc_fp64_vector2_interpolate(BGC_FP64_Vector2* interpolation, const BGC_FP64_Vector2* vector1, const BGC_FP64_Vector2* vector2, const double phase) +inline void bgc_fp64_vector2_interpolate(BGC_FP64_Vector2* interpolation, const BGC_FP64_Vector2* first, const BGC_FP64_Vector2* second, const double phase) { const double counter_phase = 1.0 - phase; - interpolation->x1 = vector1->x1 * counter_phase + vector2->x1 * phase; - interpolation->x2 = vector1->x2 * counter_phase + vector2->x2 * phase; + interpolation->x1 = first->x1 * counter_phase + second->x1 * phase; + interpolation->x2 = first->x2 * counter_phase + second->x2 * phase; } // ================== Negative ================== // diff --git a/basic-geometry/vector3.h b/basic-geometry/vector3.h index 3ed50c5..a9cdeb6 100644 --- a/basic-geometry/vector3.h +++ b/basic-geometry/vector3.h @@ -268,22 +268,22 @@ inline void bgc_fp64_vector3_get_mean3(BGC_FP64_Vector3* mean, const BGC_FP64_Ve // =================== Linear =================== // -inline void bgc_fp32_vector3_interpolate(BGC_FP32_Vector3* interpolation, const BGC_FP32_Vector3* vector1, const BGC_FP32_Vector3* vector2, const float phase) +inline void bgc_fp32_vector3_interpolate(BGC_FP32_Vector3* interpolation, const BGC_FP32_Vector3* first, const BGC_FP32_Vector3* second, const float phase) { const float counter_phase = 1.0f - phase; - interpolation->x1 = vector1->x1 * counter_phase + vector2->x1 * phase; - interpolation->x2 = vector1->x2 * counter_phase + vector2->x2 * phase; - interpolation->x3 = vector1->x3 * counter_phase + vector2->x3 * phase; + interpolation->x1 = first->x1 * counter_phase + second->x1 * phase; + interpolation->x2 = first->x2 * counter_phase + second->x2 * phase; + interpolation->x3 = first->x3 * counter_phase + second->x3 * phase; } -inline void bgc_fp64_vector3_interpolate(BGC_FP64_Vector3* interpolation, const BGC_FP64_Vector3* vector1, const BGC_FP64_Vector3* vector2, const double phase) +inline void bgc_fp64_vector3_interpolate(BGC_FP64_Vector3* interpolation, const BGC_FP64_Vector3* first, const BGC_FP64_Vector3* second, const double phase) { const double counter_phase = 1.0 - phase; - interpolation->x1 = vector1->x1 * counter_phase + vector2->x1 * phase; - interpolation->x2 = vector1->x2 * counter_phase + vector2->x2 * phase; - interpolation->x3 = vector1->x3 * counter_phase + vector2->x3 * phase; + interpolation->x1 = first->x1 * counter_phase + second->x1 * phase; + interpolation->x2 = first->x2 * counter_phase + second->x2 * phase; + interpolation->x3 = first->x3 * counter_phase + second->x3 * phase; } // ================== Negative ================== //