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-09 15:34:19 +00:00
parent c329cb24c2
commit 615305eced
2 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
source/gfx/actor.cpp
View file

@ -756,7 +756,7 @@ void CModelGfx::SetModel(int Type)
int PXOfs=-16; int PXOfs=-16;
int PYOfs=-8; int PYOfs=-8;
void CModelGfx::Render(DVECTOR &Pos,SVECTOR *Angle=0,VECTOR *Scale=0) void CModelGfx::Render(DVECTOR &Pos,SVECTOR *Angle,VECTOR *Scale,VECTOR *Flip)
{ {
#define BLOCK_MULT 16 #define BLOCK_MULT 16
u8 *PrimPtr=GetPrimPtr(); u8 *PrimPtr=GetPrimPtr();
@ -771,7 +771,11 @@ int TriCount=Model->TriCount;
sTri *TList=&ModelTriList[Model->TriStart]; sTri *TList=&ModelTriList[Model->TriStart];
MATRIX Mtx; MATRIX Mtx;
SetIdentNoTrans(&Mtx); if (Flip)
SetIdentNoTrans(&Mtx,Flip);
else
SetIdentNoTrans(&Mtx);
if (Scale || Angle) if (Scale || Angle)
{ {
if (Angle) RotMatrix(Angle,&Mtx); if (Angle) RotMatrix(Angle,&Mtx);
@ -805,7 +809,7 @@ 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>ActorOT) if (TList->OTOfs>ActorOT)
{ {
ThisOT=OtPtr+(ActorOT+1); ThisOT=OtPtr+(ActorOT+1);
@ -814,11 +818,16 @@ int ShiftY=(Pos.vy & 15);
{ {
ThisOT=OtPtr+(ActorOT-1); ThisOT=OtPtr+(ActorOT-1);
} }
*/
// ThisOT=OtPtr+TList->OTOfs; ThisOT=OtPtr+TList->OTOfs;
TList++; TList++;
addPrim(ThisOT,TPrimPtr);
gte_stsxy3_ft3(TPrimPtr);
TPrimPtr++;
/* Models are not clipped
gte_nclip_b(); gte_nclip_b();
gte_stsxy3_ft3(TPrimPtr); gte_stsxy3_ft3(TPrimPtr);
gte_stopz(&ClipZ); gte_stopz(&ClipZ);
@ -827,6 +836,7 @@ int ShiftY=(Pos.vy & 15);
addPrim(ThisOT,TPrimPtr); addPrim(ThisOT,TPrimPtr);
TPrimPtr++; TPrimPtr++;
} }
*/
} }
SetPrimPtr((u8*)TPrimPtr); SetPrimPtr((u8*)TPrimPtr);

2
source/gfx/actor.h
View file

@ -178,7 +178,7 @@ virtual ~CModelGfx(){};
static void SetData(sModel *Table,sTri *TList,sQuad *QList,sVtx *VList); static void SetData(sModel *Table,sTri *TList,sQuad *QList,sVtx *VList);
void SetModel(int Type); void SetModel(int Type);
void Render(DVECTOR &Pos,SVECTOR *Angle=0,VECTOR *Scale=0); void Render(DVECTOR &Pos,SVECTOR *Angle=0,VECTOR *Scale=0,VECTOR *Flip=0);
sBBox &GetBBox() {return(Model->BBox);} sBBox &GetBBox() {return(Model->BBox);}
protected: protected: