Обновление makefile, переименования параметров функций комбинирования аффинных преобразований
This commit is contained in:
parent
0258f0a283
commit
d33daf4e2d
5 changed files with 27 additions and 26 deletions
|
|
@ -127,20 +127,20 @@ inline int bgc_affine3_get_inverse_fp64(const BgcAffine3FP64 * source, BgcAffine
|
|||
|
||||
// =================== Combine =================== //
|
||||
|
||||
inline void bgc_affine3_combine_fp32(const BgcAffine3FP32 * parent, const BgcAffine3FP32 * child, BgcAffine3FP32 * combination)
|
||||
inline void bgc_affine3_combine_fp32(const BgcAffine3FP32 * first, const BgcAffine3FP32 * second, BgcAffine3FP32 * combination)
|
||||
{
|
||||
BgcVector3FP32 child_shift;
|
||||
bgc_matrix3x3_get_right_product_fp32(&parent->distortion, &child->shift, &child_shift);
|
||||
bgc_matrix_product_3x3_at_3x3_fp32(&parent->distortion, &child->distortion, &combination->distortion);
|
||||
bgc_vector3_add_fp32(&parent->shift, &child_shift, &combination->shift);
|
||||
BgcVector3FP32 first_shift;
|
||||
bgc_matrix3x3_get_right_product_fp32(&second->distortion, &first->shift, &first_shift);
|
||||
bgc_matrix_product_3x3_at_3x3_fp32(&second->distortion, &first->distortion, &combination->distortion);
|
||||
bgc_vector3_add_fp32(&first_shift, &second->shift, &combination->shift);
|
||||
}
|
||||
|
||||
inline void bgc_affine3_combine_fp64(const BgcAffine3FP64 * parent, const BgcAffine3FP64 * child, BgcAffine3FP64 * combination)
|
||||
inline void bgc_affine3_combine_fp64(const BgcAffine3FP64 * first, const BgcAffine3FP64 * second, BgcAffine3FP64 * combination)
|
||||
{
|
||||
BgcVector3FP64 child_shift;
|
||||
bgc_matrix3x3_get_right_product_fp64(&parent->distortion, &child->shift, &child_shift);
|
||||
bgc_matrix_product_3x3_at_3x3_fp64(&parent->distortion, &child->distortion, &combination->distortion);
|
||||
bgc_vector3_add_fp64(&parent->shift, &child_shift, &combination->shift);
|
||||
BgcVector3FP64 first_shift;
|
||||
bgc_matrix3x3_get_right_product_fp64(&second->distortion, &first->shift, &first_shift);
|
||||
bgc_matrix_product_3x3_at_3x3_fp64(&second->distortion, &first->distortion, &combination->distortion);
|
||||
bgc_vector3_add_fp64(&first_shift, &second->shift, &combination->shift);
|
||||
}
|
||||
|
||||
// =============== Transform Point =============== //
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue