X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=model_alias.h;h=c3367f8d0f117d318b20dec41bdcf8889d851501;hb=cd1c1dd2fcd794bbe6078e58ed25c58d2e6d18b2;hp=ca9127e875757912116980490534b2fcfcf63291;hpb=3083d6a99f38265ad455a7ae7a163b81d1aee272;p=xonotic%2Fdarkplaces.git

diff --git a/model_alias.h b/model_alias.h
index ca9127e8..c3367f8d 100644
--- a/model_alias.h
+++ b/model_alias.h
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -50,10 +50,6 @@ typedef struct {
 	float		size;
 } daliashdr_t;
 
-#define	MAXALIASVERTS	4096
-#define	MAXALIASFRAMES	1024
-#define	MAXALIASTRIS	4096
-
 /*
 ========================================================================
 
@@ -66,13 +62,7 @@ typedef struct {
 // renamed a things to avoid conflicts
 
 #define MD2ALIAS_VERSION	8
-
-#define	MD2MAX_TRIANGLES	4096
-#define MD2MAX_VERTS		4096
-#define MD2MAX_FRAMES		1024
-#define	MD2MAX_SKINNAME	64
-// sanity checking size
-#define MD2MAX_SIZE	(16777216)
+#define	MD2_SKINNAME	64
 
 typedef struct
 {
@@ -80,7 +70,7 @@ typedef struct
 	short	t;
 } md2stvert_t;
 
-typedef struct 
+typedef struct
 {
 	short	index_xyz[3];
 	short	index_st[3];
@@ -126,12 +116,9 @@ typedef struct
 	int			ofs_end;		// end of file
 } md2_t;
 
-// LordHavoc: Q1 and Q2 models are converted to the same internal format
-#define ALIASTYPE_MDLMD2 1
-#define ALIASTYPE_ZYM 2
-
-extern void Mod_LoadAliasModel (struct model_s *mod, void *buffer);
-extern void Mod_LoadQ2AliasModel (struct model_s *mod, void *buffer);
+extern void Mod_IDP0_Load(struct model_s *mod, void *buffer);
+extern void Mod_IDP2_Load(struct model_s *mod, void *buffer);
+extern void Mod_IDP3_Load(struct model_s *mod, void *buffer);
 
 extern void Mod_AliasInit(void);
 
@@ -144,7 +131,7 @@ extern void Mod_AliasInit(void);
 #define MD3NAME 64
 #define MD3FRAMENAME 16
 
-// the origin is at 1/16th scale
+// the origin is at 1/64th scale
 // the pitch and yaw are encoded as 8 bits each
 typedef struct md3vertex_s
 {
@@ -188,22 +175,20 @@ md3shader_t;
 //
 // to find the next mesh in the file, you must go to lump_end, which puts you
 // at the beginning of the next mesh
-//
-// the comments after each field are example values from 4 models I examined
 typedef struct md3mesh_s
 {
 	char identifier[4]; // "IDP3"
 	char name[MD3NAME];
-	int num_unknown1; // 0 0 0 0
-	int num_frames; // 1 9 1 138
-	int num_shaders; // 1 1 1 1
-	int num_vertices; // 68 275 346 42
-	int num_triangles; // 96 324 324 55
-	int lump_elements; // 108 108 108 176
-	int lump_shaders; // 1260 3996 3996 108
-	int lump_texcoords; // 1328 4064 4064 836
-	int lump_framevertices; // 1872 6264 6832 1172
-	int lump_end; // 2416 26064 9600 47540
+	int flags;
+	int num_frames;
+	int num_shaders;
+	int num_vertices;
+	int num_triangles;
+	int lump_elements;
+	int lump_shaders;
+	int lump_texcoords;
+	int lump_framevertices;
+	int lump_end;
 }
 md3mesh_t;
 
@@ -211,24 +196,42 @@ md3mesh_t;
 //
 // note that the lump_ offsets in this struct are relative to the beginning
 // of the header struct (which is the beginning of the file)
-//
-// the comments after each field are example values from 4 models I examined
 typedef struct md3modelheader_s
 {
 	char identifier[4]; // "IDP3"
-	int version; // 15 15 15 15
-	char name[MD3NAME]; // "eyes" "v_axe" "armor" "models/players/brandon/brandon.md3"
-	int unknown1; // 0 0 0 0
-	int num_frames; // 1 9 1 138
-	int num_tags; // 0 0 3 0
-	int num_meshes; // 1 1 1 3
-	int unknown2; // 0 0 0 0
-	int lump_frameinfo; // 108 108 108 108
-	int lump_tags; // 164 612 164 7836
-	int lump_meshes; // 164 612 164 54204
-	int lump_end; // 2580 26676 9764 219904
+	int version; // 15
+	char name[MD3NAME];
+	int flags;
+	int num_frames;
+	int num_tags;
+	int num_meshes;
+	int num_skins;
+	int lump_frameinfo;
+	int lump_tags;
+	int lump_meshes;
+	int lump_end;
 }
 md3modelheader_t;
 
+typedef struct aliastag_s
+{
+	char name[MD3NAME];
+	matrix4x4_t matrix;
+}
+aliastag_t;
+
+typedef struct aliasbone_s
+{
+	char name[MD3NAME];
+	int flags;
+	int parent; // -1 for no parent
+}
+aliasbone_t;
+
+struct frameblend_s;
+void Mod_Alias_GetMesh_Vertex3f(const struct model_s *model, const struct frameblend_s *frameblend, const struct surfmesh_s *mesh, float *out3f);
+int Mod_Alias_GetTagMatrix(const struct model_s *model, int poseframe, int tagindex, matrix4x4_t *outmatrix);
+int Mod_Alias_GetTagIndexForName(const struct model_s *model, unsigned int skin, const char *tagname);
+
 #endif