[Scummvm-git-logs] scummvm master -> 4310ae9f227954ee8103770f5f00b1ae12f77a38

[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:
4310ae9f22 WINTERMUTE: WME3D: Removed not needed anymore indexCountPerFace


Commit: 4310ae9f227954ee8103770f5f00b1ae12f77a38
    https://github.com/scummvm/scummvm/commit/4310ae9f227954ee8103770f5f00b1ae12f77a38
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-10-03T06:33:48+02:00

Commit Message:
WINTERMUTE: WME3D: Removed not needed anymore indexCountPerFace

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


diff --git a/engines/wintermute/base/gfx/xmesh.cpp b/engines/wintermute/base/gfx/xmesh.cpp
index e44912a0ad0..1a174fcac06 100644
--- a/engines/wintermute/base/gfx/xmesh.cpp
+++ b/engines/wintermute/base/gfx/xmesh.cpp
@@ -130,7 +130,6 @@ bool XMesh::loadFromXData(const Common::String &filename, XFileData *xobj) {
 		}
 
 		meshLoader->_indexRanges.push_back((atribTable->_ptr[atribTable->_size - 1]._faceStart + atribTable->_ptr[atribTable->_size - 1]._faceCount) * 3);
-
 	}
 
 	_skinnedMesh = false;
@@ -145,28 +144,28 @@ bool XMesh::loadFromXData(const Common::String &filename, XFileData *xobj) {
 			int weightCount = bone->_numInfluences;
 			currSkinWeights._vertexIndices.resize(weightCount);
 			currSkinWeights._vertexWeights.resize(weightCount);
-			
+
 			for (int i = 0; i < weightCount; ++i) {
 				currSkinWeights._vertexIndices[i] = bone->_vertices[i];
 			}
-			
+
 			for (int i = 0; i < weightCount; ++i) {
 				currSkinWeights._vertexWeights[i] = bone->_weights[i];
 			}
-			
+
 			for (int r = 0; r < 4; ++r) {
 				for (int c = 0; c < 4; ++c) {
 					currSkinWeights._offsetMatrix(c, r) = bone->_transform._m4x4[r * 4 + c];
 				}
 			}
-			
+
 			// mirror at orign
 			currSkinWeights._offsetMatrix(2, 3) *= -1.0f;
-			
+
 			// mirror base vectors
 			currSkinWeights._offsetMatrix(2, 0) *= -1.0f;
 			currSkinWeights._offsetMatrix(2, 1) *= -1.0f;
-			
+
 			// change handedness
 			currSkinWeights._offsetMatrix(0, 2) *= -1.0f;
 			currSkinWeights._offsetMatrix(1, 2) *= -1.0f;
diff --git a/engines/wintermute/base/gfx/xskinmesh_loader.cpp b/engines/wintermute/base/gfx/xskinmesh_loader.cpp
index 328fd34952e..42574986fef 100644
--- a/engines/wintermute/base/gfx/xskinmesh_loader.cpp
+++ b/engines/wintermute/base/gfx/xskinmesh_loader.cpp
@@ -60,7 +60,7 @@ void XSkinMeshLoader::loadMesh(const Common::String &filename, XFileData *xobj)
 	auto fvf = _dxmesh->getFVF();
 	uint32 vertexSize = DXGetFVFVertexSize(fvf) / sizeof(float);
 	float *vertexBuffer = (float *)_dxmesh->getVertexBuffer().ptr();
-	uint32 offset = 0, normalOffset = 0, /*diffuseOffset, */textureOffset = 0;
+	uint32 offset = 0, normalOffset = 0, /*diffuseOffset = 0, */textureOffset = 0;
 
 	if (fvf & DXFVF_XYZ) {
 		offset += sizeof(DXVector3) / sizeof(float);
@@ -112,12 +112,8 @@ void XSkinMeshLoader::loadMesh(const Common::String &filename, XFileData *xobj)
 	}
 
 
-	uint numFaces = _meshObject->_numFaces;
-
-	Common::Array<int> indexCountPerFace;
-
 	uint32 *indexPtr = (uint32 *)_dxmesh->getIndexBuffer().ptr();
-
+	uint numFaces = _meshObject->_numFaces;
 	for (uint i = 0; i < numFaces; ++i) {
 		XMeshFace *face = &_meshObject->_faces[i];
 		int indexCount = face->_numFaceVertexIndices;
@@ -129,7 +125,6 @@ void XSkinMeshLoader::loadMesh(const Common::String &filename, XFileData *xobj)
 			_indexData.push_back(index3);
 			_indexData.push_back(index2);
 			_indexData.push_back(index1);
-			indexCountPerFace.push_back(3);
 		} else {
 			index1 = *indexPtr++;
 			index2 = *indexPtr++;
@@ -143,7 +138,6 @@ void XSkinMeshLoader::loadMesh(const Common::String &filename, XFileData *xobj)
 			_indexData.push_back(index6);
 			_indexData.push_back(index5);
 			_indexData.push_back(index4);
-			indexCountPerFace.push_back(6);
 		}
 	}
 }