[Scummvm-git-logs] scummvm master -> a54bd9530a4dbe67b24f0b776a6f53ca958bf839

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a54bd9530a WINTERMUTE: Synced with original code for function getBonePosition2D


Commit: a54bd9530a4dbe67b24f0b776a6f53ca958bf839
    https://github.com/scummvm/scummvm/commit/a54bd9530a4dbe67b24f0b776a6f53ca958bf839
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-10-17T17:34:13+02:00

Commit Message:
WINTERMUTE: Synced with original code for function getBonePosition2D

Changed paths:
    engines/wintermute/ad/ad_object_3d.cpp


diff --git a/engines/wintermute/ad/ad_object_3d.cpp b/engines/wintermute/ad/ad_object_3d.cpp
index 3146201ef5a..e99b64a3909 100644
--- a/engines/wintermute/ad/ad_object_3d.cpp
+++ b/engines/wintermute/ad/ad_object_3d.cpp
@@ -619,15 +619,16 @@ bool AdObject3D::getBonePosition2D(const char *boneName, int32 *x, int32 *y) {
 		return false;
 	}
 
-	Math::Matrix4 boneMatrix;
-	boneMatrix.setData(*boneMat);
-	Math::Matrix4 bonePosMat = boneMatrix * _worldMatrix;
+	DXMatrix bonePosMat, worldMatrix = DXMatrix(_worldMatrix.getData());
+	DXMatrixMultiply(&bonePosMat, boneMat, &worldMatrix);
 
-	Math::Vector4d vectBone4 = Math::Vector4d(0.0f, 0.0f, 0.0f, 0.0f);
-	bonePosMat.transformVector(&vectBone4);
-	Math::Vector3d vectBone(vectBone4.x(), vectBone4.y(), vectBone4.z());
+	DXVector4 vectBone4;
+	DXVector3 vectBone3(0, 0, 0);
+	DXVec3Transform(&vectBone4, &vectBone3, &bonePosMat);
+	DXVector3 vectBone(vectBone4._x, vectBone4._y, vectBone4._z);
 
-	adGame->_scene->_sceneGeometry->convert3Dto2D(&vectBone, x, y);
+	Math::Vector3d vectBonePos = Math::Vector3d(vectBone4._x, vectBone4._y, vectBone4._z);
+	adGame->_scene->_sceneGeometry->convert3Dto2D(&vectBonePos, x, y);
 	return true;
 }