Продолжение переименования типов и функций
This commit is contained in:
parent
605afabd94
commit
3b6efaafa9
25 changed files with 768 additions and 916 deletions
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
// =================== Reset ==================== //
|
||||
|
||||
static inline void fp32_matrix2x3_reset(fp32_matrix2x3_t* matrix)
|
||||
inline void matrix2x3_reset_fp32(matrix2x3_fp32_t* matrix)
|
||||
{
|
||||
matrix->r1c1 = 0.0f;
|
||||
matrix->r1c2 = 0.0f;
|
||||
|
|
@ -19,7 +19,7 @@ static inline void fp32_matrix2x3_reset(fp32_matrix2x3_t* matrix)
|
|||
matrix->r3c2 = 0.0f;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix2x3_reset(fp64_matrix2x3_t* matrix)
|
||||
inline void matrix2x3_reset_fp64(matrix2x3_fp64_t* matrix)
|
||||
{
|
||||
matrix->r1c1 = 0.0;
|
||||
matrix->r1c2 = 0.0;
|
||||
|
|
@ -33,7 +33,7 @@ static inline void fp64_matrix2x3_reset(fp64_matrix2x3_t* matrix)
|
|||
|
||||
// ==================== Copy ==================== //
|
||||
|
||||
static inline void fp32_matrix2x3_copy(const fp32_matrix2x3_t* from, fp32_matrix2x3_t* to)
|
||||
inline void matrix2x3_copy_fp32(const matrix2x3_fp32_t* from, matrix2x3_fp32_t* to)
|
||||
{
|
||||
to->r1c1 = from->r1c1;
|
||||
to->r1c2 = from->r1c2;
|
||||
|
|
@ -45,7 +45,7 @@ static inline void fp32_matrix2x3_copy(const fp32_matrix2x3_t* from, fp32_matrix
|
|||
to->r3c2 = from->r3c2;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix2x3_copy(const fp64_matrix2x3_t* from, fp64_matrix2x3_t* to)
|
||||
inline void matrix2x3_copy_fp64(const matrix2x3_fp64_t* from, matrix2x3_fp64_t* to)
|
||||
{
|
||||
to->r1c1 = from->r1c1;
|
||||
to->r1c2 = from->r1c2;
|
||||
|
|
@ -59,7 +59,7 @@ static inline void fp64_matrix2x3_copy(const fp64_matrix2x3_t* from, fp64_matrix
|
|||
|
||||
// ==================== Swap ==================== //
|
||||
|
||||
static inline void fp32_matrix2x3_swap(fp32_matrix2x3_t* matrix1, fp32_matrix2x3_t* matrix2)
|
||||
inline void matrix2x3_swap_fp32(matrix2x3_fp32_t* matrix1, matrix2x3_fp32_t* matrix2)
|
||||
{
|
||||
const float r1c1 = matrix2->r1c1;
|
||||
const float r1c2 = matrix2->r1c2;
|
||||
|
|
@ -89,7 +89,7 @@ static inline void fp32_matrix2x3_swap(fp32_matrix2x3_t* matrix1, fp32_matrix2x3
|
|||
matrix1->r3c2 = r3c2;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix2x3_swap(fp64_matrix2x3_t* matrix1, fp64_matrix2x3_t* matrix2)
|
||||
inline void matrix2x3_swap_fp64(matrix2x3_fp64_t* matrix1, matrix2x3_fp64_t* matrix2)
|
||||
{
|
||||
const double r1c1 = matrix2->r1c1;
|
||||
const double r1c2 = matrix2->r1c2;
|
||||
|
|
@ -121,7 +121,7 @@ static inline void fp64_matrix2x3_swap(fp64_matrix2x3_t* matrix1, fp64_matrix2x3
|
|||
|
||||
// ============= Copy to twin type ============== //
|
||||
|
||||
static inline void fp32_matrix2x3_set_from_fp64(const fp64_matrix2x3_t* from, fp32_matrix2x3_t* to)
|
||||
inline void matrix2x3_fp32_set_from_fp64(const matrix2x3_fp64_t* from, matrix2x3_fp32_t* to)
|
||||
{
|
||||
to->r1c1 = (float) from->r1c1;
|
||||
to->r1c2 = (float) from->r1c2;
|
||||
|
|
@ -133,7 +133,7 @@ static inline void fp32_matrix2x3_set_from_fp64(const fp64_matrix2x3_t* from, fp
|
|||
to->r3c2 = (float) from->r3c2;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix2x3_set_from_fp32(const fp32_matrix2x3_t* from, fp64_matrix2x3_t* to)
|
||||
inline void matrix2x3_fp64_set_from_fp32(const matrix2x3_fp32_t* from, matrix2x3_fp64_t* to)
|
||||
{
|
||||
to->r1c1 = from->r1c1;
|
||||
to->r1c2 = from->r1c2;
|
||||
|
|
@ -147,7 +147,7 @@ static inline void fp64_matrix2x3_set_from_fp32(const fp32_matrix2x3_t* from, fp
|
|||
|
||||
// =============== Set transposed =============== //
|
||||
|
||||
static inline void fp32_matrix2x3_set_transposed(const fp32_matrix3x2_t* from, fp32_matrix2x3_t* to)
|
||||
inline void matrix2x3_fp32_set_transposed(const matrix3x2_fp32_t* from, matrix2x3_fp32_t* to)
|
||||
{
|
||||
to->r1c1 = from->r1c1;
|
||||
to->r1c2 = from->r2c1;
|
||||
|
|
@ -159,7 +159,7 @@ static inline void fp32_matrix2x3_set_transposed(const fp32_matrix3x2_t* from, f
|
|||
to->r3c2 = from->r2c3;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix2x3_set_transposed(const fp64_matrix3x2_t* from, fp64_matrix2x3_t* to)
|
||||
inline void matrix2x3_fp64_set_transposed(const matrix3x2_fp64_t* from, matrix2x3_fp64_t* to)
|
||||
{
|
||||
to->r1c1 = from->r1c1;
|
||||
to->r1c2 = from->r2c1;
|
||||
|
|
@ -173,7 +173,7 @@ static inline void fp64_matrix2x3_set_transposed(const fp64_matrix3x2_t* from, f
|
|||
|
||||
// =============== Set transposed =============== //
|
||||
|
||||
static inline void fp32_matrix2x3_set_transposed_fp64(const fp64_matrix3x2_t* from, fp32_matrix2x3_t* to)
|
||||
inline void matrix2x3_fp32_set_transposed_fp64(const matrix3x2_fp64_t* from, matrix2x3_fp32_t* to)
|
||||
{
|
||||
to->r1c1 = (float) from->r1c1;
|
||||
to->r1c2 = (float) from->r2c1;
|
||||
|
|
@ -185,7 +185,7 @@ static inline void fp32_matrix2x3_set_transposed_fp64(const fp64_matrix3x2_t* fr
|
|||
to->r3c2 = (float) from->r2c3;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix2x3_set_transposed_fp32(const fp32_matrix3x2_t* from, fp64_matrix2x3_t* to)
|
||||
inline void matrix2x3_fp64_set_transposed_fp32(const matrix3x2_fp32_t* from, matrix2x3_fp64_t* to)
|
||||
{
|
||||
to->r1c1 = from->r1c1;
|
||||
to->r1c2 = from->r2c1;
|
||||
|
|
@ -199,13 +199,13 @@ static inline void fp64_matrix2x3_set_transposed_fp32(const fp32_matrix3x2_t* fr
|
|||
|
||||
// ================= Set Row 1 ================== //
|
||||
|
||||
static inline void fp32_matrix2x3_set_row1(const float c1, const float c2, fp32_matrix2x3_t* matrix)
|
||||
inline void matrix2x3_fp32_set_row1(const float c1, const float c2, matrix2x3_fp32_t* matrix)
|
||||
{
|
||||
matrix->r1c1 = c1;
|
||||
matrix->r1c2 = c2;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix2x3_set_row1(const double c1, const double c2, fp64_matrix2x3_t* matrix)
|
||||
inline void matrix2x3_fp64_set_row1(const double c1, const double c2, matrix2x3_fp64_t* matrix)
|
||||
{
|
||||
matrix->r1c1 = c1;
|
||||
matrix->r1c2 = c2;
|
||||
|
|
@ -213,13 +213,13 @@ static inline void fp64_matrix2x3_set_row1(const double c1, const double c2, fp6
|
|||
|
||||
// ================= Set Row 2 ================== //
|
||||
|
||||
static inline void fp32_matrix2x3_set_row2(const float c1, const float c2, fp32_matrix2x3_t* matrix)
|
||||
inline void matrix2x3_fp32_set_row2(const float c1, const float c2, matrix2x3_fp32_t* matrix)
|
||||
{
|
||||
matrix->r2c1 = c1;
|
||||
matrix->r2c2 = c2;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix2x3_set_row2(const double c1, const double c2, fp64_matrix2x3_t* matrix)
|
||||
inline void matrix2x3_fp64_set_row2(const double c1, const double c2, matrix2x3_fp64_t* matrix)
|
||||
{
|
||||
matrix->r2c1 = c1;
|
||||
matrix->r2c2 = c2;
|
||||
|
|
@ -227,13 +227,13 @@ static inline void fp64_matrix2x3_set_row2(const double c1, const double c2, fp6
|
|||
|
||||
// ================= Set Row 3 ================== //
|
||||
|
||||
static inline void fp32_matrix2x3_set_row3(const float c1, const float c2, fp32_matrix2x3_t* matrix)
|
||||
inline void matrix2x3_fp32_set_row3(const float c1, const float c2, matrix2x3_fp32_t* matrix)
|
||||
{
|
||||
matrix->r3c1 = c1;
|
||||
matrix->r3c2 = c2;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix2x3_set_row3(const double c1, const double c2, fp64_matrix2x3_t* matrix)
|
||||
inline void matrix2x3_fp64_set_row3(const double c1, const double c2, matrix2x3_fp64_t* matrix)
|
||||
{
|
||||
matrix->r3c1 = c1;
|
||||
matrix->r3c2 = c2;
|
||||
|
|
@ -241,14 +241,14 @@ static inline void fp64_matrix2x3_set_row3(const double c1, const double c2, fp6
|
|||
|
||||
// ================ Set Column 1 ================ //
|
||||
|
||||
static inline void fp32_matrix2x3_set_column1(const float r1, const float r2, const float r3, fp32_matrix2x3_t* matrix)
|
||||
inline void matrix2x3_fp32_set_column1(const float r1, const float r2, const float r3, matrix2x3_fp32_t* matrix)
|
||||
{
|
||||
matrix->r1c1 = r1;
|
||||
matrix->r2c1 = r2;
|
||||
matrix->r3c1 = r3;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix2x3_set_column1(const double r1, const double r2, const double r3, fp64_matrix2x3_t* matrix)
|
||||
inline void matrix2x3_fp64_set_column1(const double r1, const double r2, const double r3, matrix2x3_fp64_t* matrix)
|
||||
{
|
||||
matrix->r1c1 = r1;
|
||||
matrix->r2c1 = r2;
|
||||
|
|
@ -257,14 +257,14 @@ static inline void fp64_matrix2x3_set_column1(const double r1, const double r2,
|
|||
|
||||
// ================ Set Column 2 ================ //
|
||||
|
||||
static inline void fp32_matrix2x3_set_column2(const float r1, const float r2, const float r3, fp32_matrix2x3_t* matrix)
|
||||
inline void matrix2x3_fp32_set_column2(const float r1, const float r2, const float r3, matrix2x3_fp32_t* matrix)
|
||||
{
|
||||
matrix->r1c2 = r1;
|
||||
matrix->r2c2 = r2;
|
||||
matrix->r3c2 = r3;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix2x3_set_column2(const double r1, const double r2, const double r3, fp64_matrix2x3_t* matrix)
|
||||
inline void matrix2x3_fp64_set_column2(const double r1, const double r2, const double r3, matrix2x3_fp64_t* matrix)
|
||||
{
|
||||
matrix->r1c2 = r1;
|
||||
matrix->r2c2 = r2;
|
||||
|
|
@ -273,7 +273,7 @@ static inline void fp64_matrix2x3_set_column2(const double r1, const double r2,
|
|||
|
||||
// ================ Append scaled =============== //
|
||||
|
||||
static inline void fp32_matrix2x3_append_scaled(fp32_matrix2x3_t* basic_vector, const fp32_matrix2x3_t* scalable_vector, const float scale)
|
||||
inline void matrix2x3_fp32_append_scaled(matrix2x3_fp32_t* basic_vector, const matrix2x3_fp32_t* scalable_vector, const float scale)
|
||||
{
|
||||
basic_vector->r1c1 += scalable_vector->r1c1 * scale;
|
||||
basic_vector->r1c2 += scalable_vector->r1c2 * scale;
|
||||
|
|
@ -285,7 +285,7 @@ static inline void fp32_matrix2x3_append_scaled(fp32_matrix2x3_t* basic_vector,
|
|||
basic_vector->r3c2 += scalable_vector->r3c2 * scale;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix2x3_append_scaled(fp64_matrix2x3_t* basic_vector, const fp64_matrix2x3_t* scalable_vector, const double scale)
|
||||
inline void matrix2x3_fp64_append_scaled(matrix2x3_fp64_t* basic_vector, const matrix2x3_fp64_t* scalable_vector, const double scale)
|
||||
{
|
||||
basic_vector->r1c1 += scalable_vector->r1c1 * scale;
|
||||
basic_vector->r1c2 += scalable_vector->r1c2 * scale;
|
||||
|
|
@ -299,7 +299,7 @@ static inline void fp64_matrix2x3_append_scaled(fp64_matrix2x3_t* basic_vector,
|
|||
|
||||
// ================== Addition ================== //
|
||||
|
||||
static inline void fp32_matrix2x3_add(const fp32_matrix2x3_t* matrix1, const fp32_matrix2x3_t* matrix2, fp32_matrix2x3_t* sum)
|
||||
inline void matrix2x3_fp32_add(const matrix2x3_fp32_t* matrix1, const matrix2x3_fp32_t* matrix2, matrix2x3_fp32_t* sum)
|
||||
{
|
||||
sum->r1c1 = matrix1->r1c1 + matrix2->r1c1;
|
||||
sum->r1c2 = matrix1->r1c2 + matrix2->r1c2;
|
||||
|
|
@ -311,7 +311,7 @@ static inline void fp32_matrix2x3_add(const fp32_matrix2x3_t* matrix1, const fp3
|
|||
sum->r3c2 = matrix1->r3c2 + matrix2->r3c2;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix2x3_add(const fp64_matrix2x3_t* matrix1, const fp64_matrix2x3_t* matrix2, fp64_matrix2x3_t* sum)
|
||||
inline void matrix2x3_fp64_add(const matrix2x3_fp64_t* matrix1, const matrix2x3_fp64_t* matrix2, matrix2x3_fp64_t* sum)
|
||||
{
|
||||
sum->r1c1 = matrix1->r1c1 + matrix2->r1c1;
|
||||
sum->r1c2 = matrix1->r1c2 + matrix2->r1c2;
|
||||
|
|
@ -325,7 +325,7 @@ static inline void fp64_matrix2x3_add(const fp64_matrix2x3_t* matrix1, const fp6
|
|||
|
||||
// ================ Subtraction ================= //
|
||||
|
||||
static inline void fp32_matrix2x3_subtract(const fp32_matrix2x3_t* minuend, const fp32_matrix2x3_t* subtrahend, fp32_matrix2x3_t* difference)
|
||||
inline void matrix2x3_fp32_subtract(const matrix2x3_fp32_t* minuend, const matrix2x3_fp32_t* subtrahend, matrix2x3_fp32_t* difference)
|
||||
{
|
||||
difference->r1c1 = minuend->r1c1 - subtrahend->r1c1;
|
||||
difference->r1c2 = minuend->r1c2 - subtrahend->r1c2;
|
||||
|
|
@ -337,7 +337,7 @@ static inline void fp32_matrix2x3_subtract(const fp32_matrix2x3_t* minuend, cons
|
|||
difference->r3c2 = minuend->r3c2 - subtrahend->r3c2;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix2x3_subtract(const fp64_matrix2x3_t* minuend, const fp64_matrix2x3_t* subtrahend, fp64_matrix2x3_t* difference)
|
||||
inline void matrix2x3_fp64_subtract(const matrix2x3_fp64_t* minuend, const matrix2x3_fp64_t* subtrahend, matrix2x3_fp64_t* difference)
|
||||
{
|
||||
difference->r1c1 = minuend->r1c1 - subtrahend->r1c1;
|
||||
difference->r1c2 = minuend->r1c2 - subtrahend->r1c2;
|
||||
|
|
@ -351,7 +351,7 @@ static inline void fp64_matrix2x3_subtract(const fp64_matrix2x3_t* minuend, cons
|
|||
|
||||
// =============== Multiplication =============== //
|
||||
|
||||
static inline void fp32_matrix2x3_multiply(const fp32_matrix2x3_t* multiplicand, const float multiplier, fp32_matrix2x3_t* product)
|
||||
inline void matrix2x3_fp32_multiply(const matrix2x3_fp32_t* multiplicand, const float multiplier, matrix2x3_fp32_t* product)
|
||||
{
|
||||
product->r1c1 = multiplicand->r1c1 * multiplier;
|
||||
product->r1c2 = multiplicand->r1c2 * multiplier;
|
||||
|
|
@ -363,7 +363,7 @@ static inline void fp32_matrix2x3_multiply(const fp32_matrix2x3_t* multiplicand,
|
|||
product->r3c2 = multiplicand->r3c2 * multiplier;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix2x3_multiply(const fp64_matrix2x3_t* multiplicand, const double multiplier, fp64_matrix2x3_t* product)
|
||||
inline void matrix2x3_fp64_multiply(const matrix2x3_fp64_t* multiplicand, const double multiplier, matrix2x3_fp64_t* product)
|
||||
{
|
||||
product->r1c1 = multiplicand->r1c1 * multiplier;
|
||||
product->r1c2 = multiplicand->r1c2 * multiplier;
|
||||
|
|
@ -377,25 +377,25 @@ static inline void fp64_matrix2x3_multiply(const fp64_matrix2x3_t* multiplicand,
|
|||
|
||||
// ================== Division ================== //
|
||||
|
||||
static inline void fp32_matrix2x3_divide(const fp32_matrix2x3_t* dividend, const float divisor, fp32_matrix2x3_t* quotient)
|
||||
inline void matrix2x3_fp32_divide(const matrix2x3_fp32_t* dividend, const float divisor, matrix2x3_fp32_t* quotient)
|
||||
{
|
||||
fp32_matrix2x3_multiply(dividend, 1.0f / divisor, quotient);
|
||||
matrix2x3_fp32_multiply(dividend, 1.0f / divisor, quotient);
|
||||
}
|
||||
|
||||
static inline void fp64_matrix2x3_divide(const fp64_matrix2x3_t* dividend, const double divisor, fp64_matrix2x3_t* quotient)
|
||||
inline void matrix2x3_fp64_divide(const matrix2x3_fp64_t* dividend, const double divisor, matrix2x3_fp64_t* quotient)
|
||||
{
|
||||
fp64_matrix2x3_multiply(dividend, 1.0 / divisor, quotient);
|
||||
matrix2x3_fp64_multiply(dividend, 1.0 / divisor, quotient);
|
||||
}
|
||||
|
||||
// ============ Left Vector Product ============= //
|
||||
|
||||
static inline void fp32_matrix2x3_left_product(const fp32_vector3_t* vector, const fp32_matrix2x3_t* matrix, fp32_vector2_t* result)
|
||||
inline void matrix2x3_fp32_left_product(const vector3_fp32_t* vector, const matrix2x3_fp32_t* matrix, vector2_fp32_t* result)
|
||||
{
|
||||
result->x1 = vector->x1 * matrix->r1c1 + vector->x2 * matrix->r2c1 + vector->x3 * matrix->r3c1;
|
||||
result->x2 = vector->x1 * matrix->r1c2 + vector->x2 * matrix->r2c2 + vector->x3 * matrix->r3c2;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix2x3_left_product(const fp64_vector3_t* vector, const fp64_matrix2x3_t* matrix, fp64_vector2_t* result)
|
||||
inline void matrix2x3_fp64_left_product(const vector3_fp64_t* vector, const matrix2x3_fp64_t* matrix, vector2_fp64_t* result)
|
||||
{
|
||||
result->x1 = vector->x1 * matrix->r1c1 + vector->x2 * matrix->r2c1 + vector->x3 * matrix->r3c1;
|
||||
result->x2 = vector->x1 * matrix->r1c2 + vector->x2 * matrix->r2c2 + vector->x3 * matrix->r3c2;
|
||||
|
|
@ -403,14 +403,14 @@ static inline void fp64_matrix2x3_left_product(const fp64_vector3_t* vector, con
|
|||
|
||||
// ============ Right Vector Product ============ //
|
||||
|
||||
static inline void fp32_matrix2x3_right_product(const fp32_matrix2x3_t* matrix, const fp32_vector2_t* vector, fp32_vector3_t* result)
|
||||
inline void matrix2x3_fp32_right_product(const matrix2x3_fp32_t* matrix, const vector2_fp32_t* vector, vector3_fp32_t* result)
|
||||
{
|
||||
result->x1 = matrix->r1c1 * vector->x1 + matrix->r1c2 * vector->x2;
|
||||
result->x2 = matrix->r2c1 * vector->x1 + matrix->r2c2 * vector->x2;
|
||||
result->x3 = matrix->r3c1 * vector->x1 + matrix->r3c2 * vector->x2;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix2x3_right_product(const fp64_matrix2x3_t* matrix, const fp64_vector2_t* vector, fp64_vector3_t* result)
|
||||
inline void matrix2x3_fp64_right_product(const matrix2x3_fp64_t* matrix, const vector2_fp64_t* vector, vector3_fp64_t* result)
|
||||
{
|
||||
result->x1 = matrix->r1c1 * vector->x1 + matrix->r1c2 * vector->x2;
|
||||
result->x2 = matrix->r2c1 * vector->x1 + matrix->r2c2 * vector->x2;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue