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-06-21 19:19:15 +00:00
parent 9ee7f92dc0
commit a331544f95
20 changed files with 95 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

12
source/gfx/actor.cpp
View file

@ -2,6 +2,7 @@
/*** Actor Bank ***/
/******************/
#include "system\vid.h"
#include "system\global.h"
#include "mem\memory.h"
#include "fileio\fileio.h"
@ -523,7 +524,6 @@ void CActorGfx::setActor(sActorPool *ThisActor)
}
/*****************************************************************************/
int BBX=0;
POLY_FT4 *CActorGfx::Render(DVECTOR &Pos,int Anim,int Frame,bool XFlip,bool YFlip)
{
sPoolNode *ThisNode,*FindNode;
@ -756,11 +756,14 @@ u8 V=Node->V;
}
setXYWH(Ft4,X,Y,W,H);
#if INGAME_SCREENW==512
// Correct Aspect
Ft4->x0-=CurrentFrameGfx->AspectX0;
Ft4->x1+=CurrentFrameGfx->AspectX1;
Ft4->x2-=CurrentFrameGfx->AspectX0;
Ft4->x3+=CurrentFrameGfx->AspectX1;
#endif
}
@ -791,9 +794,6 @@ void CModelGfx::SetModel(int Type)
}
/*****************************************************************************/
const int PXOfs=-16;
const int PYOfs=-8;
void CModelGfx::Render(DVECTOR &Pos,SVECTOR *Angle,VECTOR *Scale)
{
#define BLOCK_MULT 16
@ -836,8 +836,8 @@ sTri *TList=&ModelTriList[Model->TriStart];
int ShiftX=(Pos.vx & 15);
int ShiftY=(Pos.vy & 15);
RenderPos.vx=(PXOfs*16)+((MapXY.vx*16)+ShiftX);
RenderPos.vy=(PYOfs*16)+((MapXY.vy*16)+ShiftY);
RenderPos.vx=INGAME_SCREENOFS_X+((MapXY.vx*16)+ShiftX);
RenderPos.vy=INGAME_SCREENOFS_Y+((MapXY.vy*16)+ShiftY);
gte_SetRotMatrix(&Mtx);
CMX_SetTransMtxXY(&RenderPos);

3
source/gfx/fader.cpp
View file

@ -30,6 +30,7 @@
#include "sound\sound.h"
#endif
#include "system\vid.h"
/* Std Lib
------- */
@ -138,7 +139,7 @@ void CFader::render()
POLY_F4 *f4;
f4=GetPrimF4();
setXYWH(f4,0,0,512,256);
setXYWH(f4,0,0,VidGetScrW(),VidGetScrH());
switch(s_fadeStyle)
{
case BLACK_FADE:

4
source/gfx/prim.cpp
View file

@ -90,8 +90,8 @@ sVidScreen *Scr=VidGetDrawScreen();
Real.x+=Scr->Draw.clip.x;
Real.y+=Scr->Draw.clip.y;
int xLimit=512;
int yLimit=((FrameFlipFlag^1)+1)*256;
int xLimit=VidGetScrW();
int yLimit=((FrameFlipFlag^1)+1)*VidGetScrH();
if(Real.x+Real.w>xLimit)Real.w=xLimit-Real.x;
if(Real.y+Real.h>yLimit)Real.h=yLimit-Real.y;

1
source/gfx/prim.h
View file

@ -350,7 +350,6 @@ inline int GetFrameClut(sFrameHdr *Fr) {return(Fr->Clut);}
inline int GetFrameTPage(sFrameHdr *Fr) {return(Fr->TPage);}
const int aspectX=4096+1024;//(512<<12)/320;
//int aspectY=(256<<12)/320;
inline void CorrectAspect(POLY_FT4 *P)
{
int W=P->x1-P->x0;

9
source/gfx/sprbank.cpp
View file

@ -268,7 +268,6 @@ void SpriteBank::prepareFT4(POLY_FT4 *_ft4,sFrameHdr *_fh,int _x,int _y,bool _xF
setXYWH(_ft4,_x,_y,W,H);
setUVTp(_fh,_ft4,_xFlip,_yFlip);
//!! CorrectAspect(_ft4);
}
/*----------------------------------------------------------------------
@ -338,7 +337,6 @@ void SpriteBank::prepareFT4Scaled(POLY_FT4 *_ft4,sFrameHdr *_fh,int _x,int _y,bo
setXYWH(_ft4,_x,_y,W,H);
setUVTp(_fh,_ft4,_xFlip,_yFlip);
//!! CorrectAspect(_ft4);
}
@ -354,7 +352,6 @@ void SpriteBank::prepareFT4RotatedScaled(POLY_FT4 *_ft4,sFrameHdr *_fh,int _xCen
int ca,sa;
int cw,ch,sw,sh;
int width,height;
int aspect;
halfW=(_fh->W*_xScale)>>(12+1);
halfH=(_fh->H*_yScale)>>(12+1);
@ -365,10 +362,6 @@ void SpriteBank::prepareFT4RotatedScaled(POLY_FT4 *_ft4,sFrameHdr *_fh,int _xCen
sw=(sa*halfW)>>12;
sh=(sa*halfH)>>12;
// aspect=(512<<12)/384;//((_fh->H<<12)/_fh->W)/2;
// ch=(ch*aspect)>>12;
// sh=(sh*aspect)>>12;
_ft4->x0=_xCentre-cw+sh; _ft4->y0=_yCentre-sw-ch;
_ft4->x1=_xCentre+cw+sh; _ft4->y1=_yCentre+sw-ch;
_ft4->x2=_xCentre-cw-sh; _ft4->y2=_yCentre-sw+ch;
@ -413,7 +406,7 @@ void SpriteBank::prepareFT4RotatedScaled(POLY_FT4 *_ft4,sFrameHdr *_fh,int _xCen
_ft4->tpage=_fh->TPage;
_ft4->clut=_fh->Clut;
////////////////////////////////
//!! CorrectAspect(_ft4);
}