TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-24 14:44:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1435 from Azaezel/alpha41/rotationRot

Browse source 
fix (?) rotation
This commit is contained in:
Brian Roberts 2025-04-03 12:05:56 -05:00 committed by GitHub
parent 67a1805061 0e78312e95
commit 68f44c1596
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Engine/source/materials/processedShaderMaterial.cpp
View file

@ -942,20 +942,18 @@ void ProcessedShaderMaterial::_setTextureTransforms(const U32 pass)
? waveOffset * M_2PI
: mMaterial->mRotPos[pass];
MatrixF rotationMat(EulerF(0.0f, 0.0f, rotationAngle));
Point3F pivotPoint(
mMaterial->mRotPivotOffset[pass].x,
mMaterial->mRotPivotOffset[pass].y,
0.0f);
MatrixF finalRotationMat(true);
finalRotationMat.setColumn(3, pivotPoint);
finalRotationMat.mul(rotationMat);
finalRotationMat.setColumn(3, -pivotPoint);
MatrixF rotationMat = MatrixF(EulerF(0.0, 0.0, rotationAngle), Point3F(0.5, 0.5, 0.0));
MatrixF test(true);
test.setColumn(3, pivotPoint);
rotationMat.mul(test);
rotationMat.displace(texMat.getPosition());
// Apply final rotation matrix
texMat.mul(finalRotationMat);
texMat = rotationMat;
}
// --- Scale Animation ---