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

mduggan noreply at scummvm.org
Fri Feb 24 05:41:55 UTC 2023


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d093854bc4 TETRAEDGE: Remove repeated value copy in assignment
d277d176a7 TETRAEDGE: Fix normal calculation for character textures


Commit: d093854bc4265119718005181d115e2fc80eb853
    https://github.com/scummvm/scummvm/commit/d093854bc4265119718005181d115e2fc80eb853
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-02-24T14:36:17+09:00

Commit Message:
TETRAEDGE: Remove repeated value copy in assignment

Changed paths:
    engines/tetraedge/te/te_material.cpp


diff --git a/engines/tetraedge/te/te_material.cpp b/engines/tetraedge/te/te_material.cpp
index 5e6465ec1db..eb06f5eaa56 100644
--- a/engines/tetraedge/te/te_material.cpp
+++ b/engines/tetraedge/te/te_material.cpp
@@ -83,7 +83,6 @@ TeMaterial &TeMaterial::operator=(const TeMaterial &other) {
 	_enableLights = other._enableLights;
 	_shininess = other._shininess;
 	_mode = other._mode;
-	_enableLights = other._enableLights;
 	_isShadowTexture = other._isShadowTexture;
 
 	return *this;


Commit: d277d176a7a114bc325f19b19f102a6576a7320f
    https://github.com/scummvm/scummvm/commit/d277d176a7a114bc325f19b19f102a6576a7320f
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2023-02-24T14:36:17+09:00

Commit Message:
TETRAEDGE: Fix normal calculation for character textures

Changed paths:
    engines/tetraedge/te/te_model.cpp


diff --git a/engines/tetraedge/te/te_model.cpp b/engines/tetraedge/te/te_model.cpp
index 32027812895..6b16fbe5e24 100644
--- a/engines/tetraedge/te/te_model.cpp
+++ b/engines/tetraedge/te/te_model.cpp
@@ -285,7 +285,7 @@ void TeModel::update() {
 						updatedvertex = vertex;
 						if (verticies.empty())
 							updatedvertex = _boneMatricies[idx] * updatedvertex;
-						updatednormal = _boneMatricies[idx] * normal;
+						updatednormal = _boneMatricies[idx].mult3x3(normal);
 					} else {
 						idx -= _bones.size();
 						for (uint w = 0; w < _weightElements[idx].size(); w++) {




More information about the Scummvm-git-logs mailing list