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

Rewrite ObjCoordinates(const uObjScaleBg * _pObjScaleBg)

Browse Source 
gSPBgRect1Cyc() and gSPBgRectCopy() use ObjCoordinates(const
uObjScaleBg * _pObjScaleBg).

This modification fixes bad texture quality in following games:
-Bakuretsu Muteki Bangaioh
-Nintama Randou
-Starcraft
-Command & Conquer
-SD Hiryuu noKen Densetsu

https://github.com/gonetz/GLideN64/pull/1878
This commit is contained in:
gizmo98 2018-08-21 19:47:22 +02:00 committed by Sergey Lipskiy
parent fef718b8d2
commit d4cce52c60
1 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/gSP.cpp
View File

@ -2053,10 +2053,16 @@ struct ObjCoordinates
const f32 imageY = gSP.bgImage.imageY;
f32 scaleW = gSP.bgImage.scaleW;
f32 scaleH = gSP.bgImage.scaleH;
// gSPBgRectCopy() does not support scaleW and scaleH
if (gDP.otherMode.cycleType == G_CYC_COPY) {
scaleW = 1.0f;
scaleH = 1.0f;
}
f32 frameW = _FIXED2FLOAT(_pObjScaleBg->frameW, 2);
f32 frameH = _FIXED2FLOAT(_pObjScaleBg->frameH, 2);
f32 imageW = (f32)(_pObjScaleBg->imageW>>2);
f32 imageW = (f32)(_pObjScaleBg->imageW >> 2);
f32 imageH = (f32)(_pObjScaleBg->imageH >> 2);
// const f32 imageW = (f32)gSP.bgImage.width;
// const f32 imageH = (f32)gSP.bgImage.height;
@ -2072,23 +2078,23 @@ struct ObjCoordinates
scaleH = 1.0f;
}
ulx = frameX;
uly = frameY;
uls = imageX;
ult = imageY;
lrs = uls + min(imageW, frameW * scaleW);
lrt = ult + min(imageH, frameH * scaleH);
lrs = uls + min(imageW, frameW * scaleW) - 1;
lrt = ult + min(imageH, frameH * scaleH) - 1;
// G_CYC_COPY does not allow texture filtering
// G_CYC_COPY (gSPBgRectCopy()) does not allow texture filtering
if (gDP.otherMode.cycleType != G_CYC_COPY) {
// Correct texture coordinates -0.5f if G_OBJRM_BILERP
// Correct texture coordinates -0.5f and +0.5 if G_OBJRM_BILERP
// bilinear interpolation is set
if ((gSP.objRendermode&G_OBJRM_BILERP) != 0) {
if ((gSP.objRendermode&G_OBJRM_BILERP) != 0 &&
((gDP.otherMode.textureFilter == G_TF_BILERP) || // Kirby Crystal Shards
(gDP.otherMode.textureFilter == G_TF_POINT && (gSP.objRendermode&G_OBJRM_NOTXCLAMP) != 0)) // Worms Armageddon
) {
uls -= 0.5f;
ult -= 0.5f;
lrs -= 0.5f;
lrt -= 0.5f;
lrs += 0.5f;
lrt += 0.5f;
}
// SHRINKSIZE_1 adds a 0.5f perimeter around the image
// upper left texture coords += 0.5f; lower left texture coords -= 0.5f
@ -2107,17 +2113,18 @@ struct ObjCoordinates
}
}
// limit fraction 2 bit precision --> only allows 1/4 texel movement
// see G_OBJRM_BILERP description
uls = floorf( uls * 4.0f ) * 0.25f;
ult = floorf( ult * 4.0f ) * 0.25f;
lrs = floorf( lrs * 4.0f ) * 0.25f;
lrt = floorf( lrt * 4.0f ) * 0.25f;
// Calculate lrx and lry width new ST values
ulx = frameX;
uly = frameY;
lrx = ulx + ( lrs - uls ) / scaleW;
lry = uly + ( lrt - ult ) / scaleH;
if ((gSP.objRendermode&G_OBJRM_BILERP) == 0) {
lrx += 1.0f / scaleW;
lry += 1.0f / scaleH;
}
// gSPBgRect1Cyc() and gSPBgRectCopy() do only support
// imageFlip in horizontal direction
if ((_pObjScaleBg->imageFlip & 0x01) != 0) {
std::swap( ulx, lrx);
}
@ -2393,6 +2400,8 @@ void gSPBgRectCopy( u32 _bg )
)
_copyDepthBuffer();
gDP.otherMode.cycleType = G_CYC_COPY;
gDP.changed |= CHANGED_CYCLETYPE;
gSPTexture( 1.0f, 1.0f, 0, 0, TRUE );
ObjCoordinates objCoords(objBg);