SetBakedMatrix --> SetBakedTransform

beyond-all-reason · Dec 14, 2024 · 2c1b21f · 2c1b21f
1 parent 6d5a469
commit 2c1b21f
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/rts/Rendering/Models/3DModel.h b/rts/Rendering/Models/3DModel.h
@@ -187,10 +187,9 @@ struct S3DModelPiece {
 	void Shatter(float, int, int, int, const float3, const float3, const CMatrix44f&) const;
 
 	void SetPieceTransform(const Transform& parentTra);
-	void SetBakedMatrix(const CMatrix44f& m) {
-		bakedTransform = Transform::FromMatrix(m);
-		hasBakedTra = !m.IsIdentity();
-		assert(m.IsOrthoNormal());
+	void SetBakedTransform(const Transform& tra) {
+		bakedTransform = tra;
+		hasBakedTra = !tra.IsIdentity();
 	}
 
 	Transform ComposeTransform(const float3& t, const float3& r, float s) const;

diff --git a/rts/Rendering/Models/AssParser.cpp b/rts/Rendering/Models/AssParser.cpp
@@ -151,11 +151,9 @@ struct SPseudoAssPiece {
 
 	bool hasBakedTra;
 
-	// copy of S3DModelPiece::SetBakedMatrix()
-	void SetBakedMatrix(const CMatrix44f& m) {
-		bakedTransform = Transform::FromMatrix(m);
-		hasBakedTra = !m.IsIdentity();
-		assert(m.IsOrthoNormal());
+	// copy of S3DModelPiece::SetBakedTransform()
+	void SetBakedTransform(const Transform& tra) {
+		hasBakedTra = !tra.IsIdentity();
 	}
 
 	// copy of S3DModelPiece::ComposeTransform()
@@ -518,7 +516,14 @@ namespace {
 		// and <scales> so the baked part reduces to R
 		//
 		// note: for all non-AssImp models this is identity!
-		piece->SetBakedMatrix(bakedMatrix.RotateEulerYXZ(-bakedRotAngles));
+
+		Transform bakedTransform(CQuaternion::FromEulerYPRNeg(-bakedRotAngles) * CQuaternion(aiRotateQuat.x, aiRotateQuat.y, aiRotateQuat.z, aiRotateQuat.w), ZeroVector, 1.0f);
+		piece->SetBakedTransform(bakedTransform);
+#ifdef _DEBUG
+		Transform bakedTransform2 = Transform::FromMatrix(bakedMatrix);
+		assert(bakedTransform.equals(bakedTransform2));
+#endif // _DEBUG
+
 	}
 }
 

diff --git a/rts/System/Transform.cpp b/rts/System/Transform.cpp
@@ -12,6 +12,12 @@ CR_REG_METADATA(Transform, (
 static_assert(sizeof (Transform) == 2 * 4 * sizeof(float));
 static_assert(alignof(Transform) == alignof(decltype(Transform::r)));
 
+bool Transform::IsIdentity() const
+{
+	static constexpr Transform Identity;
+	return this->equals(Identity);
+}
+
 Transform Transform::FromMatrix(const CMatrix44f& mat)
 {
 	Transform tra;

diff --git a/rts/System/Transform.hpp b/rts/System/Transform.hpp
@@ -31,6 +31,8 @@ struct Transform {
 		s = 1.0f;
 	}
 
+	bool IsIdentity() const;
+
 	static Transform FromMatrix(const CMatrix44f& mat);
 	CMatrix44f ToMatrix() const;