Удаление избыточных функций и небольшие исправления / Removing of extra methods and small fixes
This commit is contained in:
parent
049f09f3d4
commit
67f66e2127
6 changed files with 176 additions and 602 deletions
142
src/vector2.h
142
src/vector2.h
|
@ -16,14 +16,6 @@ typedef struct
|
|||
double x1, x2;
|
||||
} DPVector2;
|
||||
|
||||
extern const SPVector2 SP_ZERO_VECTOR2;
|
||||
extern const SPVector2 SP_X1_UNIT_VECTOR2;
|
||||
extern const SPVector2 SP_X2_UNIT_VECTOR2;
|
||||
|
||||
extern const DPVector2 DP_ZERO_VECTOR2;
|
||||
extern const DPVector2 DP_X1_UNIT_VECTOR2;
|
||||
extern const DPVector2 DP_X2_UNIT_VECTOR2;
|
||||
|
||||
// =================== Reset ==================== //
|
||||
|
||||
static inline void sp_vector2_reset(SPVector2* vector)
|
||||
|
@ -170,84 +162,6 @@ static inline void dp_vector2_add(const DPVector2* vector1, const DPVector2* vec
|
|||
result->x2 = vector1->x2 + vector2->x2;
|
||||
}
|
||||
|
||||
// ==================== Add3 ==================== //
|
||||
|
||||
static inline void sp_vector2_add3(
|
||||
const SPVector2* vector1,
|
||||
const SPVector2* vector2,
|
||||
const SPVector2* vector3,
|
||||
SPVector2* result
|
||||
)
|
||||
{
|
||||
result->x1 = vector1->x1 + vector2->x1 + vector3->x1;
|
||||
result->x2 = vector1->x2 + vector2->x2 + vector3->x2;
|
||||
}
|
||||
|
||||
static inline void dp_vector2_add3(
|
||||
const DPVector2* vector1,
|
||||
const DPVector2* vector2,
|
||||
const DPVector2* vector3,
|
||||
DPVector2* result
|
||||
)
|
||||
{
|
||||
result->x1 = vector1->x1 + vector2->x1 + vector3->x1;
|
||||
result->x2 = vector1->x2 + vector2->x2 + vector3->x2;
|
||||
}
|
||||
|
||||
// ==================== Add4 ==================== //
|
||||
|
||||
static inline void sp_vector2_add4(
|
||||
const SPVector2* vector1,
|
||||
const SPVector2* vector2,
|
||||
const SPVector2* vector3,
|
||||
const SPVector2* vector4,
|
||||
SPVector2* result
|
||||
)
|
||||
{
|
||||
result->x1 = (vector1->x1 + vector2->x1) + (vector3->x1 + vector4->x1);
|
||||
result->x2 = (vector1->x2 + vector2->x2) + (vector3->x2 + vector4->x2);
|
||||
}
|
||||
|
||||
static inline void dp_vector2_add4(
|
||||
const DPVector2* vector1,
|
||||
const DPVector2* vector2,
|
||||
const DPVector2* vector3,
|
||||
const DPVector2* vector4,
|
||||
DPVector2* result
|
||||
)
|
||||
{
|
||||
result->x1 = (vector1->x1 + vector2->x1) + (vector3->x1 + vector4->x1);
|
||||
result->x2 = (vector1->x2 + vector2->x2) + (vector3->x2 + vector4->x2);
|
||||
}
|
||||
|
||||
// ==================== Add5 ==================== //
|
||||
|
||||
static inline void sp_vector2_add5(
|
||||
const SPVector2* vector1,
|
||||
const SPVector2* vector2,
|
||||
const SPVector2* vector3,
|
||||
const SPVector2* vector4,
|
||||
const SPVector2* vector5,
|
||||
SPVector2* result
|
||||
)
|
||||
{
|
||||
result->x1 = (vector1->x1 + vector2->x1) + (vector3->x1 + vector4->x1) + vector5->x1;
|
||||
result->x2 = (vector1->x2 + vector2->x2) + (vector3->x2 + vector4->x2) + vector5->x2;
|
||||
}
|
||||
|
||||
static inline void dp_vector2_add5(
|
||||
const DPVector2* vector1,
|
||||
const DPVector2* vector2,
|
||||
const DPVector2* vector3,
|
||||
const DPVector2* vector4,
|
||||
const DPVector2* vector5,
|
||||
DPVector2* result
|
||||
)
|
||||
{
|
||||
result->x1 = (vector1->x1 + vector2->x1) + (vector3->x1 + vector4->x1) + vector5->x1;
|
||||
result->x2 = (vector1->x2 + vector2->x2) + (vector3->x2 + vector4->x2) + vector5->x2;
|
||||
}
|
||||
|
||||
// ================ Subtraction ================= //
|
||||
|
||||
static inline void sp_vector2_subtract(const SPVector2* minuend, const SPVector2* subtrahend, SPVector2* result)
|
||||
|
@ -262,6 +176,34 @@ static inline void dp_vector2_subtract(const DPVector2* minuend, const DPVector2
|
|||
result->x2 = minuend->x2 - subtrahend->x2;
|
||||
}
|
||||
|
||||
// =============== Multiplication =============== //
|
||||
|
||||
static inline void sp_vector2_multiply(const SPVector2* multiplicand, const float multiplier, SPVector2* result)
|
||||
{
|
||||
result->x1 = multiplicand->x1 * multiplier;
|
||||
result->x2 = multiplicand->x2 * multiplier;
|
||||
}
|
||||
|
||||
static inline void dp_vector2_multiply(const DPVector2* multiplicand, const double multiplier, DPVector2* result)
|
||||
{
|
||||
result->x1 = multiplicand->x1 * multiplier;
|
||||
result->x2 = multiplicand->x2 * multiplier;
|
||||
}
|
||||
|
||||
// ================== Division ================== //
|
||||
|
||||
static inline void sp_vector2_divide(const SPVector2* dividend, const float divisor, SPVector2* result)
|
||||
{
|
||||
result->x1 = dividend->x1 / divisor;
|
||||
result->x2 = dividend->x2 / divisor;
|
||||
}
|
||||
|
||||
static inline void dp_vector2_divide(const DPVector2* dividend, const double divisor, DPVector2* result)
|
||||
{
|
||||
result->x1 = dividend->x1 / divisor;
|
||||
result->x2 = dividend->x2 / divisor;
|
||||
}
|
||||
|
||||
// ============= Weighed Sum of two ============= //
|
||||
|
||||
static inline void sp_vector2_get_weighted_sum2(
|
||||
|
@ -362,34 +304,6 @@ static inline void dp_vector2_get_weighted_sum5(
|
|||
result->x2 = (vector1->x2 * weight1 + vector2->x2 * weight2) + (vector3->x2 * weight3 + vector4->x2 * weight4) + vector5->x2 * weight5;
|
||||
}
|
||||
|
||||
// =============== Multiplication =============== //
|
||||
|
||||
static inline void sp_vector2_multiply(const SPVector2* multiplicand, const float multiplier, SPVector2* result)
|
||||
{
|
||||
result->x1 = multiplicand->x1 * multiplier;
|
||||
result->x2 = multiplicand->x2 * multiplier;
|
||||
}
|
||||
|
||||
static inline void dp_vector2_multiply(const DPVector2* multiplicand, const double multiplier, DPVector2* result)
|
||||
{
|
||||
result->x1 = multiplicand->x1 * multiplier;
|
||||
result->x2 = multiplicand->x2 * multiplier;
|
||||
}
|
||||
|
||||
// ================== Division ================== //
|
||||
|
||||
static inline void sp_vector2_divide(const SPVector2* dividend, const float divisor, SPVector2* result)
|
||||
{
|
||||
result->x1 = dividend->x1 / divisor;
|
||||
result->x2 = dividend->x2 / divisor;
|
||||
}
|
||||
|
||||
static inline void dp_vector2_divide(const DPVector2* dividend, const double divisor, DPVector2* result)
|
||||
{
|
||||
result->x1 = dividend->x1 / divisor;
|
||||
result->x2 = dividend->x2 / divisor;
|
||||
}
|
||||
|
||||
// ================== Average2 ================== //
|
||||
|
||||
static inline void sp_vector2_get_mean2(const SPVector2* vector1, const SPVector2* vector2, SPVector2* result)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue