ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

win32: fix matrixview (which was broken during fixedpoint conversions)

This commit is contained in:
zeromus 2010-07-17 10:56:58 +00:00
parent fb7b9a2104
commit 5e8fa718c6
3 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desmume/src/gfx3d.cpp
View File

@ -2266,6 +2266,12 @@ void gfx3d_glGetMatrix(unsigned int m_mode, int index, float* dest)
//} //}
//MatrixCopy(dest, MatrixStackGetPos(&mtxStack[m_mode], index)); //MatrixCopy(dest, MatrixStackGetPos(&mtxStack[m_mode], index));
s32* src;
if(index==-1)
src = mtxCurrent[m_mode];
else src=MatrixStackGetPos(&mtxStack[m_mode],index);
for(int i=0;i<16;i++)
dest[i] = src[i]/4096.0f;
} }
void gfx3d_glGetLightDirection(unsigned int index, unsigned int* dest) void gfx3d_glGetLightDirection(unsigned int index, unsigned int* dest)

8
desmume/src/windows/matrixView.cpp
View File

@ -62,7 +62,7 @@ void MatrixView_OnPaintPositionMatrix(HWND hwnd)
stackIndex = SendMessage(hStackCombo, CB_GETCURSEL, 0, 0) - 1; stackIndex = SendMessage(hStackCombo, CB_GETCURSEL, 0, 0) - 1;
//gfx3d_glGetMatrix(1, stackIndex, matrix); gfx3d_glGetMatrix(1, stackIndex, matrix);
MatrixView_SetMatrix(hwnd, idcGroup, matrix); MatrixView_SetMatrix(hwnd, idcGroup, matrix);
} }
@ -85,7 +85,7 @@ void MatrixView_OnPaintDirectionMatrix(HWND hwnd)
stackIndex = SendMessage(hStackCombo, CB_GETCURSEL, 0, 0) - 1; stackIndex = SendMessage(hStackCombo, CB_GETCURSEL, 0, 0) - 1;
//gfx3d_glGetMatrix(2, stackIndex, matrix); gfx3d_glGetMatrix(2, stackIndex, matrix);
MatrixView_SetMatrix(hwnd, idcGroup, matrix); MatrixView_SetMatrix(hwnd, idcGroup, matrix);
} }
@ -104,7 +104,7 @@ void MatrixView_OnPaintProjectionMatrix(HWND hwnd)
float mat[16]; float mat[16];
//gfx3d_glGetMatrix(0, -1, mat); gfx3d_glGetMatrix(0, -1, mat);
MatrixView_SetMatrix(hwnd, idcGroup, mat); MatrixView_SetMatrix(hwnd, idcGroup, mat);
} }
@ -123,7 +123,7 @@ void MatrixView_OnPaintTextureMatrix(HWND hwnd)
float mat[16]; float mat[16];
//gfx3d_glGetMatrix(3, -1, mat); gfx3d_glGetMatrix(3, -1, mat);
MatrixView_SetMatrix(hwnd, idcGroup, mat); MatrixView_SetMatrix(hwnd, idcGroup, mat);
} }