MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-04 10:03:36 +00:00
Code Issues Projects Releases Wiki Activity

Fix "division by zero" issue in gSPObjSprite.

Browse Source 
Fixed #2192 Unknown memory action on Magical Tetris Challenge
This commit is contained in:
Sergey Lipskiy 2020-04-11 14:57:50 +07:00
parent fbd1ad1a5a
commit 9eddde6e0f
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/uCodes/S2DEX.cpp
View File

@ -730,8 +730,8 @@ static
void gSPObjSprite(u32 _sp) void gSPObjSprite(u32 _sp)
{ {
const u32 address = RSP_SegmentToPhysical(_sp); const u32 address = RSP_SegmentToPhysical(_sp);
uObjSprite *objSprite = (uObjSprite*)&RDRAM[address]; uObjSprite *pObjSprite = (uObjSprite*)&RDRAM[address];
gSPSetSpriteTile(objSprite); gSPSetSpriteTile(pObjSprite);
/* Fixed point coordinates calculation. Decoded by olivieryuyu */ /* Fixed point coordinates calculation. Decoded by olivieryuyu */
// X1 = AND (X + B3) by B0 + ((objX + A3) * A) >> 16 + ((objY + A3) * B) >> 16 // X1 = AND (X + B3) by B0 + ((objX + A3) * A) >> 16 + ((objY + A3) * B) >> 16
@ -745,10 +745,12 @@ void gSPObjSprite(u32 _sp)
const s16 y0 = (gs_s2dexversion == eVer1_3) ? const s16 y0 = (gs_s2dexversion == eVer1_3) ?
((objMtx.Y + CC.B5) & CC.B0) + CC.B7 : ((objMtx.Y + CC.B5) & CC.B0) + CC.B7 :
((objMtx.Y + CC.B3) & CC.B0); ((objMtx.Y + CC.B3) & CC.B0);
const s16 ulx = objSprite->objX + CC.A3; const s16 ulx = pObjSprite->objX + CC.A3;
const s16 uly = objSprite->objY + CC.A3; const s16 uly = pObjSprite->objY + CC.A3;
const s16 lrx = ((((u64(objSprite->imageW) - CC.A1) << 8) * (0x80007FFFU / u32(objSprite->scaleW))) >> 32) + ulx; const u32 objSpriteScaleW = std::max(u32(pObjSprite->scaleW), 1U);
const s16 lry = ((((u64(objSprite->imageH) - CC.A1) << 8) * (0x80007FFFU / u32(objSprite->scaleH))) >> 32) + uly; const u32 objSpriteScaleH = std::max(u32(pObjSprite->scaleH), 1U);
const s16 lrx = ((((u64(pObjSprite->imageW) - CC.A1) << 8) * (0x80007FFFU / objSpriteScaleW)) >> 32) + ulx;
const s16 lry = ((((u64(pObjSprite->imageH) - CC.A1) << 8) * (0x80007FFFU / objSpriteScaleH)) >> 32) + uly;
auto calcX = [&](s16 _x, s16 _y) -> f32 auto calcX = [&](s16 _x, s16 _y) -> f32
{ {
@ -763,14 +765,14 @@ void gSPObjSprite(u32 _sp)
}; };
f32 uls = 0.0f; f32 uls = 0.0f;
f32 lrs = _FIXED2FLOAT(objSprite->imageW, 5) - 1.0f; f32 lrs = _FIXED2FLOAT(pObjSprite->imageW, 5) - 1.0f;
f32 ult = 0.0f; f32 ult = 0.0f;
f32 lrt = _FIXED2FLOAT(objSprite->imageH, 5) - 1.0f; f32 lrt = _FIXED2FLOAT(pObjSprite->imageH, 5) - 1.0f;
if (objSprite->imageFlags & G_BG_FLAG_FLIPS) if (pObjSprite->imageFlags & G_BG_FLAG_FLIPS)
std::swap(uls, lrs); std::swap(uls, lrs);
if (objSprite->imageFlags & G_BG_FLAG_FLIPT) if (pObjSprite->imageFlags & G_BG_FLAG_FLIPT)
std::swap(ult, lrt); std::swap(ult, lrt);
const float z = (gDP.otherMode.depthSource == G_ZS_PRIM) ? gDP.primDepth.z : gSP.viewport.nearz; const float z = (gDP.otherMode.depthSource == G_ZS_PRIM) ? gDP.primDepth.z : gSP.viewport.nearz;