[Scummvm-git-logs] scummvm master -> 88330e89a2f8a56431738b215f9d0ed850961363

[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:
88330e89a2 WINTERMUTE: Eliminate meshObject from SkinMeshLoader


Commit: 88330e89a2f8a56431738b215f9d0ed850961363
    https://github.com/scummvm/scummvm/commit/88330e89a2f8a56431738b215f9d0ed850961363
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-10-12T08:47:57+02:00

Commit Message:
WINTERMUTE: Eliminate meshObject from SkinMeshLoader

Changed paths:
    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/xmesh.cpp b/engines/wintermute/base/gfx/xmesh.cpp
index 5acb570ec97..4bd7f3aa664 100644
--- a/engines/wintermute/base/gfx/xmesh.cpp
+++ b/engines/wintermute/base/gfx/xmesh.cpp
@@ -62,12 +62,6 @@ bool XMesh::loadFromXData(const Common::String &filename, XFileData *xobj) {
 		return false;
 	}
 
-	XMeshObject *meshObject = xobj->getXMeshObject();
-	if (!meshObject) {
-		BaseEngine::LOG(0, "Error loading mesh");
-		return false;
-	}
-
 	// load mesh
 	DXBuffer bufMaterials;
 	DXBuffer bufAdjacency;
@@ -83,7 +77,7 @@ bool XMesh::loadFromXData(const Common::String &filename, XFileData *xobj) {
 		return false;
 	}
 
-	XSkinMeshLoader *meshLoader = new XSkinMeshLoader(this, meshObject, mesh);
+	XSkinMeshLoader *meshLoader = new XSkinMeshLoader(this, 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 e30c18ca319..af6d75fdb48 100644
--- a/engines/wintermute/base/gfx/xskinmesh_loader.cpp
+++ b/engines/wintermute/base/gfx/xskinmesh_loader.cpp
@@ -32,11 +32,11 @@
 
 namespace Wintermute {
 
-XSkinMeshLoader::XSkinMeshLoader(XMesh *mesh, XMeshObject *meshObject, DXMesh *dxmesh) {
+XSkinMeshLoader::XSkinMeshLoader(XMesh *mesh, DXMesh *dxmesh) {
 	_mesh = mesh;
 	_dxmesh = dxmesh;
 
-	_vertexCount = meshObject->_numVertices;
+	_vertexCount = dxmesh->getNumVertices();
 	// vertex format for .X meshes will be position + normals + textures
 	_vertexData = new float[kVertexComponentCount * _vertexCount]();
 	_vertexPositionData = new float[3 * _vertexCount]();
diff --git a/engines/wintermute/base/gfx/xskinmesh_loader.h b/engines/wintermute/base/gfx/xskinmesh_loader.h
index cb44e174d1f..961410947a8 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);
+	XSkinMeshLoader(XMesh *mesh, DXMesh *dxmesh);
 	virtual ~XSkinMeshLoader();
 	void loadMesh(const Common::String &filename, XFileData *xobj);