mirror-games/dca3-game
1
0
Fork 0
mirror of https://gitlab.com/skmp/dca3-game.git synced 2025-09-02 11:13:23 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

miami: fix depth for radar, other 2d sprites

Browse Source
This commit is contained in:
Stefanos Kornilios Mitsis Poiitidis
2025-03-11 19:35:56 +02:00
parent 162de2aab4
commit c61dc10813
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/miami/core/Radar.cpp
View File

@@ -759,6 +759,14 @@ void CRadar::DrawRadarMask()
TransformRadarPointToScreenSpace(out[i], in); TransformRadarPointToScreenSpace(out[i], in);
} }
CSprite2d::SetMaskVertices(4, (float *)out); CSprite2d::SetMaskVertices(4, (float *)out);
// avoid Z fighting with the map by nudging the clear area bellow the map depth
{
auto vtx = CSprite2d::GetVertices();
for (int i = 0; i < 4; i++) {
vtx[i].w *= 2;
}
}
RwIm2DRenderPrimitive(rwPRIMTYPETRIFAN, CSprite2d::GetVertices(), 4); RwIm2DRenderPrimitive(rwPRIMTYPETRIFAN, CSprite2d::GetVertices(), 4);
// Draw the shape we want to mask out from the radar in four segments // Draw the shape we want to mask out from the radar in four segments

17
src/miami/renderer/Sprite2d.cpp
View File

@@ -129,6 +129,9 @@ CSprite2d::SetVertices(const CRect &r, const CRGBA &c0, const CRGBA &c1, const C
{ {
float offset = 1.0f/1024.0f; float offset = 1.0f/1024.0f;
// Workaround for PVR Z-Equality not being exact
RecipNearClip *= 1.1f;
// This is what we draw: // This is what we draw:
// 0---1 // 0---1
// | / | // | / |
@@ -174,6 +177,9 @@ void
CSprite2d::SetVertices(const CRect &r, const CRGBA &c0, const CRGBA &c1, const CRGBA &c2, const CRGBA &c3, CSprite2d::SetVertices(const CRect &r, const CRGBA &c0, const CRGBA &c1, const CRGBA &c2, const CRGBA &c3,
float u0, float v0, float u1, float v1, float u3, float v3, float u2, float v2) float u0, float v0, float u1, float v1, float u3, float v3, float u2, float v2)
{ {
// Workaround for PVR Z-Equality not being exact
RecipNearClip *= 1.1f;
// This is what we draw: // This is what we draw:
// 0---1 // 0---1
// | / | // | / |
@@ -219,6 +225,11 @@ void
CSprite2d::SetVertices(float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4, CSprite2d::SetVertices(float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4,
const CRGBA &c0, const CRGBA &c1, const CRGBA &c2, const CRGBA &c3, DrawType dt) const CRGBA &c0, const CRGBA &c1, const CRGBA &c2, const CRGBA &c3, DrawType dt)
{ {
// Workaround for PVR Z-Equality not being exact
if (dt == DRAW_NEAR) {
RecipNearClip *= 1.1f;
}
float screenZ = dt == DRAW_FAR ? FarScreenZ : NearScreenZ; float screenZ = dt == DRAW_FAR ? FarScreenZ : NearScreenZ;
float camZ = dt == DRAW_FAR ? FarCamZ : NearCamZ; float camZ = dt == DRAW_FAR ? FarCamZ : NearCamZ;
float recipClip = dt == DRAW_FAR ? RecipFarClip : RecipNearClip; float recipClip = dt == DRAW_FAR ? RecipFarClip : RecipNearClip;
@@ -263,6 +274,9 @@ CSprite2d::SetVertices(float x1, float y1, float x2, float y2, float x3, float y
void void
CSprite2d::SetVertices(int n, float *positions, float *uvs, const CRGBA &col) CSprite2d::SetVertices(int n, float *positions, float *uvs, const CRGBA &col)
{ {
// Workaround for PVR Z-Equality not being exact
RecipNearClip *= 1.1f;
int i; int i;
for(i = 0; i < n; i++){ for(i = 0; i < n; i++){
@@ -300,6 +314,9 @@ void
CSprite2d::SetVertices(RwIm2DVertex *verts, const CRect &r, const CRGBA &c0, const CRGBA &c1, const CRGBA &c2, const CRGBA &c3, CSprite2d::SetVertices(RwIm2DVertex *verts, const CRect &r, const CRGBA &c0, const CRGBA &c1, const CRGBA &c2, const CRGBA &c3,
float u0, float v0, float u1, float v1, float u3, float v3, float u2, float v2) float u0, float v0, float u1, float v1, float u3, float v3, float u2, float v2)
{ {
// Workaround for PVR Z-Equality not being exact
RecipNearClip *= 1.1f;
RwIm2DVertexSetScreenX(&verts[0], r.left); RwIm2DVertexSetScreenX(&verts[0], r.left);
RwIm2DVertexSetScreenY(&verts[0], r.top); RwIm2DVertexSetScreenY(&verts[0], r.top);
RwIm2DVertexSetScreenZ(&verts[0], NearScreenZ); RwIm2DVertexSetScreenZ(&verts[0], NearScreenZ);