Исправление функций комбинации, добавление функций исключения одной позиции из другой
This commit is contained in:
parent
101df9f089
commit
e1dce83d63
7 changed files with 82 additions and 40 deletions
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||