|
|
@@ -159,9 +159,9 @@ public:
|
|
|
|
|
|
/// Set both position and rotation in parent space as an atomic operation. This is faster than setting position and rotation separately.
|
|
|
void SetTransform(const Vector3& position, const Quaternion& rotation);
|
|
|
- /// Set both position, rotation and uniform scale in parent space as an atomic operation.
|
|
|
+ /// Set position, rotation, and uniform scale in parent space as an atomic operation.
|
|
|
void SetTransform(const Vector3& position, const Quaternion& rotation, float scale);
|
|
|
- /// Set both position, rotation and scale in parent space as an atomic operation.
|
|
|
+ /// Set position, rotation, and scale in parent space as an atomic operation.
|
|
|
void SetTransform(const Vector3& position, const Quaternion& rotation, const Vector3& scale);
|
|
|
/// Set node transformation in parent space as an atomic operation.
|
|
|
void SetTransform(const Matrix3x4& matrix);
|
|
|
@@ -169,13 +169,13 @@ public:
|
|
|
/// Set both position and rotation in parent space as an atomic operation (for Urho2D).
|
|
|
void SetTransform2D(const Vector2& position, float rotation) { SetTransform(Vector3(position), Quaternion(rotation)); }
|
|
|
|
|
|
- /// Set both position, rotation and uniform scale in parent space as an atomic operation (for Urho2D).
|
|
|
+ /// Set position, rotation, and uniform scale in parent space as an atomic operation (for Urho2D).
|
|
|
void SetTransform2D(const Vector2& position, float rotation, float scale)
|
|
|
{
|
|
|
SetTransform(Vector3(position), Quaternion(rotation), scale);
|
|
|
}
|
|
|
|
|
|
- /// Set both position, rotation and scale in parent space as an atomic operation (for Urho2D).
|
|
|
+ /// Set position, rotation, and scale in parent space as an atomic operation (for Urho2D).
|
|
|
void SetTransform2D(const Vector2& position, float rotation, const Vector2& scale)
|
|
|
{
|
|
|
SetTransform(Vector3(position), Quaternion(rotation), Vector3(scale, 1.0f));
|
|
|
@@ -211,10 +211,12 @@ public:
|
|
|
|
|
|
/// Set both position and rotation in world space as an atomic operation.
|
|
|
void SetWorldTransform(const Vector3& position, const Quaternion& rotation);
|
|
|
- /// Set both position, rotation and uniform scale in world space as an atomic operation.
|
|
|
+ /// Set position, rotation, and uniform scale in world space as an atomic operation.
|
|
|
void SetWorldTransform(const Vector3& position, const Quaternion& rotation, float scale);
|
|
|
- /// Set both position, rotation and scale in world space as an atomic opration.
|
|
|
+ /// Set position, rotation, and scale in world space as an atomic opration.
|
|
|
void SetWorldTransform(const Vector3& position, const Quaternion& rotation, const Vector3& scale);
|
|
|
+ /// Set position, rotation, and scale in world space as an atomic operation from a transformation matrix
|
|
|
+ void SetWorldTransform(const Matrix3x4& worldTransform);
|
|
|
|
|
|
/// Set both position and rotation in world space as an atomic operation (for Urho2D).
|
|
|
void SetWorldTransform2D(const Vector2& position, float rotation)
|
|
|
@@ -222,13 +224,13 @@ public:
|
|
|
SetWorldTransform(Vector3(position), Quaternion(rotation));
|
|
|
}
|
|
|
|
|
|
- /// Set both position, rotation and uniform scale in world space as an atomic operation (for Urho2D).
|
|
|
+ /// Set position, rotation, and uniform scale in world space as an atomic operation (for Urho2D).
|
|
|
void SetWorldTransform2D(const Vector2& position, float rotation, float scale)
|
|
|
{
|
|
|
SetWorldTransform(Vector3(position), Quaternion(rotation), scale);
|
|
|
}
|
|
|
|
|
|
- /// Set both position, rotation and scale in world space as an atomic opration (for Urho2D).
|
|
|
+ /// Set position, rotation, and scale in world space as an atomic opration (for Urho2D).
|
|
|
void SetWorldTransform2D(const Vector2& position, float rotation, const Vector2& scale)
|
|
|
{
|
|
|
SetWorldTransform(Vector3(position), Quaternion(rotation), Vector3(scale, 1.0f));
|