X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=model_alias.h;h=9b769bda84e43d7cf56e8061ca6b042e101c4803;hb=aa150f38ef79b17d32b520bebb5fe5125c7b3ced;hp=36d4e50e027f38764509c18f3816c85c7dd85b9c;hpb=224f9edae92441767654e2c10eb568bb91f86eb1;p=xonotic%2Fdarkplaces.git

diff --git a/model_alias.h b/model_alias.h
index 36d4e50e..9b769bda 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,18 +118,6 @@ 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)
@@ -217,71 +207,26 @@ typedef struct md3modelheader_s
 }
 md3modelheader_t;
 
-// LordHavoc: all quake series 'alias' models (mdl, md2, md3) are converted to this vertex format
-typedef struct aliasvertex_s
+typedef struct aliastag_s
 {
-	// location
-	float origin[3];
-	// surface normal
-	float normal[3];
-	// S texture vector
-	float svector[3];
+	char name[MD3NAME];
+	matrix4x4_t matrix;
 }
-aliasvertex_t;
-
-// this layer is fog (completely specialized behavior)
-#define ALIASLAYER_FOG 1
-// alpha blending
-#define ALIASLAYER_ALPHA 2
-// additive blending
-#define ALIASLAYER_ADD 4
-// 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
-// draw this layer for realtime lighting passes, otherwise don't
-#define ALIASLAYER_DRAW_PER_LIGHT 512
-
-typedef struct aliaslayer_s
+aliastag_t;
+
+typedef struct aliasbone_s
 {
+	char name[MD3NAME];
 	int flags;
-	rtexture_t *texture;
-	rtexture_t *nmap;
+	int parent; // -1 for no parent
 }
-aliaslayer_t;
+aliasbone_t;
 
-// indicates this skin is transparent
-#define ALIASSKIN_TRANSPARENT 1
+#include "model_zymotic.h"
 
-typedef struct aliasskin_s
-{
-	int flags;
-	int num_layers;
-	aliaslayer_t *data_layers;
-}
-aliasskin_t;
+#include "model_dpmodel.h"
 
-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;
-	aliasvertex_t *data_aliasvertex;
-}
-aliasmesh_t;
+#include "model_psk.h"
 
 #endif