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

[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:
fb189b7938 WINTERMUTE: Keep face indices order to original for now


Commit: fb189b79387d55b3fdb514230666464c87bc0968
    https://github.com/scummvm/scummvm/commit/fb189b79387d55b3fdb514230666464c87bc0968
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-10-22T07:55:04+02:00

Commit Message:
WINTERMUTE: Keep face indices order to original for now

Changed paths:
    engines/wintermute/base/gfx/3dshadow_volume.cpp
    engines/wintermute/base/gfx/xskinmesh.cpp


diff --git a/engines/wintermute/base/gfx/3dshadow_volume.cpp b/engines/wintermute/base/gfx/3dshadow_volume.cpp
index 30e50916585..737ab9bfa6d 100644
--- a/engines/wintermute/base/gfx/3dshadow_volume.cpp
+++ b/engines/wintermute/base/gfx/3dshadow_volume.cpp
@@ -50,7 +50,6 @@ bool ShadowVolume::reset() {
 
 //////////////////////////////////////////////////////////////////////////^M
 bool ShadowVolume::addMesh(DXMesh *mesh, uint32 *adjacency, DXMatrix *modelMat, DXVector3 *light, float extrusionDepth) {
-
 	if (!mesh || !adjacency)
 		return false;
 
diff --git a/engines/wintermute/base/gfx/xskinmesh.cpp b/engines/wintermute/base/gfx/xskinmesh.cpp
index bd6c2f2b0af..41b43ac68c1 100644
--- a/engines/wintermute/base/gfx/xskinmesh.cpp
+++ b/engines/wintermute/base/gfx/xskinmesh.cpp
@@ -1122,17 +1122,17 @@ bool DXLoadSkinMesh(XFileData *fileData, DXBuffer &materialsOut, uint32 &numMate
 	for (i = 0; i < meshData._numPolyFaces; i++) {
 		uint32 count = meshData._numTriPerFace[i];
 		uint32 firstIndex = *indexInPtr++;
-		// 1 -> 1 -> 3
-		// 2 -> 2 -> 2
-		// 3 -> 3 -> 1
-		// 1 -> 4 -> 6
-		// 3 -> 5 -> 5
-		// 4 -> 6 -> 4
+		// 1 -> 1
+		// 2 -> 2
+		// 3 -> 3
+		// 1 -> 4
+		// 3 -> 5
+		// 4 -> 6
 		while (count--) {
-			indices[2] = firstIndex;
-			indices[1] = *indexInPtr++;
-			indices[0] = *indexInPtr;
-			indices += 3;
+			*indices++ = firstIndex;
+			*indices++ = *indexInPtr;
+			indexInPtr++;
+			*indices++ = *indexInPtr;
 		}
 		indexInPtr++;
 	}