diff options
| author | Thilo Schulz <arny@ats.s.bawue.de> | 2011-06-11 20:20:30 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-09 22:41:25 +0000 |
| commit | 056e5746e2821139c339c2b666fc30509b4967c9 (patch) | |
| tree | 2a699e126deb5f57164188572453c85a163cdbdb /src/renderer | |
| parent | fefb9162a9b4a02df9a4e887d350a2064f761b9f (diff) | |
Fix forgotten IQM2 support in iqm.h, patch by Zack Middleton
Diffstat (limited to 'src/renderer')
| -rw-r--r-- | src/renderer/iqm.h | 8 | ||||
| -rw-r--r-- | src/renderer/tr_model_iqm.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/renderer/iqm.h b/src/renderer/iqm.h index e487ef49..ab2247ac 100644 --- a/src/renderer/iqm.h +++ b/src/renderer/iqm.h @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define __IQM_H__ #define IQM_MAGIC "INTERQUAKEMODEL" -#define IQM_VERSION 1 +#define IQM_VERSION 2 #define IQM_MAX_JOINTS 128 @@ -86,15 +86,15 @@ typedef struct iqmjoint { unsigned int name; int parent; - float translate[3], rotate[3], scale[3]; + float translate[3], rotate[4], scale[3]; } iqmJoint_t; typedef struct iqmpose { int parent; unsigned int mask; - float channeloffset[9]; - float channelscale[9]; + float channeloffset[10]; + float channelscale[10]; } iqmPose_t; typedef struct iqmanim diff --git a/src/renderer/tr_model_iqm.c b/src/renderer/tr_model_iqm.c index 76f8c14c..0e4672a1 100644 --- a/src/renderer/tr_model_iqm.c +++ b/src/renderer/tr_model_iqm.c @@ -726,7 +726,7 @@ R_ComputeIQMFogNum int R_ComputeIQMFogNum( iqmData_t *data, trRefEntity_t *ent ) { int i, j; fog_t *fog; - vec_t *bounds; + const vec_t *bounds; const vec_t defaultBounds[6] = { -8, -8, -8, 8, 8, 8 }; vec3_t diag, center; vec3_t localOrigin; |