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

Code refactor: rename CLIP_Z to CLIP_W

Browse Source
This commit is contained in:
Sergey Lipskiy 2016-06-06 21:35:26 +06:00
parent 1a114dd560
commit c816f7deeb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/gSP.cpp
View File

@ -317,7 +317,7 @@ void gSPClipVertex4(u32 v)
if (vtx.x < -vtx.w) vtx.clip |= CLIP_NEGX; if (vtx.x < -vtx.w) vtx.clip |= CLIP_NEGX;
if (vtx.y > +vtx.w) vtx.clip |= CLIP_POSY; if (vtx.y > +vtx.w) vtx.clip |= CLIP_POSY;
if (vtx.y < -vtx.w) vtx.clip |= CLIP_NEGY; if (vtx.y < -vtx.w) vtx.clip |= CLIP_NEGY;
if (vtx.w < 0.01f) vtx.clip |= CLIP_Z; if (vtx.w < 0.01f) vtx.clip |= CLIP_W;
} }
} }
@ -547,7 +547,7 @@ void gSPClipVertex(u32 v)
if (vtx.x < -vtx.w) vtx.clip |= CLIP_NEGX; if (vtx.x < -vtx.w) vtx.clip |= CLIP_NEGX;
if (vtx.y > +vtx.w) vtx.clip |= CLIP_POSY; if (vtx.y > +vtx.w) vtx.clip |= CLIP_POSY;
if (vtx.y < -vtx.w) vtx.clip |= CLIP_NEGY; if (vtx.y < -vtx.w) vtx.clip |= CLIP_NEGY;
if (vtx.w < 0.01f) vtx.clip |= CLIP_Z; if (vtx.w < 0.01f) vtx.clip |= CLIP_W;
} }
void gSPProcessVertex(u32 v) void gSPProcessVertex(u32 v)
@ -1548,7 +1548,7 @@ void gSPModifyVertex( u32 _vtx, u32 _where, u32 _val )
{ {
f32 scrZ = _FIXED2FLOAT((s16)_SHIFTR(_val, 16, 16), 15); f32 scrZ = _FIXED2FLOAT((s16)_SHIFTR(_val, 16, 16), 15);
vtx0.z = (scrZ - gSP.viewport.vtrans[2]) / (gSP.viewport.vscale[2]); vtx0.z = (scrZ - gSP.viewport.vtrans[2]) / (gSP.viewport.vscale[2]);
vtx0.clip &= ~CLIP_Z; vtx0.clip &= ~CLIP_W;
vtx0.modify |= MODIFY_Z; vtx0.modify |= MODIFY_Z;
} }
break; break;

4
src/gSP.h
View File

@ -21,9 +21,9 @@
#define CLIP_NEGY 0x04 #define CLIP_NEGY 0x04
#define CLIP_POSY 0x08 #define CLIP_POSY 0x08
#define CLIP_Z 0x10 #define CLIP_W 0x10
#define CLIP_ALL 0x1F // CLIP_NEGX|CLIP_POSX|CLIP_NEGY|CLIP_POSY|CLIP_Z #define CLIP_ALL 0x1F // CLIP_NEGX|CLIP_POSX|CLIP_NEGY|CLIP_POSY|CLIP_W
#define MODIFY_XY 0x000000FF #define MODIFY_XY 0x000000FF
#define MODIFY_Z 0x0000FF00 #define MODIFY_Z 0x0000FF00