Kimelas/bgc-c
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Исправление функций комбинации, добавление функций исключения одной позиции из другой

Browse source
This commit is contained in:
Andrey Pokidov 2026-01-27 19:34:57 +07:00
parent 101df9f089
commit e1dce83d63
7 changed files with 82 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

4
basic-geometry-test/tests/versor/versor_combine.c
View file

@ -43,7 +43,7 @@ void test_versor_combine_fp32()
print_testing_name("bgc_versor_combine_fp32");
for (int i = 0; i < _TEST_FP32_VERSOR_TRIPLET_AMOUNT; i++) {
bgc_versor_combine_fp32(&_TEST_FP32_VERSOR_TRIPLET_LIST[i].second, &_TEST_FP32_VERSOR_TRIPLET_LIST[i].first, &versor);
bgc_versor_combine_fp32(&_TEST_FP32_VERSOR_TRIPLET_LIST[i].first, &_TEST_FP32_VERSOR_TRIPLET_LIST[i].second, &versor);
if (!bgc_versor_are_close_fp32(&versor, &_TEST_FP32_VERSOR_TRIPLET_LIST[i].result)) {
print_testing_failed();
@ -93,7 +93,7 @@ void test_versor_combine_fp64()
print_testing_name("bgc_versor_combine_fp64");
for (int i = 0; i < _TEST_FP64_VERSOR_TRIPLET_AMOUNT; i++) {
bgc_versor_combine_fp64(&_TEST_FP64_VERSOR_TRIPLET_LIST[i].second, &_TEST_FP64_VERSOR_TRIPLET_LIST[i].first, &versor);
bgc_versor_combine_fp64(&_TEST_FP64_VERSOR_TRIPLET_LIST[i].first, &_TEST_FP64_VERSOR_TRIPLET_LIST[i].second, &versor);
if (!bgc_versor_are_close_fp64(&versor, &_TEST_FP64_VERSOR_TRIPLET_LIST[i].result)) {
print_testing_failed();

11
basic-geometry/position2.c
View file

@ -18,8 +18,11 @@ extern inline void bgc_position2_invert_fp64(BgcPosition2FP64 * position);
extern inline void bgc_position2_get_inverse_fp32(const BgcPosition2FP32 * position, BgcPosition2FP32 * inverted);
extern inline void bgc_position2_get_inverse_fp64(const BgcPosition2FP64 * position, BgcPosition2FP64 * inverted);
extern inline void bgc_position2_combine_fp32(const BgcPosition2FP32 * parent, const BgcPosition2FP32 * child, BgcPosition2FP32 * combination);
extern inline void bgc_position2_combine_fp64(const BgcPosition2FP64 * parent, const BgcPosition2FP64 * child, BgcPosition2FP64 * combination);
extern inline void bgc_position2_combine_fp32(const BgcPosition2FP32 * first, const BgcPosition2FP32 * second, BgcPosition2FP32 * combination);
extern inline void bgc_position2_combine_fp64(const BgcPosition2FP64 * first, const BgcPosition2FP64 * second, BgcPosition2FP64 * combination);
extern inline void bgc_position2_exclude_fp32(const BgcPosition2FP32 * base, const BgcPosition2FP32 * excludand, BgcPosition2FP32 * difference);
extern inline void bgc_position2_exclude_fp64(const BgcPosition2FP64 * base, const BgcPosition2FP64 * excludand, BgcPosition2FP64 * difference);
extern inline void bgc_position2_get_outward_affine_fp32(const BgcPosition2FP32 * position, BgcAffine2FP32 * outward_affine_map);
extern inline void bgc_position2_get_outward_affine_fp64(const BgcPosition2FP64 * position, BgcAffine2FP64 * outward_affine_map);
@ -36,5 +39,5 @@ extern inline void bgc_position2_transform_point_inwards_fp64(const BgcPosition2
extern inline void bgc_position2_transform_vector_outwards_fp32(const BgcPosition2FP32 * position, const BgcVector2FP32 * inner_vector, BgcVector2FP32 * outer_vector);
extern inline void bgc_position2_transform_vector_outwards_fp64(const BgcPosition2FP64 * position, const BgcVector2FP64 * inner_vector, BgcVector2FP64 * outer_vector);
extern inline void bgc_position2_transform_vector_inward_fp32(const BgcPosition2FP32 * position, const BgcVector2FP32 * outer_vector, BgcVector2FP32 * inner_vector);
extern inline void bgc_position2_transform_vector_inward_fp64(const BgcPosition2FP64 * position, const BgcVector2FP64 * outer_vector, BgcVector2FP64 * inner_vector);
extern inline void bgc_position2_transform_vector_inwards_fp32(const BgcPosition2FP32 * position, const BgcVector2FP32 * outer_vector, BgcVector2FP32 * inner_vector);
extern inline void bgc_position2_transform_vector_inwards_fp64(const BgcPosition2FP64 * position, const BgcVector2FP64 * outer_vector, BgcVector2FP64 * inner_vector);

38
basic-geometry/position2.h
View file

@ -108,20 +108,38 @@ inline void bgc_position2_get_inverse_fp64(const BgcPosition2FP64 * position, Bg
// =================== Combine =================== //
inline void bgc_position2_combine_fp32(const BgcPosition2FP32 * parent, const BgcPosition2FP32 * child, BgcPosition2FP32 * combination)
inline void bgc_position2_combine_fp32(const BgcPosition2FP32 * first, const BgcPosition2FP32 * second, BgcPosition2FP32 * combination)
{
BgcVector2FP32 relative_shift;
bgc_cotes_number_turn_vector_fp32(&parent->turn, &child->shift, &relative_shift);
bgc_cotes_number_combine_fp32(&child->turn, &parent->turn, &combination->turn);
bgc_vector2_add_fp32(&parent->shift, &relative_shift, &combination->shift);
bgc_cotes_number_turn_vector_fp32(&second->turn, &first->shift, &relative_shift);
bgc_cotes_number_combine_fp32(&first->turn, &second->turn, &combination->turn);
bgc_vector2_add_fp32(&relative_shift, &second->shift, &combination->shift);
}
inline void bgc_position2_combine_fp64(const BgcPosition2FP64 * parent, const BgcPosition2FP64 * child, BgcPosition2FP64 * combination)
inline void bgc_position2_combine_fp64(const BgcPosition2FP64 * first, const BgcPosition2FP64 * second, BgcPosition2FP64 * combination)
{
BgcVector2FP64 relative_shift;
bgc_cotes_number_turn_vector_fp64(&parent->turn, &child->shift, &relative_shift);
bgc_cotes_number_combine_fp64(&child->turn, &parent->turn, &combination->turn);
bgc_vector2_add_fp64(&parent->shift, &relative_shift, &combination->shift);
bgc_cotes_number_turn_vector_fp64(&second->turn, &first->shift, &relative_shift);
bgc_cotes_number_combine_fp64(&first->turn, &second->turn, &combination->turn);
bgc_vector2_add_fp64(&relative_shift, &second->shift, &combination->shift);
}
// =================== Exclude =================== //
inline void bgc_position2_exclude_fp32(const BgcPosition2FP32 * base, const BgcPosition2FP32 * excludand, BgcPosition2FP32 * difference)
{
BgcVector2FP32 relative_shift;
bgc_vector2_subtract_fp32(&base->shift, &excludand->shift, &relative_shift);
bgc_cotes_number_turn_vector_back_fp32(&excludand->turn, &relative_shift, &difference->shift);
bgc_cotes_number_exclude_fp32(&base->turn, &excludand->turn, &difference->turn);
}
inline void bgc_position2_exclude_fp64(const BgcPosition2FP64 * base, const BgcPosition2FP64 * excludand, BgcPosition2FP64 * difference)
{
BgcVector2FP64 relative_shift;
bgc_vector2_subtract_fp64(&base->shift, &excludand->shift, &relative_shift);
bgc_cotes_number_turn_vector_back_fp64(&excludand->turn, &relative_shift, &difference->shift);
bgc_cotes_number_exclude_fp64(&base->turn, &excludand->turn, &difference->turn);
}
// ============= Get Outward Affine ============== //
@ -202,12 +220,12 @@ inline void bgc_position2_transform_vector_outwards_fp64(const BgcPosition2FP64
// ========== Transform Vector Inwards =========== //
inline void bgc_position2_transform_vector_inward_fp32(const BgcPosition2FP32 * position, const BgcVector2FP32 * outer_vector, BgcVector2FP32 * inner_vector)
inline void bgc_position2_transform_vector_inwards_fp32(const BgcPosition2FP32 * position, const BgcVector2FP32 * outer_vector, BgcVector2FP32 * inner_vector)
{
bgc_cotes_number_turn_vector_back_fp32(&position->turn, outer_vector, inner_vector);
}
inline void bgc_position2_transform_vector_inward_fp64(const BgcPosition2FP64 * position, const BgcVector2FP64 * outer_vector, BgcVector2FP64 * inner_vector)
inline void bgc_position2_transform_vector_inwards_fp64(const BgcPosition2FP64 * position, const BgcVector2FP64 * outer_vector, BgcVector2FP64 * inner_vector)
{
bgc_cotes_number_turn_vector_back_fp64(&position->turn, outer_vector, inner_vector);
}

11
basic-geometry/position3.c
View file

@ -18,8 +18,11 @@ extern inline void bgc_position3_invert_fp64(BgcPosition3FP64 * position);
extern inline void bgc_position3_get_inverse_fp32(const BgcPosition3FP32 * position, BgcPosition3FP32 * inverted);
extern inline void bgc_position3_get_inverse_fp64(const BgcPosition3FP64 * position, BgcPosition3FP64 * inverted);
extern inline void bgc_position3_combine_fp32(const BgcPosition3FP32 * parent, const BgcPosition3FP32 * child, BgcPosition3FP32 * combination);
extern inline void bgc_position3_combine_fp64(const BgcPosition3FP64 * parent, const BgcPosition3FP64 * child, BgcPosition3FP64 * combination);
extern inline void bgc_position3_combine_fp32(const BgcPosition3FP32 * first, const BgcPosition3FP32 * second, BgcPosition3FP32 * combination);
extern inline void bgc_position3_combine_fp64(const BgcPosition3FP64 * first, const BgcPosition3FP64 * second, BgcPosition3FP64 * combination);
extern inline void bgc_position3_exclude_fp32(const BgcPosition3FP32 * base, const BgcPosition3FP32 * excludant, BgcPosition3FP32 * difference);
extern inline void bgc_position3_exclude_fp64(const BgcPosition3FP64 * base, const BgcPosition3FP64 * excludant, BgcPosition3FP64 * difference);
extern inline void bgc_position3_get_outward_affine_fp32(const BgcPosition3FP32 * position, BgcAffine3FP32 * outward_affine_map);
extern inline void bgc_position3_get_outward_affine_fp64(const BgcPosition3FP64 * position, BgcAffine3FP64 * outward_affine_map);
@ -36,5 +39,5 @@ extern inline void bgc_position3_transform_point_inwards_fp64(const BgcPosition3
extern inline void bgc_position3_transform_vector_outwards_fp32(const BgcPosition3FP32 * position, const BgcVector3FP32 * inner_vector, BgcVector3FP32 * outer_vector);
extern inline void bgc_position3_transform_vector_outwards_fp64(const BgcPosition3FP64 * position, const BgcVector3FP64 * inner_vector, BgcVector3FP64 * outer_vector);
extern inline void bgc_position3_transform_vector_inward_fp32(const BgcPosition3FP32 * position, const BgcVector3FP32 * outer_vector, BgcVector3FP32 * inner_vector);
extern inline void bgc_position3_transform_vector_inward_fp64(const BgcPosition3FP64 * position, const BgcVector3FP64 * outer_vector, BgcVector3FP64 * inner_vector);
extern inline void bgc_position3_transform_vector_inwards_fp32(const BgcPosition3FP32 * position, const BgcVector3FP32 * outer_vector, BgcVector3FP32 * inner_vector);
extern inline void bgc_position3_transform_vector_inwards_fp64(const BgcPosition3FP64 * position, const BgcVector3FP64 * outer_vector, BgcVector3FP64 * inner_vector);

38
basic-geometry/position3.h
View file

@ -107,20 +107,38 @@ inline void bgc_position3_get_inverse_fp64(const BgcPosition3FP64 * position, Bg
// =================== Combine =================== //
inline void bgc_position3_combine_fp32(const BgcPosition3FP32 * parent, const BgcPosition3FP32 * child, BgcPosition3FP32 * combination)
inline void bgc_position3_combine_fp32(const BgcPosition3FP32 * first, const BgcPosition3FP32 * second, BgcPosition3FP32 * combination)
{
BgcVector3FP32 relative_shift;
bgc_versor_turn_vector_fp32(&parent->turn, &child->shift, &relative_shift);
bgc_versor_combine_fp32(&child->turn, &parent->turn, &combination->turn);
bgc_vector3_add_fp32(&parent->shift, &relative_shift, &combination->shift);
bgc_versor_turn_vector_fp32(&second->turn, &first->shift, &relative_shift);
bgc_versor_combine_fp32(&first->turn, &second->turn, &combination->turn);
bgc_vector3_add_fp32(&relative_shift, &second->shift, &combination->shift);
}
inline void bgc_position3_combine_fp64(const BgcPosition3FP64 * parent, const BgcPosition3FP64 * child, BgcPosition3FP64 * combination)
inline void bgc_position3_combine_fp64(const BgcPosition3FP64 * first, const BgcPosition3FP64 * second, BgcPosition3FP64 * combination)
{
BgcVector3FP64 relative_shift;
bgc_versor_turn_vector_fp64(&parent->turn, &child->shift, &relative_shift);
bgc_versor_combine_fp64(&child->turn, &parent->turn, &combination->turn);
bgc_vector3_add_fp64(&parent->shift, &relative_shift, &combination->shift);
bgc_versor_turn_vector_fp64(&second->turn, &first->shift, &relative_shift);
bgc_versor_combine_fp64(&first->turn, &second->turn, &combination->turn);
bgc_vector3_add_fp64(&relative_shift, &second->shift, &combination->shift);
}
// =================== Exclude =================== //
inline void bgc_position3_exclude_fp32(const BgcPosition3FP32 * base, const BgcPosition3FP32 * excludant, BgcPosition3FP32 * difference)
{
BgcVector3FP32 relative_shift;
bgc_vector3_subtract_fp32(&base->shift, &excludant->shift, &relative_shift);
bgc_versor_turn_vector_back_fp32(&excludant->turn, &relative_shift, &difference->shift);
bgc_versor_exclude_fp32(&base->turn, &excludant->turn, &difference->turn);
}
inline void bgc_position3_exclude_fp64(const BgcPosition3FP64 * base, const BgcPosition3FP64 * excludant, BgcPosition3FP64 * difference)
{
BgcVector3FP64 relative_shift;
bgc_vector3_subtract_fp64(&base->shift, &excludant->shift, &relative_shift);
bgc_versor_turn_vector_back_fp64(&excludant->turn, &relative_shift, &difference->shift);
bgc_versor_exclude_fp64(&base->turn, &excludant->turn, &difference->turn);
}
// ============= Get Outward Affine ============== //
@ -201,12 +219,12 @@ inline void bgc_position3_transform_vector_outwards_fp64(const BgcPosition3FP64
// ========== Transform Vector Inwards =========== //
inline void bgc_position3_transform_vector_inward_fp32(const BgcPosition3FP32 * position, const BgcVector3FP32 * outer_vector, BgcVector3FP32 * inner_vector)
inline void bgc_position3_transform_vector_inwards_fp32(const BgcPosition3FP32 * position, const BgcVector3FP32 * outer_vector, BgcVector3FP32 * inner_vector)
{
bgc_versor_turn_vector_back_fp32(&position->turn, outer_vector, inner_vector);
}
inline void bgc_position3_transform_vector_inward_fp64(const BgcPosition3FP64 * position, const BgcVector3FP64 * outer_vector, BgcVector3FP64 * inner_vector)
inline void bgc_position3_transform_vector_inwards_fp64(const BgcPosition3FP64 * position, const BgcVector3FP64 * outer_vector, BgcVector3FP64 * inner_vector)
{
bgc_versor_turn_vector_back_fp64(&position->turn, outer_vector, inner_vector);
}

12
basic-geometry/versor.c
View file

@ -46,11 +46,11 @@ extern inline void bgc_versor_invert_fp64(BgcVersorFP64* versor);
extern inline void bgc_versor_get_inverse_fp32(const BgcVersorFP32* versor, BgcVersorFP32* inverse);
extern inline void bgc_versor_get_inverse_fp64(const BgcVersorFP64* versor, BgcVersorFP64* inverse);
extern inline void bgc_versor_combine_fp32(const BgcVersorFP32* second, const BgcVersorFP32* first, BgcVersorFP32* result);
extern inline void bgc_versor_combine_fp64(const BgcVersorFP64* second, const BgcVersorFP64* first, BgcVersorFP64* result);
extern inline void bgc_versor_combine_fp32(const BgcVersorFP32* first, const BgcVersorFP32* second, BgcVersorFP32* result);
extern inline void bgc_versor_combine_fp64(const BgcVersorFP64* first, const BgcVersorFP64* second, BgcVersorFP64* result);
extern inline void bgc_versor_combine3_fp32(const BgcVersorFP32* third, const BgcVersorFP32* second, const BgcVersorFP32* first, BgcVersorFP32* result);
extern inline void bgc_versor_combine3_fp64(const BgcVersorFP64* third, const BgcVersorFP64* second, const BgcVersorFP64* first, BgcVersorFP64* result);
extern inline void bgc_versor_combine3_fp32(const BgcVersorFP32* first, const BgcVersorFP32* second, const BgcVersorFP32* third, BgcVersorFP32* result);
extern inline void bgc_versor_combine3_fp64(const BgcVersorFP64* first, const BgcVersorFP64* second, const BgcVersorFP64* third, BgcVersorFP64* result);
extern inline void bgc_versor_exclude_fp32(const BgcVersorFP32* base, const BgcVersorFP32* excludant, BgcVersorFP32* difference);
extern inline void bgc_versor_exclude_fp64(const BgcVersorFP64* base, const BgcVersorFP64* excludant, BgcVersorFP64* difference);
@ -355,7 +355,7 @@ int bgc_versor_make_basis_difference_fp32(
}
// Step 6: Combine turn1 and turn2:
bgc_versor_combine_fp32(&turn2, &turn1, result);
bgc_versor_combine_fp32(&turn1, &turn2, result);
return BGC_SUCCESS;
}
@ -426,7 +426,7 @@ int bgc_versor_make_basis_difference_fp64(
}
// Step 6: Combine turn1 and turn2:
bgc_versor_combine_fp64(&turn2, &turn1, result);
bgc_versor_combine_fp64(&turn1, &turn2, result);
return BGC_SUCCESS;
}

8
basic-geometry/versor.h
View file

@ -352,7 +352,7 @@ void bgc_versor_get_exponation_fp64(const BgcVersorFP64* base, const double expo
// ================ Combination ================= //
inline void bgc_versor_combine_fp32(const BgcVersorFP32* second, const BgcVersorFP32* first, BgcVersorFP32* result)
inline void bgc_versor_combine_fp32(const BgcVersorFP32* first, const BgcVersorFP32* second, BgcVersorFP32* result)
{
bgc_versor_set_values_fp32(
(second->_s0 * first->_s0 - second->_x1 * first->_x1) - (second->_x2 * first->_x2 + second->_x3 * first->_x3),
@ -363,7 +363,7 @@ inline void bgc_versor_combine_fp32(const BgcVersorFP32* second, const BgcVersor
);
}
inline void bgc_versor_combine_fp64(const BgcVersorFP64* second, const BgcVersorFP64* first, BgcVersorFP64* result)
inline void bgc_versor_combine_fp64(const BgcVersorFP64* first, const BgcVersorFP64* second, BgcVersorFP64* result)
{
bgc_versor_set_values_fp64(
(second->_s0 * first->_s0 - second->_x1 * first->_x1) - (second->_x2 * first->_x2 + second->_x3 * first->_x3),
@ -376,7 +376,7 @@ inline void bgc_versor_combine_fp64(const BgcVersorFP64* second, const BgcVersor
// ============ Combination of three ============ //
inline void bgc_versor_combine3_fp32(const BgcVersorFP32* third, const BgcVersorFP32* second, const BgcVersorFP32* first, BgcVersorFP32* result)
inline void bgc_versor_combine3_fp32(const BgcVersorFP32* first, const BgcVersorFP32* second, const BgcVersorFP32* third, BgcVersorFP32* result)
{
const float s0 = (second->_s0 * first->_s0 - second->_x1 * first->_x1) - (second->_x2 * first->_x2 + second->_x3 * first->_x3);
const float x1 = (second->_x1 * first->_s0 + second->_s0 * first->_x1) - (second->_x3 * first->_x2 - second->_x2 * first->_x3);
@ -392,7 +392,7 @@ inline void bgc_versor_combine3_fp32(const BgcVersorFP32* third, const BgcVersor
);
}
inline void bgc_versor_combine3_fp64(const BgcVersorFP64* third, const BgcVersorFP64* second, const BgcVersorFP64* first, BgcVersorFP64* result)
inline void bgc_versor_combine3_fp64(const BgcVersorFP64* first, const BgcVersorFP64* second, const BgcVersorFP64* third, BgcVersorFP64* result)
{
const double s0 = (second->_s0 * first->_s0 - second->_x1 * first->_x1) - (second->_x2 * first->_x2 + second->_x3 * first->_x3);
const double x1 = (second->_x1 * first->_s0 + second->_s0 * first->_x1) - (second->_x3 * first->_x2 - second->_x2 * first->_x3);