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

[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:
a0d1f576c6 WINTERMUTE: Removed _dxmesh


Commit: a0d1f576c602c70d1a6f9c082879fe6d6d8710f5
    https://github.com/scummvm/scummvm/commit/a0d1f576c602c70d1a6f9c082879fe6d6d8710f5
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-10-12T17:51:38+02:00

Commit Message:
WINTERMUTE: Removed _dxmesh

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


diff --git a/engines/wintermute/base/gfx/xskinmesh_loader.cpp b/engines/wintermute/base/gfx/xskinmesh_loader.cpp
index 0444289014f..0d58fe8e59e 100644
--- a/engines/wintermute/base/gfx/xskinmesh_loader.cpp
+++ b/engines/wintermute/base/gfx/xskinmesh_loader.cpp
@@ -33,15 +33,13 @@
 namespace Wintermute {
 
 XSkinMeshLoader::XSkinMeshLoader(DXMesh *dxmesh) {
-	_dxmesh = dxmesh;
-	
 	_vertexCount = dxmesh->getNumVertices();
 	// vertex format for .X meshes will be position + normals + textures
 	_vertexData = new float[kVertexComponentCount * _vertexCount]();
-	
-	auto fvf = _dxmesh->getFVF();
+
+	auto fvf = dxmesh->getFVF();
 	uint32 vertexSize = DXGetFVFVertexSize(fvf) / sizeof(float);
-	float *vertexBuffer = (float *)_dxmesh->getVertexBuffer().ptr();
+	float *vertexBuffer = (float *)dxmesh->getVertexBuffer().ptr();
 	uint32 offset = 0, normalOffset = 0, textureOffset = 0;
 
 	if (fvf & DXFVF_XYZ) {
diff --git a/engines/wintermute/base/gfx/xskinmesh_loader.h b/engines/wintermute/base/gfx/xskinmesh_loader.h
index e5148259935..b701270faa8 100644
--- a/engines/wintermute/base/gfx/xskinmesh_loader.h
+++ b/engines/wintermute/base/gfx/xskinmesh_loader.h
@@ -69,8 +69,6 @@ protected:
 
 	BaseArray<Math::Matrix4 *> _boneMatrices;
 	BaseArray<SkinWeights> _skinWeightsList;
-
-	DXMesh *_dxmesh;
 };
 
 } // namespace Wintermute