This commit is contained in:
parent
c787d81564
commit
f857751606
6 changed files with 250 additions and 202 deletions
|
@ -27,8 +27,6 @@ CLayerTile::CLayerTile(sLayerHdr *Hdr,sTile *_TileList,sTri *_TriList,sQuad *_Qu
|
|||
VtxList=_VtxList;
|
||||
Map=(sTileMapElem*)MakePtr(Hdr,sizeof(sLayerHdr));
|
||||
|
||||
DAVE_DBGMSG("LayerTile\n");
|
||||
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -36,42 +34,12 @@ CLayerTile::~CLayerTile()
|
|||
{
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
int CLayerTile::GetLayerType(int SubType)
|
||||
{
|
||||
switch(SubType)
|
||||
{
|
||||
case CLayerTile::LAYER_TILE_SUBTYPE_BACK: return(LAYER_TYPE_TILE_BACK);
|
||||
case CLayerTile::LAYER_TILE_SUBTYPE_MID: return(LAYER_TYPE_TILE_MID);
|
||||
case CLayerTile::LAYER_TILE_SUBTYPE_ACTION: return(LAYER_TYPE_TILE_ACTION);
|
||||
case CLayerTile::LAYER_TILE_SUBTYPE_FORE: return(LAYER_TYPE_TILE_FORE);
|
||||
}
|
||||
return(-1);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/*****************************************************************************/
|
||||
/*****************************************************************************/
|
||||
void CLayerTile::init()
|
||||
{
|
||||
return;
|
||||
int Width=GetWidth();
|
||||
int Height=GetHeight();
|
||||
int Size=Width*Height;
|
||||
|
||||
for (int i=0; i<Size; i++)
|
||||
Map[i].Tile =0;
|
||||
/*
|
||||
for (int Y=0; Y<4; Y++)
|
||||
{
|
||||
for (int X=0; X<4; X++)
|
||||
{
|
||||
Map[X+(Y*Width)].Tile=X+(Y*4);
|
||||
}
|
||||
|
||||
}
|
||||
*/
|
||||
for (int i=0; i<16; i++) Map[i].Tile=i;
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -80,80 +48,73 @@ void CLayerTile::shutdown()
|
|||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
int XOfs=64;
|
||||
int YOfs=64;
|
||||
int Dx=0;
|
||||
int Dy=0;
|
||||
int MapX=0;
|
||||
int MapY=0;
|
||||
|
||||
|
||||
void CLayerTile::render()
|
||||
{
|
||||
int Width=GetWidth();
|
||||
int Height=GetHeight();
|
||||
POLY_FT4 *ft4;
|
||||
int Width=32;//GetWidth();
|
||||
int Height=21;//GetHeight();
|
||||
POLY_FT4 *ft4;
|
||||
sTileMapElem *ThisElem=Map;
|
||||
XOfs+=Dx;
|
||||
YOfs+=Dy;
|
||||
int XOfs=MapX;
|
||||
int YOfs=MapY;
|
||||
int XTileOfs,YTileOfs;
|
||||
|
||||
|
||||
if (LayerHdr->SubType==LAYER_TILE_SUBTYPE_BACK)
|
||||
{
|
||||
XOfs/=4;
|
||||
YOfs/=4;
|
||||
}
|
||||
if (LayerHdr->SubType==LAYER_TILE_SUBTYPE_MID)
|
||||
{
|
||||
XOfs/=2;
|
||||
YOfs/=2;
|
||||
}
|
||||
|
||||
YTileOfs=YOfs;
|
||||
for (int Y=0; Y<Height; Y++)
|
||||
{
|
||||
XTileOfs=XOfs;
|
||||
for (int X=0; X<Width; X++)
|
||||
{
|
||||
|
||||
if (ThisElem->Tile)
|
||||
{
|
||||
sTile *ThisTile=&TileList[ThisElem->Tile];
|
||||
if (ThisTile->TPage)
|
||||
{
|
||||
s16 x0=XTileOfs;
|
||||
s16 x1=XTileOfs+TILE_WIDTH;
|
||||
s16 y0=YTileOfs;
|
||||
s16 y1=YTileOfs+TILE_HEIGHT;
|
||||
|
||||
ft4=GetPrimFT4();
|
||||
setShadeTex(ft4,1);
|
||||
setSemiTrans(ft4,1);
|
||||
ft4->tpage=ThisTile->TPage;
|
||||
ft4->clut=ThisTile->Clut;
|
||||
ft4->x0=(X*TILE_WIDTH)+XOfs; ft4->y0=(Y*TILE_HEIGHT)+YOfs;
|
||||
ft4->x1=ft4->x0+TILE_WIDTH; ft4->y1=ft4->y0;
|
||||
ft4->x2=ft4->x0; ft4->y2=ft4->y0+TILE_HEIGHT;
|
||||
ft4->x3=ft4->x1; ft4->y3=ft4->y2;
|
||||
ft4->x0=x0 ; ft4->y0=y0;
|
||||
ft4->x1=x1 ; ft4->y1=y0;
|
||||
ft4->x2=x0 ; ft4->y2=y1;
|
||||
ft4->x3=x1 ; ft4->y3=y1;
|
||||
*(u16*)&ft4->u0=*(u16*)ThisTile->uv0;
|
||||
*(u16*)&ft4->u1=*(u16*)ThisTile->uv1;
|
||||
*(u16*)&ft4->u2=*(u16*)ThisTile->uv2;
|
||||
*(u16*)&ft4->u3=*(u16*)ThisTile->uv3;
|
||||
setRGB0(ft4,255,255,255);
|
||||
AddPrimToList(ft4,0);
|
||||
}
|
||||
else
|
||||
{
|
||||
}
|
||||
}
|
||||
ThisElem++;
|
||||
}
|
||||
}
|
||||
}
|
||||
/*
|
||||
void CLayerTile::render()
|
||||
{
|
||||
int ListSize=186;
|
||||
sTri *Tri=TriList;
|
||||
POLY_FT3 *ft3;
|
||||
POLY_FT4 *ft4;
|
||||
sTile *ThisTile=TileList;
|
||||
|
||||
int X,Y;
|
||||
X=XOfs;
|
||||
Y=YOfs;
|
||||
for (int i=0; i<ListSize; i++)
|
||||
{
|
||||
if (ThisTile->TriCount)
|
||||
{
|
||||
}
|
||||
ThisTile++;
|
||||
X+=16;
|
||||
if (X>(512-64))
|
||||
{
|
||||
X=XOfs;
|
||||
Y+=12;
|
||||
ThisElem++;
|
||||
XTileOfs+=TILE_WIDTH;
|
||||
}
|
||||
YTileOfs+=TILE_HEIGHT;
|
||||
}
|
||||
}
|
||||
|
||||
*/
|
||||
/*****************************************************************************/
|
||||
void CLayerTile::think(int _frames)
|
||||
{
|
||||
|
|
|
@ -22,8 +22,6 @@ public:
|
|||
CLayerTile(sLayerHdr *Hdr,sTile *_TileList,sTri *_TriList,sQuad *_QuadList,sVtx *_VtxList);
|
||||
~CLayerTile();
|
||||
|
||||
static int GetLayerType(int SubType);
|
||||
|
||||
void init();
|
||||
void shutdown();
|
||||
void render();
|
||||
|
|
|
@ -6,28 +6,34 @@
|
|||
#include "fileio\fileio.h"
|
||||
#include "utils\utils.h"
|
||||
#include "gfx\tpage.h"
|
||||
#include "gfx\prim.h"
|
||||
#include <DStructs.h>
|
||||
|
||||
#include "level\level.h"
|
||||
#include "level\layer.h"
|
||||
#include "level\layertile.h"
|
||||
|
||||
#include "pad\pads.h"
|
||||
|
||||
/*****************************************************************************/
|
||||
CLevel::CLevel()
|
||||
{
|
||||
for (int i=0; i<CLayer::LAYER_TYPE_MAX; i++)
|
||||
{
|
||||
LayerList[i]=0;
|
||||
}
|
||||
for (int i=0; i<CLayer::LAYER_TYPE_MAX; i++)
|
||||
{
|
||||
TileLayers[i]=0;
|
||||
}
|
||||
DAVE_DBGMSG("sizeof(POLY_FT4)=%i\n",sizeof(POLY_FT4));
|
||||
DAVE_DBGMSG("sizeof(SPRT)=%i\n",sizeof(SPRT));
|
||||
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
CLevel::~CLevel()
|
||||
{
|
||||
for (int i=0; i<CLayer::LAYER_TYPE_MAX; i++)
|
||||
{
|
||||
if (LayerList[i]) delete LayerList[i];
|
||||
}
|
||||
for (int i=0; i<CLayer::LAYER_TYPE_MAX; i++)
|
||||
{
|
||||
if (TileLayers[i]) delete TileLayers[i];
|
||||
}
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -36,50 +42,48 @@ void CLevel::init()
|
|||
LevelHdr=(sLvlHdr *)CFileIO::loadFile(CHAPTER01_LEVEL01_LVL,"Level Data");
|
||||
TPLoadTex(CHAPTER01_LEVEL01_TEX);
|
||||
|
||||
LevelHdr->TriList=(sTri*)MakePtr(LevelHdr,(int)LevelHdr->TriList);
|
||||
LevelHdr->QuadList=(sQuad*)MakePtr(LevelHdr,(int)LevelHdr->QuadList);
|
||||
LevelHdr->VtxList=(sVtx*)MakePtr(LevelHdr,(int)LevelHdr->VtxList);
|
||||
LevelHdr->TileList=(sTile*)MakePtr(LevelHdr,(int)LevelHdr->TileList);
|
||||
DAVE_DBGMSG("LayerCount=%i\n",GetLayerCount());
|
||||
LoadLayers();
|
||||
|
||||
for (int i=0; i<CLayer::LAYER_TYPE_MAX; i++)
|
||||
{
|
||||
if (LayerList[i]) LayerList[i]->init();
|
||||
}
|
||||
|
||||
initLayers();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
void CLevel::LoadLayers()
|
||||
void CLevel::initLayers()
|
||||
{
|
||||
int LayerCount=GetLayerCount();
|
||||
int *HdrOfs=(int*)MakePtr(LevelHdr,sizeof(sLvlHdr));
|
||||
sTri *TriList=(sTri*)MakePtr(LevelHdr,LevelHdr->TriList);
|
||||
sQuad *QuadList=(sQuad*)MakePtr(LevelHdr,LevelHdr->QuadList);
|
||||
sVtx *VtxList=(sVtx*)MakePtr(LevelHdr,LevelHdr->VtxList);
|
||||
sTile *TileList=(sTile*)MakePtr(LevelHdr,LevelHdr->TileList);
|
||||
|
||||
for (int i=0; i<LayerCount; i++)
|
||||
// Back
|
||||
if (LevelHdr->BackLayer)
|
||||
{
|
||||
sLayerHdr *Hdr=(sLayerHdr*)MakePtr(LevelHdr,*HdrOfs++);
|
||||
DAVE_DBGMSG("T:%i S:%i W:%i H:%i\n",Hdr->Type,Hdr->SubType,Hdr->Width,Hdr->Height);
|
||||
int LayerType=CLayer::GetLayerType(Hdr->Type,Hdr->SubType);
|
||||
switch (LayerType)
|
||||
{
|
||||
case CLayer::LAYER_TYPE_TILE_BACK:
|
||||
LayerList[LayerType]=new ("Back Layer") CLayerTile(Hdr,LevelHdr->TileList, LevelHdr->TriList, LevelHdr->QuadList, LevelHdr->VtxList);
|
||||
break;
|
||||
case CLayer::LAYER_TYPE_TILE_MID:
|
||||
LayerList[LayerType]=new ("Mid Layer") CLayerTile(Hdr,LevelHdr->TileList, LevelHdr->TriList, LevelHdr->QuadList, LevelHdr->VtxList);
|
||||
break;
|
||||
case CLayer::LAYER_TYPE_TILE_ACTION:
|
||||
LayerList[LayerType]=new ("Action Layer") CLayerTile(Hdr,LevelHdr->TileList, LevelHdr->TriList, LevelHdr->QuadList, LevelHdr->VtxList);
|
||||
break;
|
||||
case CLayer::LAYER_TYPE_TILE_FORE:
|
||||
LayerList[LayerType]=new ("Fore Layer") CLayerTile(Hdr,LevelHdr->TileList, LevelHdr->TriList, LevelHdr->QuadList, LevelHdr->VtxList);
|
||||
break;
|
||||
default:
|
||||
DAVE_DBGMSG("%i\n",LayerType);
|
||||
ASSERT(!"Unknown Layer");
|
||||
break;
|
||||
}
|
||||
sLayerHdr *Layer=(sLayerHdr*)MakePtr(LevelHdr,LevelHdr->BackLayer);
|
||||
CLayer *NewLayer=new ("Back Layer") CLayerTile(Layer, TileList, TriList, QuadList, VtxList);
|
||||
NewLayer->init();
|
||||
TileLayers[CLayer::LAYER_TYPE_TILE_BACK]=NewLayer;
|
||||
}
|
||||
// Mid
|
||||
if (LevelHdr->MidLayer)
|
||||
{
|
||||
sLayerHdr *Layer=(sLayerHdr*)MakePtr(LevelHdr,LevelHdr->MidLayer);
|
||||
CLayer *NewLayer=new ("Mid Layer") CLayerTile(Layer, TileList, TriList, QuadList, VtxList);
|
||||
NewLayer->init();
|
||||
TileLayers[CLayer::LAYER_TYPE_TILE_MID]=NewLayer;
|
||||
}
|
||||
// Action
|
||||
if (LevelHdr->ActionLayer)
|
||||
{
|
||||
sLayerHdr *Layer=(sLayerHdr*)MakePtr(LevelHdr,LevelHdr->ActionLayer);
|
||||
CLayer *NewLayer=new ("Action Layer") CLayerTile(Layer, TileList, TriList, QuadList, VtxList);
|
||||
NewLayer->init();
|
||||
TileLayers[CLayer::LAYER_TYPE_TILE_ACTION]=NewLayer;
|
||||
}
|
||||
// Fore
|
||||
if (LevelHdr->ForeLayer)
|
||||
{
|
||||
sLayerHdr *Layer=(sLayerHdr*)MakePtr(LevelHdr,LevelHdr->ForeLayer);
|
||||
CLayer *NewLayer=new ("Fore Layer") CLayerTile(Layer, TileList, TriList, QuadList, VtxList);
|
||||
NewLayer->init();
|
||||
TileLayers[CLayer::LAYER_TYPE_TILE_FORE]=NewLayer;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -89,22 +93,36 @@ void CLevel::shutdown()
|
|||
MemFree(LevelHdr);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/*****************************************************************************/
|
||||
/*****************************************************************************/
|
||||
void CLevel::render()
|
||||
{
|
||||
for (int i=0; i<CLayer::LAYER_TYPE_MAX; i++)
|
||||
{
|
||||
if (LayerList[i]) LayerList[i]->render();
|
||||
}
|
||||
for (int i=0; i<CLayer::LAYER_TYPE_MAX; i++)
|
||||
{
|
||||
if (TileLayers[i]) TileLayers[i]->render();
|
||||
}
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/*****************************************************************************/
|
||||
/*****************************************************************************/
|
||||
extern int MapX;
|
||||
extern int MapY;
|
||||
|
||||
void CLevel::think(int _frames)
|
||||
{
|
||||
for (int i=0; i<CLayer::LAYER_TYPE_MAX; i++)
|
||||
{
|
||||
if (LayerList[i]) LayerList[i]->think(_frames);
|
||||
}
|
||||
int padh = PadGetHeld( 0 );
|
||||
|
||||
if (padh & PAD_LEFT) MapX+=4;
|
||||
if (padh & PAD_RIGHT) MapX-=4;
|
||||
if (padh & PAD_UP) MapY+=4;
|
||||
if (padh & PAD_DOWN) MapY-=4;
|
||||
|
||||
for (int i=0; i<CLayer::LAYER_TYPE_MAX; i++)
|
||||
{
|
||||
if (TileLayers[i]) TileLayers[i]->think(_frames);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -21,14 +21,13 @@ public:
|
|||
void render();
|
||||
void think(int _frames);
|
||||
|
||||
int GetLayerCount() {return(LevelHdr->LayerCount);}
|
||||
|
||||
|
||||
private:
|
||||
void LoadLayers();
|
||||
void initLayers();
|
||||
|
||||
sLvlHdr *LevelHdr;
|
||||
CLayer *LayerList[CLayer::LAYER_TYPE_MAX];
|
||||
|
||||
// Tile Layers
|
||||
CLayer *TileLayers[CLayer::LAYER_TYPE_MAX];
|
||||
};
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue