diff --git a/source/level/layerback.cpp b/source/level/layerback.cpp index 458bb5fee..393ee135c 100644 --- a/source/level/layerback.cpp +++ b/source/level/layerback.cpp @@ -74,9 +74,10 @@ void CLayerBack::think(DVECTOR &MapPos) /*****************************************************************************/ const int BM=16; const int BB=16; - +int RB=1; void CLayerBack::render() { + if (!RB) return; sOT *ThisOT=OtPtr+(MAX_OT-1); int i,ThisY=-YOfs; // Render Back Sprites diff --git a/source/level/layertile.cpp b/source/level/layertile.cpp index 3d4c68fbc..9e5368d88 100644 --- a/source/level/layertile.cpp +++ b/source/level/layertile.cpp @@ -35,7 +35,13 @@ CLayerTile::CLayerTile(sLevelHdr *LevelHdr,sLayerHdr *Hdr) Map=(sTileMapElem*)MakePtr(Hdr,sizeof(sLayerHdr)); PrimBankID=0; + PrimBank[0]=0; PrimBank[1]=0; + if (Hdr->SubType!=LAYER_TILE_TYPE_MID) return; +//----------------- +// anything below here is Mid layer only - how did I miss something like this, 104k WASTED!! + +// Create Mid Tile Prim Banks for (int b=0; b<2; b++) { PrimBank[b]=(TSPRT*)MemAlloc(PrimMemSize,"Mid Polyz"); @@ -49,6 +55,17 @@ CLayerTile::CLayerTile(sLevelHdr *LevelHdr,sLayerHdr *Hdr) PrimPtr++; } } + +// precalc Mid tile offsets +sTileMapElem *MapPtr=Map; + for (int Y=0; YTile*=sizeof(sElem2d); + MapPtr++; + } + } } /*****************************************************************************/ @@ -56,7 +73,7 @@ CLayerTile::~CLayerTile() { for (int b=0; b<2; b++) { - MemFree(PrimBank[b]); + if (PrimBank[b]) MemFree(PrimBank[b]); } } @@ -121,6 +138,8 @@ sTileMapElem *MapPtr=Map+GetMapOfs(); s16 TileX,TileY; sOT *ThisOT=OtPtr+LayerOT; TSPRT *PrimPtr=PrimBank[PrimBankID]; +u8 *TileBank=(u8*)ElemBank2d; +u32 T0,T1; PrimBankID^=1; @@ -139,11 +158,13 @@ TSPRT *PrimPtr=PrimBank[PrimBankID]; int ThisTile=MapRow->Tile; if (ThisTile) { - sElem2d *Tile=&ElemBank2d[ThisTile]; + sElem2d *Tile=(sElem2d*)(TileBank+ThisTile); PrimPtr->x0=TileX; PrimPtr->y0=TileY; - setTSprtTPage(PrimPtr,Tile->TPage); - *(u32*)&PrimPtr->u0=*(u32*)&Tile->u0; // copy uv AND clut + T0=Tile->TPage; + T1=*(u32*)&Tile->u0; + PrimPtr->t_code=T0; // pregen'd setTSprtTPage(PrimPtr,Tile->TPage); + *(u32*)&PrimPtr->u0=T1; // copy uv AND clut addPrim(ThisOT,PrimPtr); PrimPtr++; } diff --git a/source/level/layertile3d.cpp b/source/level/layertile3d.cpp index 4b040c2a4..330ed4ca9 100644 --- a/source/level/layertile3d.cpp +++ b/source/level/layertile3d.cpp @@ -38,6 +38,7 @@ static const int DeltaTableSizeX=SCREEN_TILE3D_WIDTH+1; static const int DeltaTableSizeY=SCREEN_TILE3D_HEIGHT+1; /*****************************************************************************/ +// now uses a single delta table for front and back (interleaved) to reduce register use // 0 LUF // 1 RUF // 2 LDF @@ -134,10 +135,8 @@ void CLayerTile3d::shutdown() #endif for (int i=0; i<16; i++) { - MemFree(FTableX[i]); - MemFree(FTableY[i]); - MemFree(BTableX[i]); - MemFree(BTableY[i]); + MemFree(DeltaTableX[i]); + MemFree(DeltaTableY[i]); } } @@ -147,17 +146,14 @@ void CLayerTile3d::CalcDelta() { VECTOR BlkPos; SVECTOR Pnt={-BLOCK_SIZE/2,-BLOCK_SIZE/2,-BLOCK_SIZE*4}; -s16 *FTab,*BTab; +s16 *Tab; CGameScene::setCameraMtx(); for (int i=0; i<16; i++) { - FTab=(s16*)MemAlloc(DeltaTableSizeX*sizeof(s16),"FTableXTable"); - BTab=(s16*)MemAlloc(DeltaTableSizeX*sizeof(s16),"BTableXTable"); - FTableX[i]=FTab; - BTableX[i]=BTab; - ASSERT(FTab); - ASSERT(BTab); + Tab=(s16*)MemAlloc(DeltaTableSizeX*2*sizeof(s16),"DeltaTableXTable"); + DeltaTableX[i]=Tab; + ASSERT(Tab); BlkPos.vx=RENDER_X_OFS-i; BlkPos.vy=RENDER_Y_OFS; for (int x=0; xMtx); @@ -351,13 +342,12 @@ s16 TCount=0,QCount=0; gte_ldv3(V0,V1,V2); gte_stsxy3c(OutPtr); // read XY back } - } - s16 FL=DeltaFX[0]+DeltaFOfs.vx; - s16 FR=DeltaFX[1]+DeltaFOfs.vx; - s16 FU=DeltaFY[0]+DeltaFOfs.vy; - s16 FD=DeltaFY[1]+DeltaFOfs.vy; + s16 FL=DeltaTabX[(0*2)+0]+DeltaFOfs.vx; + s16 FR=DeltaTabX[(1*2)+0]+DeltaFOfs.vx; + s16 FU=DeltaTabY[(0*2)+0]+DeltaFOfs.vy; + s16 FD=DeltaTabY[(1*2)+0]+DeltaFOfs.vy; DP0=FTab->DeltaTab[0]; DP1=FTab->DeltaTab[1]; DP2=FTab->DeltaTab[2]; @@ -371,10 +361,10 @@ s16 TCount=0,QCount=0; DP3->vx=FR; DP3->vy=FD; - s16 BL=DeltaBX[0]+DeltaBOfs.vx; - s16 BR=DeltaBX[1]+DeltaBOfs.vx; - s16 BU=DeltaBY[0]+DeltaBOfs.vy; - s16 BD=DeltaBY[1]+DeltaBOfs.vy; + s16 BL=DeltaTabX[(0*2)+1]+DeltaBOfs.vx; + s16 BR=DeltaTabX[(1*2)+1]+DeltaBOfs.vx; + s16 BU=DeltaTabY[(0*2)+1]+DeltaBOfs.vy; + s16 BD=DeltaTabY[(1*2)+1]+DeltaBOfs.vy; DP0=FTab->DeltaTab[4]; DP1=FTab->DeltaTab[5]; DP2=FTab->DeltaTab[6]; @@ -418,7 +408,6 @@ s16 TCount=0,QCount=0; *(u32*)&ThisPrim->u0=T0; // Set UV0 *(u32*)&ThisPrim->u1=T1; // Set UV1 *(u32*)&ThisPrim->u2=T2; // Set UV2 - addPrim(ThisOT,ThisPrim); { // lighting T0=*(u32*)&RGB[TList->C0]; T1=*(u32*)&RGB[TList->C1]; @@ -431,7 +420,7 @@ s16 TCount=0,QCount=0; if (ShowPolyz) {setRGB0(ThisPrim,127,0,0); setRGB1(ThisPrim,255,0,0); setRGB2(ThisPrim,255,0,0); TCount++;} #endif ThisPrim->code=TList->PolyCode; - + addPrim(ThisOT,ThisPrim); PrimPtr+=sizeof(POLY_GT3); } TList++; @@ -446,13 +435,13 @@ s16 TCount=0,QCount=0; T0=*(u32*)(XYList+QList->P0); T1=*(u32*)(XYList+QList->P1); T2=*(u32*)(XYList+QList->P2); - T3=*(u32*)(XYList+QList->P3); gte_ldsxy0(T0); gte_ldsxy1(T1); gte_ldsxy2(T2); setlen(ThisPrim, GPU_PolyGT4Tag); gte_nclip_b(); // 8 cycles + T3=*(u32*)(XYList+QList->P3); *(u32*)&ThisPrim->x0=T0; // Set XY0 *(u32*)&ThisPrim->x1=T1; // Set XY1 @@ -495,13 +484,13 @@ s16 TCount=0,QCount=0; } MapRow++; BlkPos.vx+=BLOCK_SIZE; - DeltaFX++; DeltaBX++; + DeltaTabX+=2; } MapPtr+=MapWidth; RGBMapPtr+=MapWidth; BlkPos.vx=BlkXOld; BlkPos.vy+=BLOCK_SIZE; - DeltaFY++; DeltaBY++; + DeltaTabY+=2; } SetPrimPtr((u8*)PrimPtr); diff --git a/source/level/layertile3d.h b/source/level/layertile3d.h index a62ed0c8d..5dd870b12 100644 --- a/source/level/layertile3d.h +++ b/source/level/layertile3d.h @@ -50,10 +50,10 @@ protected: u8 *RGBMap; u8 *RGBTable; - s16 *FTableX[16]; - s16 *FTableY[16]; - s16 *BTableX[16]; - s16 *BTableY[16]; + s16 *DeltaTableX[16]; + s16 *DeltaTableY[16]; +// s16 *BTableX[16]; +// s16 *BTableY[16]; DVECTOR DeltaFOfs; DVECTOR DeltaBOfs; s16 DeltaF,DeltaB;