mirror of
https://github.com/SFML/CSFML.git
synced 2026-10-27 13:36:12 +01:00
Updated sfTransform_Combine
This commit is contained in:
1 parent
787c5c01d0
commit
c54975288f
2 files changed
+7
-10
No files matched your search
@@ -144,15 +144,14 @@ CSFML_GRAPHICS_API void sfTransform_TransformRect(const sfTransform* transform,
|
|||||||
/// \brief Combine two transforms
|
/// \brief Combine two transforms
|
||||||
///
|
///
|
||||||
/// The result is a transform that is equivalent to applying
|
/// The result is a transform that is equivalent to applying
|
||||||
/// \a left followed by \a right. Mathematically, it is
|
/// \a transform followed by \a other. Mathematically, it is
|
||||||
/// equivalent to a matrix multiplication.
|
/// equivalent to a matrix multiplication.
|
||||||
///
|
///
|
||||||
/// \param left First transform to combine
|
/// \param transform Transform object
|
||||||
/// \param right Second transform to combine
|
/// \param right Transform to combine to \a transform
|
||||||
/// \param result Result of the operation (must point to a valid sfTransform instance)
|
|
||||||
///
|
///
|
||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
CSFML_GRAPHICS_API void sfTransform_Combine(const sfTransform* left, const sfTransform* right, sfTransform* result);
|
CSFML_GRAPHICS_API void sfTransform_Combine(sfTransform* transform, const sfTransform* other);
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
/// \brief Combine a transform with a translation
|
/// \brief Combine a transform with a translation
|
||||||
|
|||||||
@@ -113,13 +113,11 @@ void sfTransform_TransformRect(const sfTransform* transform, sfFloatRect rectang
|
|||||||
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////
|
||||||
void sfTransform_Combine(const sfTransform* left, const sfTransform* right, sfTransform* result)
|
void sfTransform_Combine(sfTransform* transform, const sfTransform* other)
|
||||||
{
|
{
|
||||||
CSFML_CHECK(left);
|
CSFML_CHECK(other);
|
||||||
CSFML_CHECK(right);
|
|
||||||
|
|
||||||
if (result)
|
CSFML_CALL(transform, Combine(other->This));
|
||||||
result->This = left->This.Combine(right->This);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user