Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused code and correct PIE documentation. Number of texture animations and playback rates do not 

and cannot vary between polygons, despite what parts of the code wants you to believe. This is good.
Patch reviewed by gerard_.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8190 4a71c877-e1ca-e34f-864e-861f7616d084
master
Per Inge Mathisen 2009-09-28 19:53:10 +00:00 committed by Git SVN Gateway
parent 889b9dfdf8
commit 6f0aaea8ad
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ivis_common/imdload.c
View File

@ -167,19 +167,17 @@ static BOOL _imd_load_polys( const char **ppFileData, iIMDShape *s )
ASSERT(tWidth > 0, "%s: texture width = %d", GetLastResourceFilename(), tWidth);
ASSERT(tHeight > 0, "%s: texture height = %d (width=%d)", GetLastResourceFilename(), tHeight, tWidth);
/* Assumes same number of frames per poly */
/* Must have same number of frames and same playback rate for all polygons */
s->numFrames = nFrames;
poly->texAnim.nFrames = nFrames;
poly->texAnim.playbackRate =pbRate;
/* Uses Max metric playback rate */
s->animInterval = pbRate;
poly->texAnim.textureWidth = tWidth;
poly->texAnim.textureHeight = tHeight;
}
else
{
poly->texAnim.nFrames = 0;
poly->texAnim.textureWidth = 0;
poly->texAnim.textureHeight = 0;
}
// PC texture coord routine

3
lib/ivis_common/ivi.h
View File

@ -25,9 +25,6 @@
#include "piedef.h"
#define iV_DIVSHIFT 15
#define iV_DIVMULTP (1 << iV_DIVSHIFT)
extern void iV_Reset(void);
extern void iV_ShutDown(void);

2
lib/ivis_common/ivisdef.h
View File

@ -61,8 +61,6 @@ typedef struct _iSurface {
//*************************************************************************
typedef struct {
int nFrames;
int playbackRate;
int textureWidth;
int textureHeight;
} iTexAnim;

2
lib/ivis_opengl/piedraw.c
View File

@ -213,7 +213,7 @@ static void pie_Draw3DShape2(iIMDShape *shape, int frame, PIELIGHT colour, WZ_DE
if (frame != 0 && pPolys->flags & iV_IMD_TEXANIM)
{
frame %= pPolys->texAnim.nFrames;
frame %= shape->numFrames;
if (frame > 0)
{