This commit is contained in:
parent
cd80039a6c
commit
efafaba4ba
28 changed files with 246 additions and 188 deletions
|
@ -42,7 +42,6 @@ CLayerTile3d::~CLayerTile3d()
|
|||
{
|
||||
}
|
||||
|
||||
|
||||
/*****************************************************************************/
|
||||
/*****************************************************************************/
|
||||
/*****************************************************************************/
|
||||
|
@ -62,13 +61,14 @@ void CLayerTile3d::shutdown()
|
|||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
||||
void CLayerTile3d::think(DVECTOR &MapPos)
|
||||
{
|
||||
MapXY.vx=MapPos.vx>>4;
|
||||
MapXY.vy=MapPos.vy>>4;
|
||||
|
||||
// MapXY.vx-=SCREEN_TILE_ADJ_LEFT;
|
||||
// MapXY.vy-=SCREEN_TILE_ADJ_UP;
|
||||
MapXY.vx-=SCREEN_TILE_ADJ_LEFT;
|
||||
MapXY.vy-=SCREEN_TILE_ADJ_UP;
|
||||
|
||||
ShiftX=(MapPos.vx & 15);
|
||||
ShiftY=(MapPos.vy & 15);
|
||||
|
@ -85,13 +85,13 @@ void CLayerTile3d::think(DVECTOR &MapPos)
|
|||
MapXY.vy=0;
|
||||
}
|
||||
|
||||
if (MapXY.vx+SCREEN_TILE_WIDTH3D<=MapWidth)
|
||||
RenderW=SCREEN_TILE_WIDTH3D;
|
||||
if (MapXY.vx+SCREEN_TILE3D_WIDTH<=MapWidth)
|
||||
RenderW=SCREEN_TILE3D_WIDTH;
|
||||
else
|
||||
RenderW=MapWidth-MapXY.vx;
|
||||
|
||||
if (MapXY.vy+SCREEN_TILE_HEIGHT3D<=MapHeight)
|
||||
RenderH=SCREEN_TILE_HEIGHT3D;
|
||||
if (MapXY.vy+SCREEN_TILE3D_HEIGHT<=MapHeight)
|
||||
RenderH=SCREEN_TILE3D_HEIGHT;
|
||||
else
|
||||
RenderH=MapHeight-MapXY.vy;
|
||||
}
|
||||
|
@ -99,12 +99,8 @@ void CLayerTile3d::think(DVECTOR &MapPos)
|
|||
/*****************************************************************************/
|
||||
/*****************************************************************************/
|
||||
/*****************************************************************************/
|
||||
#if 1
|
||||
|
||||
void CLayerTile3d::render()
|
||||
{
|
||||
const int XOfs=-(BLOCK_MULT*15)-(SCREEN_TILE_ADJ_LEFT*BLOCK_MULT)+24;
|
||||
const int YOfs=-(BLOCK_MULT*7)-(SCREEN_TILE_ADJ_UP*BLOCK_MULT)+32;
|
||||
|
||||
sTileMapElem *MapPtr=GetMapPos();
|
||||
u8 *PrimPtr=GetPrimPtr();
|
||||
|
@ -116,8 +112,8 @@ sOT *ThisOT;
|
|||
VECTOR BlkPos;
|
||||
|
||||
// Setup Trans Matrix
|
||||
BlkPos.vx=XOfs-(ShiftX);
|
||||
BlkPos.vy=YOfs-(ShiftY);
|
||||
BlkPos.vx=RENDER_X_OFS-(ShiftX);
|
||||
BlkPos.vy=RENDER_Y_OFS-(ShiftY);
|
||||
|
||||
for (int Y=0; Y<RenderH; Y++)
|
||||
{
|
||||
|
@ -178,86 +174,3 @@ int QCount=0;
|
|||
#endif
|
||||
|
||||
}
|
||||
|
||||
#else
|
||||
void CLayerTile3d::render()
|
||||
{
|
||||
/*
|
||||
const int XOfs=-(BLOCK_MULT*15)-(SCREEN_TILE_ADJ_LEFT*BLOCK_MULT);
|
||||
const int YOfs=-(BLOCK_MULT*7)-(SCREEN_TILE_ADJ_UP*BLOCK_MULT);
|
||||
|
||||
sTileMapElem *MapPtr=GetMapPos();
|
||||
u8 *PrimPtr=GetPrimPtr();
|
||||
POLY_FT3 *TPrimPtr=(POLY_FT3*)PrimPtr;
|
||||
VECTOR BlkPos;
|
||||
//sOT *ThisOT=OtPtr+LayerOT;
|
||||
sVtx *P0,*P1,*P2;
|
||||
u32 T0,T1,T2;
|
||||
s32 ClipZ;
|
||||
|
||||
|
||||
// Setup Trans Matrix
|
||||
BlkPos.vx=XOfs-((MapXY.vx*BLOCK_MULT)+ShiftX);
|
||||
BlkPos.vy=YOfs-((MapXY.vy*BLOCK_MULT)+ShiftY);
|
||||
BlkPos.vx+=RenderOfs.vx;
|
||||
BlkPos.vy+=RenderOfs.vy;
|
||||
CMX_SetTransMtxXY(&BlkPos);
|
||||
|
||||
for (int Y=0; Y<RenderH; Y++)
|
||||
{
|
||||
// Get strip render size
|
||||
int TriStart=MapPtr[0];
|
||||
int TriEnd=MapPtr[RenderW];
|
||||
int TriCount=TriEnd-TriStart;
|
||||
|
||||
sTri *TList=&TriList[TriStart];
|
||||
while (TriCount>0)
|
||||
{
|
||||
P0=&VtxList[TList->P0]; P1=&VtxList[TList->P1]; P2=&VtxList[TList->P2];
|
||||
gte_ldv3(P0,P1,P2);
|
||||
setPolyFT3(TPrimPtr);
|
||||
setShadeTex(TPrimPtr,1);
|
||||
setlen(TPrimPtr, GPU_PolyFT3Tag);
|
||||
gte_rtpt_b();
|
||||
|
||||
T0=*(u32*)&TList->uv0; // Get UV0 & TPage
|
||||
T1=*(u32*)&TList->uv1; // Get UV1 & Clut
|
||||
T2=*(u16*)&TList->uv2; // Get UV2
|
||||
*(u32*)&TPrimPtr->u0=T0; // Set UV0
|
||||
*(u32*)&TPrimPtr->u1=T1; // Set UV1
|
||||
*(u16*)&TPrimPtr->u2=T2; // Set UV2
|
||||
|
||||
int ZP=P0->vz>>5;
|
||||
if (ZP<-4) ZP=-4;
|
||||
if (ZP>8) ZP=8;
|
||||
sOT *ThisOT=OtPtr+(LayerOT+ZP);
|
||||
|
||||
TList++;
|
||||
gte_nclip_b();
|
||||
gte_stsxy3_ft3(TPrimPtr);
|
||||
gte_stopz(&ClipZ);
|
||||
if (ClipZ<=0)
|
||||
{
|
||||
addPrimNoCheck(ThisOT,TPrimPtr);
|
||||
// addPrim(ThisOT,TPrimPtr);
|
||||
TPrimPtr++;
|
||||
}
|
||||
|
||||
TriCount--;
|
||||
}
|
||||
MapPtr+=MapWidth;
|
||||
}
|
||||
|
||||
int PolyCount=((u8*)TPrimPtr-PrimPtr)/sizeof(POLY_FT3);
|
||||
|
||||
SetPrimPtr((u8*)TPrimPtr);
|
||||
|
||||
#if defined(_SHOW_POLYZ_)
|
||||
char Txt[256];
|
||||
sprintf(Txt,"Poly Count=%i",PolyCount);
|
||||
Font->print( 32, 32, Txt);
|
||||
#endif
|
||||
*/
|
||||
}
|
||||
|
||||
#endif
|
Loading…
Add table
Add a link
Reference in a new issue