X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=model_alias.h;h=8f153e555fb818866d3c4f18d3823acdd97ea737;hp=f3615a6b0101836b44d7db9ef34bdd2a03506ed6;hb=727c2cbec73fbd199cef8e78c5403ae607f56347;hpb=4512baff458796ff63522a2ee8af3ac22a996195

diff --git a/model_alias.h b/model_alias.h
index f3615a6b..8f153e55 100644
--- a/model_alias.h
+++ b/model_alias.h
@@ -21,6 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef MODEL_ALIAS_H
 #define MODEL_ALIAS_H
 
+#include <stddef.h>
+#include "qtypes.h"
 /*
 ==============================================================================
 
@@ -32,7 +34,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;
@@ -45,10 +48,11 @@ typedef struct {
 	int			numverts;
 	int			numtris;
 	int			numframes;
-	synctype_t	synctype;
+	int			synctype;
 	int			flags;
 	float		size;
-} daliashdr_t;
+}
+daliashdr_t;
 
 /*
 ========================================================================
@@ -58,25 +62,25 @@ typedef struct {
 ========================================================================
 */
 
-// LordHavoc: grabbed this from the Q2 utility source,
+// LadyHavoc: grabbed this from the Q2 utility source,
 // renamed a things to avoid conflicts
 
 #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 +96,7 @@ typedef struct
 // and an integer vertex index.
 
 
-typedef struct
+typedef struct md2_s
 {
 	int			ident;
 	int			version;
@@ -116,21 +120,9 @@ typedef struct
 	int			ofs_end;		// end of file
 } md2_t;
 
-// LordHavoc: mdl, md2 and md3 models are converted to the same internal format
-#define ALIASTYPE_ALIAS 1
-#define ALIASTYPE_ZYM 2
-
-extern void Mod_LoadQ1AliasModel (struct model_s *mod, void *buffer);
-extern void Mod_LoadQ2AliasModel (struct model_s *mod, void *buffer);
-extern void Mod_LoadQ3AliasModel (struct model_s *mod, void *buffer);
-
-extern void Mod_AliasInit(void);
-
-#include "model_zymotic.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
@@ -139,7 +131,9 @@ extern void Mod_AliasInit(void);
 // 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;
 
@@ -217,58 +211,45 @@ typedef struct md3modelheader_s
 }
 md3modelheader_t;
 
-// this layer is fog (completely specialized behavior, automatic NODRAW_IF_NOTFOGGED behavior)
-#define ALIASLAYER_FOG 1
-// apply diffuse lighting
-#define ALIASLAYER_DIFFUSE 8
-// apply specular lighting
-#define ALIASLAYER_SPECULAR 16
-// tint with pants color
-#define ALIASLAYER_COLORMAP_PANTS 32
-// tint with shirt color
-#define ALIASLAYER_COLORMAP_SHIRT 64
-// don't draw this layer if colormap is not used
-#define ALIASLAYER_NODRAW_IF_NOTCOLORMAPPED 128
-// don't draw this layer if colormap is used
-#define ALIASLAYER_NODRAW_IF_COLORMAPPED 256
-// ignore NODRAW flags on this layer only if all previous layers were skipped
-#define ALIASLAYER_FORCEDRAW_IF_FIRSTPASS 512
-
-typedef struct aliaslayer_s
+typedef struct aliastag_s
 {
-	int flags;
-	rtexture_t *texture;
-	rtexture_t *nmap;
+	char name[MD3NAME];
+	float matrixgl[12];
 }
-aliaslayer_t;
-
-// indicates this skin is transparent
-#define ALIASSKIN_TRANSPARENT 1
+aliastag_t;
 
-typedef struct aliasskin_s
+typedef struct aliasbone_s
 {
+	char name[MD3NAME];
 	int flags;
-	int num_layers;
-	aliaslayer_t *data_layers;
+	int parent; // -1 for no parent
 }
-aliasskin_t;
+aliasbone_t;
 
-typedef struct aliasmesh_s
-{
-	int num_skins;
-	int num_triangles;
-	int num_frames;
-	int num_vertices;
-	aliasskin_t *data_skins;
-	int *data_element3i;
-	int *data_neighbor3i;
-	float *data_texcoord2f;
-	float *data_aliasvertex3f;
-	float *data_aliassvector3f;
-	float *data_aliastvector3f;
-	float *data_aliasnormal3f;
-}
-aliasmesh_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 struct cvar_s r_skeletal_debugbone;
+extern struct cvar_s r_skeletal_debugbonecomponent;
+extern struct cvar_s r_skeletal_debugbonevalue;
+extern struct cvar_s r_skeletal_debugtranslatex;
+extern struct cvar_s r_skeletal_debugtranslatey;
+extern struct cvar_s r_skeletal_debugtranslatez;
+
+struct model_s;
+struct frameblend_s;
+struct skeleton_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 struct skeleton_s *skeleton, float * RESTRICT bonepose, float * RESTRICT boneposerelative);
 
 #endif