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

diff --git a/model_alias.h b/model_alias.h
index ca9127e8..846755ed 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.
 
@@ -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,11 +49,8 @@ typedef struct {
 	synctype_t	synctype;
 	int			flags;
 	float		size;
-} daliashdr_t;
-
-#define	MAXALIASVERTS	4096
-#define	MAXALIASFRAMES	1024
-#define	MAXALIASTRIS	4096
+}
+daliashdr_t;
 
 /*
 ========================================================================
@@ -66,27 +64,21 @@ typedef struct {
 // renamed a things to avoid conflicts
 
 #define MD2ALIAS_VERSION	8
+#define	MD2_SKINNAME	64
 
-#define	MD2MAX_TRIANGLES	4096
-#define MD2MAX_VERTS		4096
-#define MD2MAX_FRAMES		1024
-#define	MD2MAX_SKINNAME	64
-// sanity checking size
-#define MD2MAX_SIZE	(16777216)
-
-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
@@ -102,7 +94,7 @@ typedef struct
 // and an integer vertex index.
 
 
-typedef struct
+typedef struct md2_s
 {
 	int			ident;
 	int			version;
@@ -126,29 +118,20 @@ 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_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
 
-// 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
 {
-	short origin[3], normalpitchyaw;
+	short origin[3];
+	unsigned char pitch;
+	unsigned char yaw;
 }
 md3vertex_t;
 
@@ -188,22 +171,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 +192,46 @@ 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];
+	float matrixgl[12];
+}
+aliastag_t;
+
+typedef struct aliasbone_s
+{
+	char name[MD3NAME];
+	int flags;
+	int parent; // -1 for no parent
+}
+aliasbone_t;
+
+#include "model_zymotic.h"
+
+#include "model_dpmodel.h"
+
+#include "model_psk.h"
+
+// for decoding md3 model latlong vertex normals
+extern float mod_md3_sin[320];
+
 #endif