X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=model_alias.h;h=c3367f8d0f117d318b20dec41bdcf8889d851501;hb=3872243b86efe37ee0f5d91bb8acd5e03c280947;hp=c367e525cb82a86efa5d07dc08b7f0453b766332;hpb=f5a4b82533115030947726519e70b51d64f573da;p=xonotic%2Fdarkplaces.git

diff --git a/model_alias.h b/model_alias.h
index c367e525..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: mdl, md2 and md3 models are converted to the same internal format
-#define ALIASTYPE_ALIAS 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);
 
@@ -226,71 +213,25 @@ 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];
-}
-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
-{
-	int flags;
-	rtexture_t *texture;
-	rtexture_t *nmap;
+	char name[MD3NAME];
+	matrix4x4_t matrix;
 }
-aliaslayer_t;
+aliastag_t;
 
-// indicates this skin is transparent
-#define ALIASSKIN_TRANSPARENT 1
-
-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_elements;
-	int *data_neighbors;
-	float *data_texcoords;
-	aliasvertex_t *data_vertices;
-}
-aliasmesh_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