X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=model_alias.h;h=61c1099a3a033c8833fd4e39fb6c8e3191bfcb4b;hp=be50dcd2fd50f595a73678c99e1a8ebff3e4b232;hb=2075ae43356d724bae305ce8fd36ea570718b14a;hpb=66ae08799675241ffa3cc3bcaa211fddcd63387c

diff --git a/model_alias.h b/model_alias.h
index be50dcd2..61c1099a 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;
 
@@ -226,14 +209,44 @@ 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
 {
-	short origin[3];
-	signed char normal[3];
-	signed char svector[3];
+	char name[MD3NAME];
+	float matrixgl[12];
+}
+aliastag_t;
+
+typedef struct aliasbone_s
+{
+	char name[MD3NAME];
+	int flags;
+	int parent; // -1 for no parent
 }
-aliasvertex_t;
+aliasbone_t;
+
+#include "model_zymotic.h"
+
+#include "model_dpmodel.h"
+
+#include "model_psk.h"
+
+#include "model_iqm.h"
+
+// for decoding md3 model latlong vertex normals
+extern float mod_md3_sin[320];
+
+extern cvar_t r_skeletal_debugbone;
+extern cvar_t r_skeletal_debugbonecomponent;
+extern cvar_t r_skeletal_debugbonevalue;
+extern cvar_t r_skeletal_debugtranslatex;
+extern cvar_t r_skeletal_debugtranslatey;
+extern cvar_t r_skeletal_debugtranslatez;
+
+struct model_s;
+struct frameblend_s;
+
+void *Mod_Skeletal_AnimateVertices_AllocBuffers(size_t nbytes);
+void Mod_Skeletal_BuildTransforms(const struct model_s * RESTRICT model, const struct frameblend_s * RESTRICT frameblend, const skeleton_t *skeleton, float * RESTRICT bonepose, float * RESTRICT boneposerelative);
 
 #endif