[quake3-commits] r2018 - trunk/code/renderer

[DONOTREPLY at icculus.org]

Author: thilo
Date: 2011-06-11 16:20:30 -0400 (Sat, 11 Jun 2011)
New Revision: 2018

Modified:
   trunk/code/renderer/iqm.h
   trunk/code/renderer/tr_model_iqm.c
Log:
Fix forgotten IQM2 support in iqm.h, patch by Zack Middleton


Modified: trunk/code/renderer/iqm.h
===================================================================
--- trunk/code/renderer/iqm.h	2011-06-11 20:18:16 UTC (rev 2017)
+++ trunk/code/renderer/iqm.h	2011-06-11 20:20:30 UTC (rev 2018)
@@ -22,7 +22,7 @@
 #define __IQM_H__
 
 #define IQM_MAGIC "INTERQUAKEMODEL"
-#define IQM_VERSION 1
+#define IQM_VERSION 2
 
 #define	IQM_MAX_JOINTS		128
 
@@ -86,15 +86,15 @@
 {
     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

Modified: trunk/code/renderer/tr_model_iqm.c
===================================================================
--- trunk/code/renderer/tr_model_iqm.c	2011-06-11 20:18:16 UTC (rev 2017)
+++ trunk/code/renderer/tr_model_iqm.c	2011-06-11 20:20:30 UTC (rev 2018)
@@ -726,7 +726,7 @@
 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;