X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=model_alias.h;h=f8c81f7908aecf4e1326faed00684f35df0f7283;hb=a9f8b6b84ed031f6fb66a43fe35cf7ecb55e988e;hp=f3615a6b0101836b44d7db9ef34bdd2a03506ed6;hpb=4512baff458796ff63522a2ee8af3ac22a996195;p=xonotic%2Fdarkplaces.git

diff --git a/model_alias.h b/model_alias.h
index f3615a6b..f8c81f79 100644
--- a/model_alias.h
+++ b/model_alias.h
@@ -116,13 +116,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_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);
 
@@ -253,22 +249,54 @@ typedef struct aliasskin_s
 }
 aliasskin_t;
 
+typedef struct aliasvertexboneweight_s
+{
+	unsigned int vertexindex;
+	unsigned int boneindex;
+	float origin[3];
+	float weight;
+}
+aliasvertexboneweight_t;
+
 typedef struct aliasmesh_s
 {
+	// skins to choose from (indexed by entity skin)
 	int num_skins;
-	int num_triangles;
-	int num_frames;
-	int num_vertices;
 	aliasskin_t *data_skins;
+
+	// triangles comprising the mesh
+	int num_triangles;
 	int *data_element3i;
 	int *data_neighbor3i;
+
+	// skin texcoords do not change
+	int num_vertices;
 	float *data_texcoord2f;
-	float *data_aliasvertex3f;
-	float *data_aliassvector3f;
-	float *data_aliastvector3f;
-	float *data_aliasnormal3f;
+
+	// morph blending, these are zero if model is skeletal
+	int num_morphframes;
+	float *data_morphvertex3f;
+
+	// skeletal blending, these are zero if model is morph
+	int num_vertexboneweights;
+	aliasvertexboneweight_t *data_vertexboneweights;
 }
 aliasmesh_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;
+
 #endif