Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Daveo 2001-05-11 23:52:38 +00:00
parent 895ac32d27
commit a7a1b53709
6 changed files with 166 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/enemy/nmjback.cpp
View File

@ -33,9 +33,9 @@ void CNpcMotherJellyfishBackground::postInit()
{
CNpcEnemy::postInit();
CFXJellyFishLegs *T=(CFXJellyFishLegs*)CFX::Create(CFX::FX_TYPE_JELLYFISH_LEGS,this);
T->SetUp(128,4,8,16);
T->SetOtPos( 15 );
// CFXJellyFishLegs *T=(CFXJellyFishLegs*)CFX::Create(CFX::FX_TYPE_JELLYFISH_LEGS,this);
// T->SetUp(128,4,8,16);
// T->SetOtPos( 15 );
m_actorGfx->SetOtPos( 15 );
}

4
source/enemy/nmjfish.cpp
View File

@ -56,8 +56,8 @@ void CNpcMotherJellyfishEnemy::postInit()
m_health = CLevel::getBossHealth();
}
CFXJellyFishLegs *T=(CFXJellyFishLegs*)CFX::Create(CFX::FX_TYPE_JELLYFISH_LEGS,this);
T->SetUp(128,4,8,16);
// CFXJellyFishLegs *T=(CFXJellyFishLegs*)CFX::Create(CFX::FX_TYPE_JELLYFISH_LEGS,this);
// T->SetUp(128,4,8,16);
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

216
source/gfx/actor.cpp
View File

@ -63,7 +63,6 @@ int SlotW=+32000,SlotH=+32000;
// Find best slot which fits in
// ASSERT(!"ReAlloc");
for (i=0;i<SlotCount; i++)
{
int ThisW=(SlotList[i].Width-W);
@ -125,52 +124,69 @@ int Slot=0;
}
/*****************************************************************************/
sPoolNode *CActorCache::RemoveHeadNode(sNodeList *Root)
sPoolNode *CActorCache::RemoveHeadNode(sNodeList *RootNode)
{
sPoolNode *Node=Root->Head;
sPoolNode *Next=Node->Next;
sPoolNode *ThisNode=RootNode->Head;
sPoolNode *NextNode=ThisNode->Next;
Root->Head=Node->Next;
Next->Prev=0;
Node->Next=0;
return(Node);
RootNode->Head=NextNode;
ThisNode->Next=0;
if (NextNode)
{
NextNode->Prev=0;
}
else
{ // Its Tail Node
RootNode->Tail=0;
}
return(ThisNode);
}
/*****************************************************************************/
void CActorCache::RemoveNode(sPoolNode *Node,sNodeList *Root)
void CActorCache::RemoveNode(sPoolNode *ThisNode,sNodeList *RootNode)
{
sPoolNode *Prev=Node->Prev;
sPoolNode *Next=Node->Next;
sPoolNode *PrevNode=ThisNode->Prev;
sPoolNode *NextNode=ThisNode->Next;
if (Prev)
if (PrevNode)
{ // Not Head Node
Prev->Next=Node->Next;
PrevNode->Next=NextNode;
}
if (Next)
else
{ // Head Node
RootNode->Head=NextNode;
}
if (NextNode)
{ // Not Tail Node
Next->Prev=Node->Prev;
NextNode->Prev=PrevNode;
}
else
{ // Tail Node
RootNode->Tail=PrevNode;
}
ThisNode->Next=0;
ThisNode->Prev=0;
}
/*****************************************************************************/
// Add node to end of list
void CActorCache::AddNode(sPoolNode *Node,sNodeList *Root)
void CActorCache::AddNode(sPoolNode *ThisNode,sNodeList *RootNode)
{
sPoolNode *Prev=Root->Tail;
sPoolNode *Next=0;
sPoolNode *TailNode=RootNode->Tail;
if (Prev)
{ // Not Head Node
Prev->Next=Node;
if (TailNode)
{
TailNode->Next=ThisNode;
}
else
{
Root->Head=Node;
{ // List is empty
RootNode->Head=ThisNode;
}
Node->Prev=Prev;
Node->Next=0;
Root->Tail=Node;
ThisNode->Prev=TailNode;
ThisNode->Next=0;
ASSERT(ThisNode);
RootNode->Tail=ThisNode;
}
/*****************************************************************************/
@ -181,24 +197,30 @@ sPoolNode *SrcHead=Src->Head;
sPoolNode *SrcTail=Src->Tail;
sPoolNode *DstHead=Dst->Head;
sPoolNode *DstTail=Dst->Tail;
/*
if (!SrcHead) return;
if (!DstTail)
{
Dst->Head=SrcHead;
SrcHead->Prev=0;
}
else
if (DstTail)
{
DstTail->Next=SrcHead;
SrcHead->Prev=DstTail;
}
else
{ // List is empty
Dst->Head=SrcHead;
}
SrcTail->Next=0;
SrcHead->Prev=DstTail;
Dst->Tail=SrcTail;
Src->Head=0;
Src->Tail=0;
*/
while(SrcHead)
{
sPoolNode *Next=SrcHead->Next;
AddNode(SrcHead,Dst);
SrcHead=Next;
}
}
/*****************************************************************************/
@ -216,7 +238,7 @@ int TPW=CACHE_W/SlotCount;
int MaxW=0;
int MaxH=0;
/* if (TPW<1) */TPW=1;
TPW=1;
ASSERT(SlotCount<=CACHE_W);
@ -241,6 +263,7 @@ sPoolNode *List;
// Init List
ThisSlot->SlotCount=Total;
ThisSlot->ListMem=(u8*)MemAlloc(Total*sizeof(sPoolNode),"CacheNodeList");
List=(sPoolNode*)ThisSlot->ListMem;
@ -254,7 +277,7 @@ sPoolNode *List;
int TexX=CACHE_X+CurrentTPX+(U>>2);
int TexY=CACHE_Y+V;
List->Actor=0;
List->Actor=(FileEquate)0;
List->TexX=TexX;
List->TexY=TexY;
List->U=U&255;
@ -367,9 +390,11 @@ sActorPool *List=ActorList;
while (List)
{
List->PoolCache=Cache.GetSlotList(List->CacheSlot);
List->ActorCache.Head=0;
List->ActorCache.Tail=0;
List->GlobalCache=Cache.GetSlotList(List->CacheSlot);
List->LocalCache.Head=0;
List->LocalCache.Tail=0;
List->LastCache.Head=0;
List->LastCache.Tail=0;
List=List->Next;
}
}
@ -469,6 +494,18 @@ void CActorPool::AddActor(sActorPool *NewActor)
Cache.LoadPalette(NewActor);
LastActor=NewActor;
}
int CountSlots(sPoolNode *Node)
{
int Count=0;
while (Node)
{
Count++;
Node=Node->Next;
}
return(Count);
}
/*****************************************************************************/
void CActorPool::CleanUpCache()
{
@ -476,10 +513,26 @@ sActorPool *Actor=ActorList;
while (Actor)
{
CActorCache::AddNodeList(&Actor->ActorCache ,Actor->PoolCache);
// Actor->LastCache.Head=0;//Actor->LocalCache.Head;
// Actor->LastCache.Tail=0;//Actor->LocalCache.Tail;
CActorCache::AddNodeList(&Actor->LocalCache ,Actor->GlobalCache);
Actor->LocalCache.Head=0;
Actor->LocalCache.Tail=0;
// ASSERT(Actor->GlobalCache->Head);
// ASSERT(Actor->GlobalCache->Tail);
Actor=Actor->Next;
}
/*
for (int i=0;i<CActorPool::Cache.GetSlotCount(); i++)
{
sPoolSlot &Slot=CActorPool::Cache.GetSlot(i);
int Count=CountSlots(Slot.NodeList.Head);
printf("SC %i: %i %i\n",i,Slot.SlotCount,Count);
ASSERT(Slot.SlotCount==Count);
}
*/
}
/*****************************************************************************/
@ -514,55 +567,70 @@ u16 ThisFrame=ThisAnim->Anim[Frame];
}
/*****************************************************************************/
sActorPool *DbgPool;
POLY_FT4 *CActorGfx::Render(DVECTOR &Pos,int Anim,int Frame,bool XFlip,bool YFlip)
{
sPoolNode *ThisNode;;
sPoolNode *ThisNode,*FindNode;
POLY_FT4 *Ft4;
DbgPool=PoolEntry;
CurrentFrame=GetFrame(Anim,Frame);
// Is cached?
ThisNode=PoolEntry->ActorCache.Head;
while (ThisNode)
ThisNode=0;
// Check Local Cache
FindNode=PoolEntry->LocalCache.Head;
while (FindNode)
{ // Try local Cache (From Head forward)
if (ThisNode->Actor==PoolEntry->Filename && ThisNode->Anim==Anim && ThisNode->Frame==Frame) break;
ThisNode=ThisNode->Next;
if (FindNode->Actor==PoolEntry->Filename && FindNode->Anim==Anim && FindNode->Frame==Frame)
{
ThisNode=FindNode;
break;
}
/*
FindNode=FindNode->Next;
}
// Check Last Cache
if (!ThisNode)
{ // Try main cache ( from tail back)
ThisNode=PoolEntry->PoolCache->Tail;
while (ThisNode)
{
if (ThisNode->Actor==PoolEntry->Filename && ThisNode->Anim==Anim && ThisNode->Frame==Frame) break;
if (ThisNode->Prev==PoolEntry->PoolCache->Tail) ThisNode->Prev=0;
ThisNode=ThisNode->Prev;
FindNode=PoolEntry->LastCache.Head;
while (FindNode)
{
if (FindNode->Actor==PoolEntry->Filename && FindNode->Anim==Anim && FindNode->Frame==Frame)
{
ThisNode=FindNode;
CActorCache::RemoveNode(ThisNode,PoolEntry->GlobalCache);
CActorCache::AddNode(ThisNode,&PoolEntry->LocalCache);
break;
}
if (FindNode==PoolEntry->LastCache.Tail) break;
FindNode=FindNode->Next;
}
}
if (ThisNode)
// Check Global Cache
if (!ThisNode)
{
CActorCache::RemoveNode(ThisNode,PoolEntry->PoolCache);
CActorCache::AddNode(ThisNode,&PoolEntry->ActorCache);
}
}
else
FindNode=PoolEntry->GlobalCache->Tail;
while (FindNode)
{
if (FindNode->Actor==PoolEntry->Filename && FindNode->Anim==Anim && FindNode->Frame==Frame)
{
ThisNode=FindNode;
CActorCache::RemoveNode(ThisNode,PoolEntry->GlobalCache);
CActorCache::AddNode(ThisNode,&PoolEntry->LocalCache);
break;
}
*/
FindNode=FindNode->Prev;
}
}
// Could not find it, get new
if (!ThisNode)
{ // Not cached frame
ThisNode=CActorCache::RemoveHeadNode(PoolEntry->PoolCache);
if (ThisNode)
{
CActorCache::AddNode(ThisNode,&PoolEntry->ActorCache);
}
else
{
// printf("NO FREE NODES\n");
ThisNode=PoolEntry->ActorCache.Head;
}
ThisNode=CActorCache::RemoveHeadNode(PoolEntry->GlobalCache);
ASSERT(ThisNode);
CActorCache::AddNode(ThisNode,&PoolEntry->LocalCache);
RECT R;
ThisNode->Actor=PoolEntry->Filename;

10
source/gfx/actor.h
View File

@ -16,7 +16,7 @@
// Pack together Actor anim & frame for quicker check later
struct sPoolNode
{
u16 Actor;
FileEquate Actor;
u16 Anim;
u16 Frame;
u16 TPage;
@ -38,6 +38,7 @@ struct sPoolSlot
u16 FrameCount;
sNodeList NodeList;
u8 *ListMem;
int SlotCount;
};
/*****************************************************************************/
@ -46,8 +47,9 @@ struct sActorPool
FileEquate Filename;
sSpriteAnimBank *ActorGfx;
int CacheSlot;
sNodeList *PoolCache;
sNodeList ActorCache;
sNodeList *GlobalCache;
sNodeList LocalCache;
sNodeList LastCache;
sActorPool *Next;
};
@ -86,7 +88,9 @@ public:
void AllocCache();
void Reset();
void LoadPalette(sActorPool *NewActor);
sPoolSlot &GetSlot(int Slot) {return(SlotList[Slot]);}
sNodeList *GetSlotList(int Slot) {return(&SlotList[Slot].NodeList);}
int GetSlotCount() {return(SlotCount);}
static sPoolNode *RemoveHeadNode(sNodeList *Root);
static void RemoveNode(sPoolNode *Node,sNodeList *Root);

2
source/level/level.cpp
View File

@ -165,7 +165,7 @@ bool Finished=false;
if (Lvl>=LvlTableSize) Lvl=0;
}
// End TMP
// Lvl&=3; // Ch1 only Bodge
Lvl&=3; // Ch1 only Bodge
return(Finished);
}

4
source/platform/platform.cpp
View File

@ -507,8 +507,8 @@ void CNpcPlatform::postInit()
}
}
CFXJellyFishLegs *T=(CFXJellyFishLegs*)CFX::Create(CFX::FX_TYPE_JELLYFISH_LEGS,this);
T->SetUp(64,4,8,8);
// CFXJellyFishLegs *T=(CFXJellyFishLegs*)CFX::Create(CFX::FX_TYPE_JELLYFISH_LEGS,this);
// T->SetUp(64,4,8,8);
}
}