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-05-01 22:28:01 +00:00
parent d5d76a2e2a
commit 0ad1a228ef
2 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
source/gfx/actor.cpp
View file

@ -9,6 +9,7 @@
#include "utils\pak.h" #include "utils\pak.h"
#include "gfx\prim.h" #include "gfx\prim.h"
#include "gfx\actor.h" #include "gfx\actor.h"
#include "gfx\otpos.h"
#include <dstructs.h> #include <dstructs.h>
@ -466,7 +467,7 @@ u16 ThisFrame=ThisAnim->Anim[Frame];
} }
/*****************************************************************************/ /*****************************************************************************/
int ActorOT=10; int ActorOT=OTPOS__ACTOR_POS;
POLY_FT4 *CActorGfx::Render(DVECTOR &Pos,int Anim,int Frame,bool XFlip,bool YFlip) POLY_FT4 *CActorGfx::Render(DVECTOR &Pos,int Anim,int Frame,bool XFlip,bool YFlip)
{ {
@ -528,7 +529,7 @@ POLY_FT4 *Ft4;
setRGB0(Ft4,128,128,128); setRGB0(Ft4,128,128,128);
Ft4->tpage=ThisNode->TPage; Ft4->tpage=ThisNode->TPage;
Ft4->clut=PoolEntry->ActorGfx->Clut; Ft4->clut=PoolEntry->ActorGfx->Clut;
AddPrimToList(Ft4,ActorOT); addPrim(OtPtr+ActorOT,Ft4);
if (ShadowFlag) if (ShadowFlag)
{ {
@ -540,7 +541,7 @@ POLY_FT4 *Ft4;
sFt4->y1+=ShadowYOfs; sFt4->y1+=ShadowYOfs;
setSemiTrans(sFt4,1); setSemiTrans(sFt4,1);
setRGB0(sFt4,0,0,0); setRGB0(sFt4,0,0,0);
AddPrimToList(sFt4,ActorOT); addPrim(OtPtr+ActorOT,sFt4);
} }
// Set BBox // Set BBox
int HalfW=CurrentFrame->W>>1; int HalfW=CurrentFrame->W>>1;
@ -753,7 +754,8 @@ int ShiftY=(Pos.vy & 15);
*(u32*)&TPrimPtr->u0=T0; // Set UV0 *(u32*)&TPrimPtr->u0=T0; // Set UV0
*(u32*)&TPrimPtr->u1=T1; // Set UV1 *(u32*)&TPrimPtr->u1=T1; // Set UV1
*(u16*)&TPrimPtr->u2=T2; // Set UV2 *(u16*)&TPrimPtr->u2=T2; // Set UV2
if (TList->OTOfs>MAX_OT-1) TList->OTOfs=MAX_OT-1;
ThisOT=OtPtr+TList->OTOfs; ThisOT=OtPtr+TList->OTOfs;
TList++; TList++;

12
source/level/layertile3d.cpp
View file

@ -113,16 +113,8 @@ sVtx *P0,*P1,*P2;
u32 T0,T1,T2; u32 T0,T1,T2;
s32 ClipZ; s32 ClipZ;
sOT *ThisOT; sOT *ThisOT;
//MATRIX &CamMtx=CGameScene::GetCamMtx();
VECTOR BlkPos; VECTOR BlkPos;
//extern int RenderZ;
// CamMtx.t[2]=RenderZ;
// SetTransMatrix(&CamMtx);
// SetIdentNoTrans(&CamMtx);
// SetRotMatrix(&CamMtx);
// Setup Trans Matrix // Setup Trans Matrix
BlkPos.vx=XOfs-(ShiftX); BlkPos.vx=XOfs-(ShiftX);
BlkPos.vy=YOfs-(ShiftY); BlkPos.vy=YOfs-(ShiftY);
@ -154,9 +146,9 @@ VECTOR BlkPos;
*(u32*)&TPrimPtr->u0=T0; // Set UV0 *(u32*)&TPrimPtr->u0=T0; // Set UV0
*(u32*)&TPrimPtr->u1=T1; // Set UV1 *(u32*)&TPrimPtr->u1=T1; // Set UV1
*(u16*)&TPrimPtr->u2=T2; // Set UV2 *(u16*)&TPrimPtr->u2=T2; // Set UV2
if (TList->OTOfs>MAX_OT-1) TList->OTOfs=MAX_OT-1;
ThisOT=OtPtr+TList->OTOfs;
ASSERT(TList->OTOfs<MAX_OT);
ThisOT=OtPtr+TList->OTOfs;
TList++; TList++;
gte_nclip_b(); gte_nclip_b();
gte_stsxy3_ft3(TPrimPtr); gte_stsxy3_ft3(TPrimPtr);