refactor(dx8): Replace unsafe Matrix4x4/D3DMATRIX casts with proper transpose conversion #1852
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bobtista
force-pushed
the
bobtista/fix-matrix4-d3d-transpose
branch
from
518ebd4 to
fa2fff2
Compare
xezon
reviewed
Nov 13, 2025
Generals/Code/GameEngineDevice/Source/W3DDevice/GameClient/Water/W3DWater.cpp
Outdated
Show resolved
Hide resolved
bobtista
force-pushed
the
bobtista/fix-matrix4-d3d-transpose
branch
2 times, most recently
from
9a7854f to
de78d22
Compare
bobtista
changed the title
bobtista
force-pushed
the
bobtista/fix-matrix4-d3d-transpose
branch
4 times, most recently
from
780bdee to
93986cd
Compare
…ranspose conversion
bobtista
force-pushed
the
bobtista/fix-matrix4-d3d-transpose
branch
from
93986cd to
2a0b73e
Compare
xezon
reviewed
Dec 9, 2025
xezon
left a comment
xezon
left a comment
There was a problem hiding this comment.
Goes into the right direction but it still looks like there are quirks.
Did you test the code paths? Is the math still correct?
| DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView); | ||
| D3DXMatrixInverse(&inv, &det, (D3DXMATRIX*)&curView); | ||
| D3DXMATRIX d3dCurView = Build_D3DXMATRIX(curView); | ||
| D3DXMatrixInverse(&inv, &det, &d3dCurView); |
There was a problem hiding this comment.
Was this inverse meant to be a transpose or does it really want to do the inverse here on a D3DXMATRIX that is in DX coordinates?
| DX8CALL(GetTransform(transform,(D3DMATRIX*)&m)); | ||
| D3DXMATRIX d3dMat; | ||
| DX8CALL(GetTransform(transform,&d3dMat)); | ||
| Build_Matrix4(m, (D3DMATRIX&)d3dMat); |
| float det; | ||
|
|
||
| Matrix4x4 curView; | ||
| DX8Wrapper::_Get_DX8_Transform(D3DTS_VIEW, curView); |
There was a problem hiding this comment.
Maybe add another function to get D3DXMATRIX here instead of doing this conversion?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Replaces all C-style casts between
Matrix4x4/Matrix3DandD3DXMATRIX/D3DMATRIXwith proper conversion functions that handle the row-major/column-major transpose.Before:
After: