zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Daveo 2001-08-17 16:49:26 +00:00
parent d978a8f938
commit d167507b25
4 changed files with 62 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
source/level/layerback.cpp
View file

@ -74,9 +74,10 @@ void CLayerBack::think(DVECTOR &MapPos)
/*****************************************************************************/ /*****************************************************************************/
const int BM=16; const int BM=16;
const int BB=16; const int BB=16;
int RB=1;
void CLayerBack::render() void CLayerBack::render()
{ {
if (!RB) return;
sOT *ThisOT=OtPtr+(MAX_OT-1); sOT *ThisOT=OtPtr+(MAX_OT-1);
int i,ThisY=-YOfs; int i,ThisY=-YOfs;
// Render Back Sprites // Render Back Sprites

29
source/level/layertile.cpp
View file

@ -35,7 +35,13 @@ CLayerTile::CLayerTile(sLevelHdr *LevelHdr,sLayerHdr *Hdr)
Map=(sTileMapElem*)MakePtr(Hdr,sizeof(sLayerHdr)); Map=(sTileMapElem*)MakePtr(Hdr,sizeof(sLayerHdr));
PrimBankID=0; 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++) for (int b=0; b<2; b++)
{ {
PrimBank[b]=(TSPRT*)MemAlloc(PrimMemSize,"Mid Polyz"); PrimBank[b]=(TSPRT*)MemAlloc(PrimMemSize,"Mid Polyz");
@ -49,6 +55,17 @@ CLayerTile::CLayerTile(sLevelHdr *LevelHdr,sLayerHdr *Hdr)
PrimPtr++; PrimPtr++;
} }
} }
// precalc Mid tile offsets
sTileMapElem *MapPtr=Map;
for (int Y=0; Y<MapHeight; Y++)
{
for (int X=0; X<MapWidth; X++)
{
MapPtr->Tile*=sizeof(sElem2d);
MapPtr++;
}
}
} }
/*****************************************************************************/ /*****************************************************************************/
@ -56,7 +73,7 @@ CLayerTile::~CLayerTile()
{ {
for (int b=0; b<2; b++) 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; s16 TileX,TileY;
sOT *ThisOT=OtPtr+LayerOT; sOT *ThisOT=OtPtr+LayerOT;
TSPRT *PrimPtr=PrimBank[PrimBankID]; TSPRT *PrimPtr=PrimBank[PrimBankID];
u8 *TileBank=(u8*)ElemBank2d;
u32 T0,T1;
PrimBankID^=1; PrimBankID^=1;
@ -139,11 +158,13 @@ TSPRT *PrimPtr=PrimBank[PrimBankID];
int ThisTile=MapRow->Tile; int ThisTile=MapRow->Tile;
if (ThisTile) if (ThisTile)
{ {
sElem2d *Tile=&ElemBank2d[ThisTile]; sElem2d *Tile=(sElem2d*)(TileBank+ThisTile);
PrimPtr->x0=TileX; PrimPtr->x0=TileX;
PrimPtr->y0=TileY; PrimPtr->y0=TileY;
setTSprtTPage(PrimPtr,Tile->TPage); T0=Tile->TPage;
*(u32*)&PrimPtr->u0=*(u32*)&Tile->u0; // copy uv AND clut 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); addPrim(ThisOT,PrimPtr);
PrimPtr++; PrimPtr++;
} }

73
source/level/layertile3d.cpp
View file

@ -38,6 +38,7 @@ static const int DeltaTableSizeX=SCREEN_TILE3D_WIDTH+1;
static const int DeltaTableSizeY=SCREEN_TILE3D_HEIGHT+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 // 0 LUF
// 1 RUF // 1 RUF
// 2 LDF // 2 LDF
@ -134,10 +135,8 @@ void CLayerTile3d::shutdown()
#endif #endif
for (int i=0; i<16; i++) for (int i=0; i<16; i++)
{ {
MemFree(FTableX[i]); MemFree(DeltaTableX[i]);
MemFree(FTableY[i]); MemFree(DeltaTableY[i]);
MemFree(BTableX[i]);
MemFree(BTableY[i]);
} }
} }
@ -147,17 +146,14 @@ void CLayerTile3d::CalcDelta()
{ {
VECTOR BlkPos; VECTOR BlkPos;
SVECTOR Pnt={-BLOCK_SIZE/2,-BLOCK_SIZE/2,-BLOCK_SIZE*4}; SVECTOR Pnt={-BLOCK_SIZE/2,-BLOCK_SIZE/2,-BLOCK_SIZE*4};
s16 *FTab,*BTab; s16 *Tab;
CGameScene::setCameraMtx(); CGameScene::setCameraMtx();
for (int i=0; i<16; i++) for (int i=0; i<16; i++)
{ {
FTab=(s16*)MemAlloc(DeltaTableSizeX*sizeof(s16),"FTableXTable"); Tab=(s16*)MemAlloc(DeltaTableSizeX*2*sizeof(s16),"DeltaTableXTable");
BTab=(s16*)MemAlloc(DeltaTableSizeX*sizeof(s16),"BTableXTable"); DeltaTableX[i]=Tab;
FTableX[i]=FTab; ASSERT(Tab);
BTableX[i]=BTab;
ASSERT(FTab);
ASSERT(BTab);
BlkPos.vx=RENDER_X_OFS-i; BlkPos.vx=RENDER_X_OFS-i;
BlkPos.vy=RENDER_Y_OFS; BlkPos.vy=RENDER_Y_OFS;
for (int x=0; x<DeltaTableSizeX; x++) for (int x=0; x<DeltaTableSizeX; x++)
@ -167,19 +163,16 @@ s16 *FTab,*BTab;
CMX_SetTransMtxXY(&BlkPos); CMX_SetTransMtxXY(&BlkPos);
Pnt.vz=-BLOCK_SIZE*4; Pnt.vz=-BLOCK_SIZE*4;
RotTransPers(&Pnt,(s32*)&O,&Tmp,&Tmp); RotTransPers(&Pnt,(s32*)&O,&Tmp,&Tmp);
FTab[x]=O.vx; *Tab++=O.vx;
Pnt.vz=+BLOCK_SIZE*4; Pnt.vz=+BLOCK_SIZE*4;
RotTransPers(&Pnt,(s32*)&O,&Tmp,&Tmp); RotTransPers(&Pnt,(s32*)&O,&Tmp,&Tmp);
BTab[x]=O.vx; *Tab++=O.vx;
BlkPos.vx+=BLOCK_SIZE; BlkPos.vx+=BLOCK_SIZE;
} }
FTab=(s16*)MemAlloc(DeltaTableSizeY*sizeof(s16),"FTableYTable"); Tab=(s16*)MemAlloc(DeltaTableSizeY*2*sizeof(s16),"DeltaYTable");
BTab=(s16*)MemAlloc(DeltaTableSizeY*sizeof(s16),"BTableYTable"); DeltaTableY[i]=Tab;
FTableY[i]=FTab; ASSERT(Tab);
BTableY[i]=BTab;
ASSERT(FTab);
ASSERT(BTab);
BlkPos.vx=RENDER_X_OFS; BlkPos.vx=RENDER_X_OFS;
BlkPos.vy=RENDER_Y_OFS-i; BlkPos.vy=RENDER_Y_OFS-i;
for (int y=0; y<DeltaTableSizeY; y++) for (int y=0; y<DeltaTableSizeY; y++)
@ -189,15 +182,15 @@ s16 *FTab,*BTab;
CMX_SetTransMtxXY(&BlkPos); CMX_SetTransMtxXY(&BlkPos);
Pnt.vz=-BLOCK_SIZE*4; Pnt.vz=-BLOCK_SIZE*4;
RotTransPers(&Pnt,(s32*)&O,&Tmp,&Tmp); RotTransPers(&Pnt,(s32*)&O,&Tmp,&Tmp);
FTab[y]=O.vy; *Tab++=O.vy;
Pnt.vz=+BLOCK_SIZE*4; Pnt.vz=+BLOCK_SIZE*4;
RotTransPers(&Pnt,(s32*)&O,&Tmp,&Tmp); RotTransPers(&Pnt,(s32*)&O,&Tmp,&Tmp);
BTab[y]=O.vy; *Tab++=O.vy;
BlkPos.vy+=BLOCK_SIZE; BlkPos.vy+=BLOCK_SIZE;
} }
} }
DeltaF=FTableX[0][1]-FTableX[0][0]; DeltaF=DeltaTableX[0][(1*2)+0]-DeltaTableX[0][(0*2)+0];
DeltaB=BTableY[0][1]-BTableY[0][0]; DeltaB=DeltaTableY[0][(1*2)+1]-DeltaTableY[0][(0*2)+1];
} }
@ -287,8 +280,7 @@ s32 ClipZ;
sOT *ThisOT; sOT *ThisOT;
VECTOR BlkPos; VECTOR BlkPos;
DVECTOR *DP0,*DP1,*DP2,*DP3; DVECTOR *DP0,*DP1,*DP2,*DP3;
s16 *DeltaFY=FTableY[ShiftY]; s16 *DeltaTabY=DeltaTableY[ShiftY];
s16 *DeltaBY=BTableY[ShiftY];
#if defined(_SHOW_POLYZ_) #if defined(_SHOW_POLYZ_)
s16 TCount=0,QCount=0; s16 TCount=0,QCount=0;
@ -303,8 +295,7 @@ s16 TCount=0,QCount=0;
sTileMapElem *MapRow=MapPtr; sTileMapElem *MapRow=MapPtr;
u8 *RGBRow=RGBMapPtr; u8 *RGBRow=RGBMapPtr;
s32 BlkXOld=BlkPos.vx; s32 BlkXOld=BlkPos.vx;
s16 *DeltaFX=FTableX[ShiftX]; s16 *DeltaTabX=DeltaTableX[ShiftX];
s16 *DeltaBX=BTableX[ShiftX];
for (int X=0; X<RenderW; X++) for (int X=0; X<RenderW; X++)
{ {
@ -318,8 +309,8 @@ s16 TCount=0,QCount=0;
if (TriCount || QuadCount) // Blank tiles rejected here, to prevent over processing (as no tri-count) if (TriCount || QuadCount) // Blank tiles rejected here, to prevent over processing (as no tri-count)
{ {
u8 *RGB=&RGBTable[RGBOfs*(16*4)];
sFlipTable *FTab=&FlipTable[Tile&3]; sFlipTable *FTab=&FlipTable[Tile&3];
u8 *RGB=&RGBTable[RGBOfs*(16*4)];
CMX_SetTransMtxXY(&BlkPos); CMX_SetTransMtxXY(&BlkPos);
CMX_SetRotMatrixXY(&FTab->Mtx); CMX_SetRotMatrixXY(&FTab->Mtx);
@ -351,13 +342,12 @@ s16 TCount=0,QCount=0;
gte_ldv3(V0,V1,V2); gte_ldv3(V0,V1,V2);
gte_stsxy3c(OutPtr); // read XY back gte_stsxy3c(OutPtr); // read XY back
} }
} }
s16 FL=DeltaFX[0]+DeltaFOfs.vx; s16 FL=DeltaTabX[(0*2)+0]+DeltaFOfs.vx;
s16 FR=DeltaFX[1]+DeltaFOfs.vx; s16 FR=DeltaTabX[(1*2)+0]+DeltaFOfs.vx;
s16 FU=DeltaFY[0]+DeltaFOfs.vy; s16 FU=DeltaTabY[(0*2)+0]+DeltaFOfs.vy;
s16 FD=DeltaFY[1]+DeltaFOfs.vy; s16 FD=DeltaTabY[(1*2)+0]+DeltaFOfs.vy;
DP0=FTab->DeltaTab[0]; DP0=FTab->DeltaTab[0];
DP1=FTab->DeltaTab[1]; DP1=FTab->DeltaTab[1];
DP2=FTab->DeltaTab[2]; DP2=FTab->DeltaTab[2];
@ -371,10 +361,10 @@ s16 TCount=0,QCount=0;
DP3->vx=FR; DP3->vx=FR;
DP3->vy=FD; DP3->vy=FD;
s16 BL=DeltaBX[0]+DeltaBOfs.vx; s16 BL=DeltaTabX[(0*2)+1]+DeltaBOfs.vx;
s16 BR=DeltaBX[1]+DeltaBOfs.vx; s16 BR=DeltaTabX[(1*2)+1]+DeltaBOfs.vx;
s16 BU=DeltaBY[0]+DeltaBOfs.vy; s16 BU=DeltaTabY[(0*2)+1]+DeltaBOfs.vy;
s16 BD=DeltaBY[1]+DeltaBOfs.vy; s16 BD=DeltaTabY[(1*2)+1]+DeltaBOfs.vy;
DP0=FTab->DeltaTab[4]; DP0=FTab->DeltaTab[4];
DP1=FTab->DeltaTab[5]; DP1=FTab->DeltaTab[5];
DP2=FTab->DeltaTab[6]; DP2=FTab->DeltaTab[6];
@ -418,7 +408,6 @@ s16 TCount=0,QCount=0;
*(u32*)&ThisPrim->u0=T0; // Set UV0 *(u32*)&ThisPrim->u0=T0; // Set UV0
*(u32*)&ThisPrim->u1=T1; // Set UV1 *(u32*)&ThisPrim->u1=T1; // Set UV1
*(u32*)&ThisPrim->u2=T2; // Set UV2 *(u32*)&ThisPrim->u2=T2; // Set UV2
addPrim(ThisOT,ThisPrim);
{ // lighting { // lighting
T0=*(u32*)&RGB[TList->C0]; T0=*(u32*)&RGB[TList->C0];
T1=*(u32*)&RGB[TList->C1]; 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++;} if (ShowPolyz) {setRGB0(ThisPrim,127,0,0); setRGB1(ThisPrim,255,0,0); setRGB2(ThisPrim,255,0,0); TCount++;}
#endif #endif
ThisPrim->code=TList->PolyCode; ThisPrim->code=TList->PolyCode;
addPrim(ThisOT,ThisPrim);
PrimPtr+=sizeof(POLY_GT3); PrimPtr+=sizeof(POLY_GT3);
} }
TList++; TList++;
@ -446,13 +435,13 @@ s16 TCount=0,QCount=0;
T0=*(u32*)(XYList+QList->P0); T0=*(u32*)(XYList+QList->P0);
T1=*(u32*)(XYList+QList->P1); T1=*(u32*)(XYList+QList->P1);
T2=*(u32*)(XYList+QList->P2); T2=*(u32*)(XYList+QList->P2);
T3=*(u32*)(XYList+QList->P3);
gte_ldsxy0(T0); gte_ldsxy0(T0);
gte_ldsxy1(T1); gte_ldsxy1(T1);
gte_ldsxy2(T2); gte_ldsxy2(T2);
setlen(ThisPrim, GPU_PolyGT4Tag); setlen(ThisPrim, GPU_PolyGT4Tag);
gte_nclip_b(); // 8 cycles gte_nclip_b(); // 8 cycles
T3=*(u32*)(XYList+QList->P3);
*(u32*)&ThisPrim->x0=T0; // Set XY0 *(u32*)&ThisPrim->x0=T0; // Set XY0
*(u32*)&ThisPrim->x1=T1; // Set XY1 *(u32*)&ThisPrim->x1=T1; // Set XY1
@ -495,13 +484,13 @@ s16 TCount=0,QCount=0;
} }
MapRow++; MapRow++;
BlkPos.vx+=BLOCK_SIZE; BlkPos.vx+=BLOCK_SIZE;
DeltaFX++; DeltaBX++; DeltaTabX+=2;
} }
MapPtr+=MapWidth; MapPtr+=MapWidth;
RGBMapPtr+=MapWidth; RGBMapPtr+=MapWidth;
BlkPos.vx=BlkXOld; BlkPos.vx=BlkXOld;
BlkPos.vy+=BLOCK_SIZE; BlkPos.vy+=BLOCK_SIZE;
DeltaFY++; DeltaBY++; DeltaTabY+=2;
} }
SetPrimPtr((u8*)PrimPtr); SetPrimPtr((u8*)PrimPtr);

8
source/level/layertile3d.h
View file

@ -50,10 +50,10 @@ protected:
u8 *RGBMap; u8 *RGBMap;
u8 *RGBTable; u8 *RGBTable;
s16 *FTableX[16]; s16 *DeltaTableX[16];
s16 *FTableY[16]; s16 *DeltaTableY[16];
s16 *BTableX[16]; // s16 *BTableX[16];
s16 *BTableY[16]; // s16 *BTableY[16];
DVECTOR DeltaFOfs; DVECTOR DeltaFOfs;
DVECTOR DeltaBOfs; DVECTOR DeltaBOfs;
s16 DeltaF,DeltaB; s16 DeltaF,DeltaB;