ubergames/ioef
0
0
Fork 0
mirror of https://github.com/UberGames/ioef.git synced 2025-06-01 17:52:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix forgotten IQM2 support in iqm.h, patch by Zack Middleton

Browse source
This commit is contained in:
Thilo Schulz 2011-06-11 20:20:30 +00:00
parent fa3b3978f6
commit c2b7f5173f
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
code/renderer/iqm.h
View file

@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#define __IQM_H__ #define __IQM_H__
#define IQM_MAGIC "INTERQUAKEMODEL" #define IQM_MAGIC "INTERQUAKEMODEL"
#define IQM_VERSION 1 #define IQM_VERSION 2
#define IQM_MAX_JOINTS 128 #define IQM_MAX_JOINTS 128
@ -86,15 +86,15 @@ typedef struct iqmjoint
{ {
unsigned int name; unsigned int name;
int parent; int parent;
float translate[3], rotate[3], scale[3]; float translate[3], rotate[4], scale[3];
} iqmJoint_t; } iqmJoint_t;
typedef struct iqmpose typedef struct iqmpose
{ {
int parent; int parent;
unsigned int mask; unsigned int mask;
float channeloffset[9]; float channeloffset[10];
float channelscale[9]; float channelscale[10];
} iqmPose_t; } iqmPose_t;
typedef struct iqmanim typedef struct iqmanim

2
code/renderer/tr_model_iqm.c
View file

@ -726,7 +726,7 @@ R_ComputeIQMFogNum
int R_ComputeIQMFogNum( iqmData_t *data, trRefEntity_t *ent ) { int R_ComputeIQMFogNum( iqmData_t *data, trRefEntity_t *ent ) {
int i, j; int i, j;
fog_t *fog; fog_t *fog;
vec_t *bounds; const vec_t *bounds;
const vec_t defaultBounds[6] = { -8, -8, -8, 8, 8, 8 }; const vec_t defaultBounds[6] = { -8, -8, -8, 8, 8, 8 };
vec3_t diag, center; vec3_t diag, center;
vec3_t localOrigin; vec3_t localOrigin;