Продолжение переименования типов и функций
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_matrix3x2_reset(fp32_matrix3x2_t* matrix)
|
||||
inline void matrix3x2_reset_fp32(matrix3x2_fp32_t* matrix)
|
||||
{
|
||||
matrix->r1c1 = 0.0f;
|
||||
matrix->r1c2 = 0.0f;
|
||||
|
|
@ -18,7 +18,7 @@ static inline void fp32_matrix3x2_reset(fp32_matrix3x2_t* matrix)
|
|||
matrix->r2c3 = 0.0f;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix3x2_reset(fp64_matrix3x2_t* matrix)
|
||||
inline void matrix3x2_reset_fp64(matrix3x2_fp64_t* matrix)
|
||||
{
|
||||
matrix->r1c1 = 0.0;
|
||||
matrix->r1c2 = 0.0;
|
||||
|
|
@ -31,7 +31,7 @@ static inline void fp64_matrix3x2_reset(fp64_matrix3x2_t* matrix)
|
|||
|
||||
// ==================== Copy ==================== //
|
||||
|
||||
static inline void fp32_matrix3x2_copy(const fp32_matrix3x2_t* from, fp32_matrix3x2_t* to)
|
||||
inline void matrix3x2_copy_fp32(const matrix3x2_fp32_t* from, matrix3x2_fp32_t* to)
|
||||
{
|
||||
to->r1c1 = from->r1c1;
|
||||
to->r1c2 = from->r1c2;
|
||||
|
|
@ -42,7 +42,7 @@ static inline void fp32_matrix3x2_copy(const fp32_matrix3x2_t* from, fp32_matrix
|
|||
to->r2c3 = from->r2c3;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix3x2_copy(const fp64_matrix3x2_t* from, fp64_matrix3x2_t* to)
|
||||
inline void matrix3x2_copy_fp64(const matrix3x2_fp64_t* from, matrix3x2_fp64_t* to)
|
||||
{
|
||||
to->r1c1 = from->r1c1;
|
||||
to->r1c2 = from->r1c2;
|
||||
|
|
@ -55,7 +55,7 @@ static inline void fp64_matrix3x2_copy(const fp64_matrix3x2_t* from, fp64_matrix
|
|||
|
||||
// ==================== Swap ==================== //
|
||||
|
||||
static inline void fp32_matrix3x2_swap(fp32_matrix3x2_t* matrix1, fp32_matrix3x2_t* matrix2)
|
||||
inline void matrix3x2_swap_fp32(matrix3x2_fp32_t* matrix1, matrix3x2_fp32_t* matrix2)
|
||||
{
|
||||
const float r1c1 = matrix2->r1c1;
|
||||
const float r1c2 = matrix2->r1c2;
|
||||
|
|
@ -82,7 +82,7 @@ static inline void fp32_matrix3x2_swap(fp32_matrix3x2_t* matrix1, fp32_matrix3x2
|
|||
matrix1->r2c3 = r2c3;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix3x2_swap(fp64_matrix3x2_t* matrix1, fp64_matrix3x2_t* matrix2)
|
||||
inline void matrix3x2_swap_fp64(matrix3x2_fp64_t* matrix1, matrix3x2_fp64_t* matrix2)
|
||||
{
|
||||
const double r1c1 = matrix2->r1c1;
|
||||
const double r1c2 = matrix2->r1c2;
|
||||
|
|
@ -111,7 +111,7 @@ static inline void fp64_matrix3x2_swap(fp64_matrix3x2_t* matrix1, fp64_matrix3x2
|
|||
|
||||
// ============= Set from twin type ============= //
|
||||
|
||||
static inline void fp32_matrix3x2_set_from_fp64(const fp64_matrix3x2_t* from, fp32_matrix3x2_t* to)
|
||||
inline void matrix3x2_fp32_set_from_fp64(const matrix3x2_fp64_t* from, matrix3x2_fp32_t* to)
|
||||
{
|
||||
to->r1c1 = (float) from->r1c1;
|
||||
to->r1c2 = (float) from->r1c2;
|
||||
|
|
@ -122,7 +122,7 @@ static inline void fp32_matrix3x2_set_from_fp64(const fp64_matrix3x2_t* from, fp
|
|||
to->r2c3 = (float) from->r2c3;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix3x2_set_from_fp32(const fp32_matrix3x2_t* from, fp64_matrix3x2_t* to)
|
||||
inline void matrix3x2_fp64_set_from_fp32(const matrix3x2_fp32_t* from, matrix3x2_fp64_t* to)
|
||||
{
|
||||
to->r1c1 = from->r1c1;
|
||||
to->r1c2 = from->r1c2;
|
||||
|
|
@ -135,7 +135,7 @@ static inline void fp64_matrix3x2_set_from_fp32(const fp32_matrix3x2_t* from, fp
|
|||
|
||||
// =============== Set transposed =============== //
|
||||
|
||||
static inline void fp32_matrix3x2_set_transposed(const fp32_matrix2x3_t* from, fp32_matrix3x2_t* to)
|
||||
inline void matrix3x2_fp32_set_transposed(const matrix2x3_fp32_t* from, matrix3x2_fp32_t* to)
|
||||
{
|
||||
to->r1c1 = from->r1c1;
|
||||
to->r1c2 = from->r2c1;
|
||||
|
|
@ -146,7 +146,7 @@ static inline void fp32_matrix3x2_set_transposed(const fp32_matrix2x3_t* from, f
|
|||
to->r2c3 = from->r3c2;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix3x2_set_transposed(const fp64_matrix2x3_t* from, fp64_matrix3x2_t* to)
|
||||
inline void matrix3x2_fp64_set_transposed(const matrix2x3_fp64_t* from, matrix3x2_fp64_t* to)
|
||||
{
|
||||
to->r1c1 = from->r1c1;
|
||||
to->r1c2 = from->r2c1;
|
||||
|
|
@ -159,7 +159,7 @@ static inline void fp64_matrix3x2_set_transposed(const fp64_matrix2x3_t* from, f
|
|||
|
||||
// =============== Set transposed =============== //
|
||||
|
||||
static inline void fp32_matrix3x2_set_transposed_fp64(const fp64_matrix2x3_t* from, fp32_matrix3x2_t* to)
|
||||
inline void matrix3x2_fp32_set_transposed_fp64(const matrix2x3_fp64_t* from, matrix3x2_fp32_t* to)
|
||||
{
|
||||
to->r1c1 = (float) from->r1c1;
|
||||
to->r1c2 = (float) from->r2c1;
|
||||
|
|
@ -170,7 +170,7 @@ static inline void fp32_matrix3x2_set_transposed_fp64(const fp64_matrix2x3_t* fr
|
|||
to->r2c3 = (float) from->r3c2;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix3x2_set_transposed_fp32(const fp32_matrix2x3_t* from, fp64_matrix3x2_t* to)
|
||||
inline void matrix3x2_fp64_set_transposed_fp32(const matrix2x3_fp32_t* from, matrix3x2_fp64_t* to)
|
||||
{
|
||||
to->r1c1 = from->r1c1;
|
||||
to->r1c2 = from->r2c1;
|
||||
|
|
@ -183,14 +183,14 @@ static inline void fp64_matrix3x2_set_transposed_fp32(const fp32_matrix2x3_t* fr
|
|||
|
||||
// ================= Set Row 1 ================== //
|
||||
|
||||
static inline void fp32_matrix3x2_set_row1(const float c1, const float c2, const float c3, fp32_matrix3x2_t* matrix)
|
||||
inline void matrix3x2_fp32_set_row1(const float c1, const float c2, const float c3, matrix3x2_fp32_t* matrix)
|
||||
{
|
||||
matrix->r1c1 = c1;
|
||||
matrix->r1c2 = c2;
|
||||
matrix->r1c3 = c3;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix3x2_set_row1(const double c1, const double c2, const double c3, fp64_matrix3x2_t* matrix)
|
||||
inline void matrix3x2_fp64_set_row1(const double c1, const double c2, const double c3, matrix3x2_fp64_t* matrix)
|
||||
{
|
||||
matrix->r1c1 = c1;
|
||||
matrix->r1c2 = c2;
|
||||
|
|
@ -199,14 +199,14 @@ static inline void fp64_matrix3x2_set_row1(const double c1, const double c2, con
|
|||
|
||||
// ================= Set Row 2 ================== //
|
||||
|
||||
static inline void fp32_matrix3x2_set_row2(const float c1, const float c2, const float c3, fp32_matrix3x2_t* matrix)
|
||||
inline void matrix3x2_fp32_set_row2(const float c1, const float c2, const float c3, matrix3x2_fp32_t* matrix)
|
||||
{
|
||||
matrix->r2c1 = c1;
|
||||
matrix->r2c2 = c2;
|
||||
matrix->r2c3 = c3;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix3x2_set_row2(const double c1, const double c2, const double c3, fp64_matrix3x2_t* matrix)
|
||||
inline void matrix3x2_fp64_set_row2(const double c1, const double c2, const double c3, matrix3x2_fp64_t* matrix)
|
||||
{
|
||||
matrix->r2c1 = c1;
|
||||
matrix->r2c2 = c2;
|
||||
|
|
@ -215,13 +215,13 @@ static inline void fp64_matrix3x2_set_row2(const double c1, const double c2, con
|
|||
|
||||
// ================ Set Column 1 ================ //
|
||||
|
||||
static inline void fp32_matrix3x2_set_column1(const float r1, const float r2, fp32_matrix3x2_t* matrix)
|
||||
inline void matrix3x2_fp32_set_column1(const float r1, const float r2, matrix3x2_fp32_t* matrix)
|
||||
{
|
||||
matrix->r1c1 = r1;
|
||||
matrix->r2c1 = r2;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix3x2_set_column1(const double r1, const double r2, fp64_matrix3x2_t* matrix)
|
||||
inline void matrix3x2_fp64_set_column1(const double r1, const double r2, matrix3x2_fp64_t* matrix)
|
||||
{
|
||||
matrix->r1c1 = r1;
|
||||
matrix->r2c1 = r2;
|
||||
|
|
@ -229,13 +229,13 @@ static inline void fp64_matrix3x2_set_column1(const double r1, const double r2,
|
|||
|
||||
// ================ Set Column 2 ================ //
|
||||
|
||||
static inline void fp32_matrix3x2_set_column2(const float r1, const float r2, fp32_matrix3x2_t* matrix)
|
||||
inline void matrix3x2_fp32_set_column2(const float r1, const float r2, matrix3x2_fp32_t* matrix)
|
||||
{
|
||||
matrix->r1c2 = r1;
|
||||
matrix->r2c2 = r2;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix3x2_set_column2(const double r1, const double r2, fp64_matrix3x2_t* matrix)
|
||||
inline void matrix3x2_fp64_set_column2(const double r1, const double r2, matrix3x2_fp64_t* matrix)
|
||||
{
|
||||
matrix->r1c2 = r1;
|
||||
matrix->r2c2 = r2;
|
||||
|
|
@ -243,13 +243,13 @@ static inline void fp64_matrix3x2_set_column2(const double r1, const double r2,
|
|||
|
||||
// ================ Set Column 3 ================ //
|
||||
|
||||
static inline void fp32_matrix3x2_set_column3(const float r1, const float r2, fp32_matrix3x2_t* matrix)
|
||||
inline void matrix3x2_fp32_set_column3(const float r1, const float r2, matrix3x2_fp32_t* matrix)
|
||||
{
|
||||
matrix->r1c3 = r1;
|
||||
matrix->r2c3 = r2;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix3x2_set_column3(const double r1, const double r2, fp64_matrix3x2_t* matrix)
|
||||
inline void matrix3x2_fp64_set_column3(const double r1, const double r2, matrix3x2_fp64_t* matrix)
|
||||
{
|
||||
matrix->r1c3 = r1;
|
||||
matrix->r2c3 = r2;
|
||||
|
|
@ -257,7 +257,7 @@ static inline void fp64_matrix3x2_set_column3(const double r1, const double r2,
|
|||
|
||||
// ================ Append scaled =============== //
|
||||
|
||||
static inline void fp32_matrix3x2_append_scaled(fp32_matrix3x2_t* basic_vector, const fp32_matrix3x2_t* scalable_vector, const float scale)
|
||||
inline void matrix3x2_fp32_append_scaled(matrix3x2_fp32_t* basic_vector, const matrix3x2_fp32_t* scalable_vector, const float scale)
|
||||
{
|
||||
basic_vector->r1c1 += scalable_vector->r1c1 * scale;
|
||||
basic_vector->r1c2 += scalable_vector->r1c2 * scale;
|
||||
|
|
@ -268,7 +268,7 @@ static inline void fp32_matrix3x2_append_scaled(fp32_matrix3x2_t* basic_vector,
|
|||
basic_vector->r2c3 += scalable_vector->r2c3 * scale;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix3x2_append_scaled(fp64_matrix3x2_t* basic_vector, const fp64_matrix3x2_t* scalable_vector, const double scale)
|
||||
inline void matrix3x2_fp64_append_scaled(matrix3x2_fp64_t* basic_vector, const matrix3x2_fp64_t* scalable_vector, const double scale)
|
||||
{
|
||||
basic_vector->r1c1 += scalable_vector->r1c1 * scale;
|
||||
basic_vector->r1c2 += scalable_vector->r1c2 * scale;
|
||||
|
|
@ -281,7 +281,7 @@ static inline void fp64_matrix3x2_append_scaled(fp64_matrix3x2_t* basic_vector,
|
|||
|
||||
// ================== Addition ================== //
|
||||
|
||||
static inline void fp32_matrix3x2_add(const fp32_matrix3x2_t* matrix1, const fp32_matrix3x2_t* matrix2, fp32_matrix3x2_t* sum)
|
||||
inline void matrix3x2_fp32_add(const matrix3x2_fp32_t* matrix1, const matrix3x2_fp32_t* matrix2, matrix3x2_fp32_t* sum)
|
||||
{
|
||||
sum->r1c1 = matrix1->r1c1 + matrix2->r1c1;
|
||||
sum->r1c2 = matrix1->r1c2 + matrix2->r1c2;
|
||||
|
|
@ -292,7 +292,7 @@ static inline void fp32_matrix3x2_add(const fp32_matrix3x2_t* matrix1, const fp3
|
|||
sum->r2c3 = matrix1->r2c3 + matrix2->r2c3;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix3x2_add(const fp64_matrix3x2_t* matrix1, const fp64_matrix3x2_t* matrix2, fp64_matrix3x2_t* sum)
|
||||
inline void matrix3x2_fp64_add(const matrix3x2_fp64_t* matrix1, const matrix3x2_fp64_t* matrix2, matrix3x2_fp64_t* sum)
|
||||
{
|
||||
sum->r1c1 = matrix1->r1c1 + matrix2->r1c1;
|
||||
sum->r1c2 = matrix1->r1c2 + matrix2->r1c2;
|
||||
|
|
@ -305,7 +305,7 @@ static inline void fp64_matrix3x2_add(const fp64_matrix3x2_t* matrix1, const fp6
|
|||
|
||||
// ================ Subtraction ================= //
|
||||
|
||||
static inline void fp32_matrix3x2_subtract(const fp32_matrix3x2_t* minuend, const fp32_matrix3x2_t* subtrahend, fp32_matrix3x2_t* difference)
|
||||
inline void matrix3x2_fp32_subtract(const matrix3x2_fp32_t* minuend, const matrix3x2_fp32_t* subtrahend, matrix3x2_fp32_t* difference)
|
||||
{
|
||||
difference->r1c1 = minuend->r1c1 - subtrahend->r1c1;
|
||||
difference->r1c2 = minuend->r1c2 - subtrahend->r1c2;
|
||||
|
|
@ -316,7 +316,7 @@ static inline void fp32_matrix3x2_subtract(const fp32_matrix3x2_t* minuend, cons
|
|||
difference->r2c3 = minuend->r2c3 - subtrahend->r2c3;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix3x2_subtract(const fp64_matrix3x2_t* minuend, const fp64_matrix3x2_t* subtrahend, fp64_matrix3x2_t* difference)
|
||||
inline void matrix3x2_fp64_subtract(const matrix3x2_fp64_t* minuend, const matrix3x2_fp64_t* subtrahend, matrix3x2_fp64_t* difference)
|
||||
{
|
||||
difference->r1c1 = minuend->r1c1 - subtrahend->r1c1;
|
||||
difference->r1c2 = minuend->r1c2 - subtrahend->r1c2;
|
||||
|
|
@ -329,7 +329,7 @@ static inline void fp64_matrix3x2_subtract(const fp64_matrix3x2_t* minuend, cons
|
|||
|
||||
// =============== Multiplication =============== //
|
||||
|
||||
static inline void fp32_matrix3x2_multiply(const fp32_matrix3x2_t* multiplicand, const float multiplier, fp32_matrix3x2_t* product)
|
||||
inline void matrix3x2_fp32_multiply(const matrix3x2_fp32_t* multiplicand, const float multiplier, matrix3x2_fp32_t* product)
|
||||
{
|
||||
product->r1c1 = multiplicand->r1c1 * multiplier;
|
||||
product->r1c2 = multiplicand->r1c2 * multiplier;
|
||||
|
|
@ -340,7 +340,7 @@ static inline void fp32_matrix3x2_multiply(const fp32_matrix3x2_t* multiplicand,
|
|||
product->r2c3 = multiplicand->r2c3 * multiplier;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix3x2_multiply(const fp64_matrix3x2_t* multiplicand, const double multiplier, fp64_matrix3x2_t* product)
|
||||
inline void matrix3x2_fp64_multiply(const matrix3x2_fp64_t* multiplicand, const double multiplier, matrix3x2_fp64_t* product)
|
||||
{
|
||||
product->r1c1 = multiplicand->r1c1 * multiplier;
|
||||
product->r1c2 = multiplicand->r1c2 * multiplier;
|
||||
|
|
@ -353,26 +353,26 @@ static inline void fp64_matrix3x2_multiply(const fp64_matrix3x2_t* multiplicand,
|
|||
|
||||
// ================== Division ================== //
|
||||
|
||||
static inline void fp32_matrix3x2_divide(const fp32_matrix3x2_t* dividend, const float divisor, fp32_matrix3x2_t* quotient)
|
||||
inline void matrix3x2_fp32_divide(const matrix3x2_fp32_t* dividend, const float divisor, matrix3x2_fp32_t* quotient)
|
||||
{
|
||||
fp32_matrix3x2_multiply(dividend, 1.0f / divisor, quotient);
|
||||
matrix3x2_fp32_multiply(dividend, 1.0f / divisor, quotient);
|
||||
}
|
||||
|
||||
static inline void fp64_matrix3x2_divide(const fp64_matrix3x2_t* dividend, const double divisor, fp64_matrix3x2_t* quotient)
|
||||
inline void matrix3x2_fp64_divide(const matrix3x2_fp64_t* dividend, const double divisor, matrix3x2_fp64_t* quotient)
|
||||
{
|
||||
fp64_matrix3x2_multiply(dividend, 1.0 / divisor, quotient);
|
||||
matrix3x2_fp64_multiply(dividend, 1.0 / divisor, quotient);
|
||||
}
|
||||
|
||||
// ============ Left Vector Product ============= //
|
||||
|
||||
static inline void fp32_matrix3x2_left_product(const fp32_vector2_t* vector, const fp32_matrix3x2_t* matrix, fp32_vector3_t* result)
|
||||
inline void matrix3x2_fp32_left_product(const vector2_fp32_t* vector, const matrix3x2_fp32_t* matrix, vector3_fp32_t* result)
|
||||
{
|
||||
result->x1 = vector->x1 * matrix->r1c1 + vector->x2 * matrix->r2c1;
|
||||
result->x2 = vector->x1 * matrix->r1c2 + vector->x2 * matrix->r2c2;
|
||||
result->x3 = vector->x1 * matrix->r1c3 + vector->x2 * matrix->r2c3;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix3x2_left_product(const fp64_vector2_t* vector, const fp64_matrix3x2_t* matrix, fp64_vector3_t* result)
|
||||
inline void matrix3x2_fp64_left_product(const vector2_fp64_t* vector, const matrix3x2_fp64_t* matrix, vector3_fp64_t* result)
|
||||
{
|
||||
result->x1 = vector->x1 * matrix->r1c1 + vector->x2 * matrix->r2c1;
|
||||
result->x2 = vector->x1 * matrix->r1c2 + vector->x2 * matrix->r2c2;
|
||||
|
|
@ -381,13 +381,13 @@ static inline void fp64_matrix3x2_left_product(const fp64_vector2_t* vector, con
|
|||
|
||||
// ============ Right Vector Product ============ //
|
||||
|
||||
static inline void fp32_matrix3x2_right_product(const fp32_matrix3x2_t* matrix, const fp32_vector3_t* vector, fp32_vector2_t* result)
|
||||
inline void matrix3x2_fp32_right_product(const matrix3x2_fp32_t* matrix, const vector3_fp32_t* vector, vector2_fp32_t* result)
|
||||
{
|
||||
result->x1 = matrix->r1c1 * vector->x1 + matrix->r1c2 * vector->x2 + matrix->r1c3 * vector->x3;
|
||||
result->x2 = matrix->r2c1 * vector->x1 + matrix->r2c2 * vector->x2 + matrix->r2c3 * vector->x3;
|
||||
}
|
||||
|
||||
static inline void fp64_matrix3x2_right_product(const fp64_matrix3x2_t* matrix, const fp64_vector3_t* vector, fp64_vector2_t* result)
|
||||
inline void matrix3x2_fp64_right_product(const matrix3x2_fp64_t* matrix, const vector3_fp64_t* vector, vector2_fp64_t* result)
|
||||
{
|
||||
result->x1 = matrix->r1c1 * vector->x1 + matrix->r1c2 * vector->x2 + matrix->r1c3 * vector->x3;
|
||||
result->x2 = matrix->r2c1 * vector->x1 + matrix->r2c2 * vector->x2 + matrix->r2c3 * vector->x3;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue