[Scummvm-git-logs] scummvm master -> 42e2fb1377307c20bb8bf3e8e31753894146aa65

[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:
42e2fb1377 WINTERMUTE: Update SkinMeshHelper arguments


Commit: 42e2fb1377307c20bb8bf3e8e31753894146aa65
    https://github.com/scummvm/scummvm/commit/42e2fb1377307c20bb8bf3e8e31753894146aa65
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-10-11T23:36:34+02:00

Commit Message:
WINTERMUTE: Update SkinMeshHelper arguments

Changed paths:
    engines/wintermute/base/gfx/skin_mesh_helper.cpp
    engines/wintermute/base/gfx/skin_mesh_helper.h
    engines/wintermute/base/gfx/xmesh.cpp
    engines/wintermute/base/gfx/xskinmesh_loader.cpp
    engines/wintermute/base/gfx/xskinmesh_loader.h


diff --git a/engines/wintermute/base/gfx/skin_mesh_helper.cpp b/engines/wintermute/base/gfx/skin_mesh_helper.cpp
index aac2aaa2cf6..94648dffe72 100644
--- a/engines/wintermute/base/gfx/skin_mesh_helper.cpp
+++ b/engines/wintermute/base/gfx/skin_mesh_helper.cpp
@@ -63,10 +63,10 @@ bool SkinMeshHelper::getOriginalMesh(DXMesh **mesh) {
 }
 
 //////////////////////////////////////////////////////////////////////////
-bool SkinMeshHelper::generateSkinnedMesh(uint32 options, float minWeight, uint32 *adjacencyOut, DXMesh **mesh) {
+bool SkinMeshHelper::generateSkinnedMesh(uint32 *adjacencyOut, DXMesh **mesh) {
 	bool res = getOriginalMesh(mesh);
 	if (res) {
-	 	(*mesh)->generateAdjacency(adjacencyOut);
+		(*mesh)->generateAdjacency(adjacencyOut);
 	}
 
 	return res;
@@ -81,12 +81,12 @@ bool SkinMeshHelper::updateSkinnedMesh(const DXMatrix *boneTransforms, DXMesh *m
 }
 
 //////////////////////////////////////////////////////////////////////////
-const char *SkinMeshHelper::getBoneName(uint boneIndex) {
+const char *SkinMeshHelper::getBoneName(uint32 boneIndex) {
 	return _skinInfo->getBoneName(boneIndex);
 }
 
 //////////////////////////////////////////////////////////////////////////
-DXMatrix *SkinMeshHelper::getBoneOffsetMatrix(uint boneIndex) {
+DXMatrix *SkinMeshHelper::getBoneOffsetMatrix(uint32 boneIndex) {
 	return _skinInfo->getBoneOffsetMatrix(boneIndex);
 }
 
diff --git a/engines/wintermute/base/gfx/skin_mesh_helper.h b/engines/wintermute/base/gfx/skin_mesh_helper.h
index 55b66fb1932..b1c86a68b53 100644
--- a/engines/wintermute/base/gfx/skin_mesh_helper.h
+++ b/engines/wintermute/base/gfx/skin_mesh_helper.h
@@ -55,11 +55,11 @@ public:
 	uint getNumFaces();
 	uint getNumBones();
 	bool getOriginalMesh(DXMesh **mesh);
-	bool generateSkinnedMesh(uint32 options, float minWeight, uint32 *adjacencyOut, DXMesh **mesh);
+	bool generateSkinnedMesh(uint32 *adjacencyOut, DXMesh **mesh);
 	bool updateSkinnedMesh(const DXMatrix *boneTransforms, DXMesh *mesh);
-	const char *getBoneName(uint boneIndex);
-	DXMatrix *getBoneOffsetMatrix(uint boneIndex);
-	
+	const char *getBoneName(uint32 boneIndex);
+	DXMatrix *getBoneOffsetMatrix(uint32 boneIndex);
+
 private:
 	XSkinMeshLoader *_mesh;
 	DXMesh *_dxmesh;
diff --git a/engines/wintermute/base/gfx/xmesh.cpp b/engines/wintermute/base/gfx/xmesh.cpp
index 739eeace5d0..560acf63f7c 100644
--- a/engines/wintermute/base/gfx/xmesh.cpp
+++ b/engines/wintermute/base/gfx/xmesh.cpp
@@ -83,7 +83,7 @@ bool XMesh::loadFromXData(const Common::String &filename, XFileData *xobj) {
 		return false;
 	}
 
-	XSkinMeshLoader *meshLoader = new XSkinMeshLoader(this, meshObject, mesh, skinInfo);
+	XSkinMeshLoader *meshLoader = new XSkinMeshLoader(this, meshObject, mesh);
 	meshLoader->loadMesh(filename, xobj);
 
 	_skinMesh = new SkinMeshHelper(meshLoader, mesh, skinInfo);
diff --git a/engines/wintermute/base/gfx/xskinmesh_loader.cpp b/engines/wintermute/base/gfx/xskinmesh_loader.cpp
index 801504d036b..3511a2605dc 100644
--- a/engines/wintermute/base/gfx/xskinmesh_loader.cpp
+++ b/engines/wintermute/base/gfx/xskinmesh_loader.cpp
@@ -35,11 +35,9 @@ namespace Wintermute {
 // define constant to make it available to the linker
 const uint32 XSkinMeshLoader::kNullIndex;
 
-XSkinMeshLoader::XSkinMeshLoader(XMesh *mesh, XMeshObject *meshObject, DXMesh *dxmesh, DXSkinInfo *skinInfo) {
+XSkinMeshLoader::XSkinMeshLoader(XMesh *mesh, XMeshObject *meshObject, DXMesh *dxmesh) {
 	_mesh = mesh;
-	_meshObject = meshObject;
 	_dxmesh = dxmesh;
-	_skinInfo = skinInfo;
 
 	_vertexCount = meshObject->_numVertices;
 	// vertex format for .X meshes will be position + normals + textures
diff --git a/engines/wintermute/base/gfx/xskinmesh_loader.h b/engines/wintermute/base/gfx/xskinmesh_loader.h
index a151bd371f6..37f30c3f585 100644
--- a/engines/wintermute/base/gfx/xskinmesh_loader.h
+++ b/engines/wintermute/base/gfx/xskinmesh_loader.h
@@ -53,7 +53,7 @@ class XSkinMeshLoader {
 	friend class SkinMeshHelper;
 
 public:
-	XSkinMeshLoader(XMesh *mesh, XMeshObject *meshObject, DXMesh *dxmesh, DXSkinInfo *skinInfo);
+	XSkinMeshLoader(XMesh *mesh, XMeshObject *meshObject, DXMesh *dxmesh);
 	virtual ~XSkinMeshLoader();
 	void loadMesh(const Common::String &filename, XFileData *xobj);
 
@@ -81,9 +81,7 @@ protected:
 	BaseArray<SkinWeights> _skinWeightsList;
 
 	XMesh *_mesh;
-	XMeshObject *_meshObject;
 	DXMesh *_dxmesh;
-	DXSkinInfo *_skinInfo;
 };
 
 } // namespace Wintermute