X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=model_alias.h;h=61c1099a3a033c8833fd4e39fb6c8e3191bfcb4b;hp=c15d81a3113f441f7be80ae9f87aa4c8439dc0b6;hb=1eb6c9f7bf5f6966b47e25284e1fe3a60751107b;hpb=3c626a98c5ea3971a9a3a06d133c72f63c1386eb

diff --git a/model_alias.h b/model_alias.h
index c15d81a3..61c1099a 100644
--- a/model_alias.h
+++ b/model_alias.h
@@ -32,7 +32,8 @@ Alias models are position independent, so the cache manager can move them.
 
 #include "modelgen.h"
 
-typedef struct {
+typedef struct daliashdr_s
+{
 	int			ident;
 	int			version;
 	vec3_t		scale;
@@ -48,7 +49,8 @@ typedef struct {
 	synctype_t	synctype;
 	int			flags;
 	float		size;
-} daliashdr_t;
+}
+daliashdr_t;
 
 /*
 ========================================================================
@@ -64,19 +66,19 @@ typedef struct {
 #define MD2ALIAS_VERSION	8
 #define	MD2_SKINNAME	64
 
-typedef struct
+typedef struct md2stvert_s
 {
 	short	s;
 	short	t;
 } md2stvert_t;
 
-typedef struct
+typedef struct md2triangle_s
 {
 	short	index_xyz[3];
 	short	index_st[3];
 } md2triangle_t;
 
-typedef struct
+typedef struct md2frame_s
 {
 	float		scale[3];	// multiply byte verts by this
 	float		translate[3];	// then add this
@@ -92,7 +94,7 @@ typedef struct
 // and an integer vertex index.
 
 
-typedef struct
+typedef struct md2_s
 {
 	int			ident;
 	int			version;
@@ -116,13 +118,9 @@ typedef struct
 	int			ofs_end;		// end of file
 } md2_t;
 
-#include "model_zymotic.h"
-
-#include "model_dpmodel.h"
-
 // all md3 ints, floats, and shorts, are little endian, and thus need to be
 // passed through LittleLong/LittleFloat/LittleShort to avoid breaking on
-// bigendian machines (Macs for example)
+// bigendian machines
 #define MD3VERSION 15
 #define MD3NAME 64
 #define MD3FRAMENAME 16
@@ -131,7 +129,9 @@ typedef struct
 // the pitch and yaw are encoded as 8 bits each
 typedef struct md3vertex_s
 {
-	short origin[3], normalpitchyaw;
+	short origin[3];
+	unsigned char pitch;
+	unsigned char yaw;
 }
 md3vertex_t;
 
@@ -212,7 +212,7 @@ md3modelheader_t;
 typedef struct aliastag_s
 {
 	char name[MD3NAME];
-	matrix4x4_t matrix;
+	float matrixgl[12];
 }
 aliastag_t;
 
@@ -224,5 +224,29 @@ typedef struct aliasbone_s
 }
 aliasbone_t;
 
+#include "model_zymotic.h"
+
+#include "model_dpmodel.h"
+
+#include "model_psk.h"
+
+#include "model_iqm.h"
+
+// for decoding md3 model latlong vertex normals
+extern float mod_md3_sin[320];
+
+extern cvar_t r_skeletal_debugbone;
+extern cvar_t r_skeletal_debugbonecomponent;
+extern cvar_t r_skeletal_debugbonevalue;
+extern cvar_t r_skeletal_debugtranslatex;
+extern cvar_t r_skeletal_debugtranslatey;
+extern cvar_t r_skeletal_debugtranslatez;
+
+struct model_s;
+struct frameblend_s;
+
+void *Mod_Skeletal_AnimateVertices_AllocBuffers(size_t nbytes);
+void Mod_Skeletal_BuildTransforms(const struct model_s * RESTRICT model, const struct frameblend_s * RESTRICT frameblend, const skeleton_t *skeleton, float * RESTRICT bonepose, float * RESTRICT boneposerelative);
+
 #endif