X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=model_alias.h;h=935bd5467697dbe5d9fef4ba5fc5a050ab61d21c;hb=0af9cf1a9e956711edbee4b8710a458dc532985b;hp=4d30cdaee3c9c1e6ef580216731a10f391921127;hpb=e4b3858e7aca0ead91be1d8f675db084d025abad;p=xonotic%2Fdarkplaces.git diff --git a/model_alias.h b/model_alias.h index 4d30cdae..935bd546 100644 --- a/model_alias.h +++ b/model_alias.h @@ -79,19 +79,6 @@ typedef struct { float size; } daliashdr_t; -typedef struct -{ - vec3_t scale; - vec3_t scale_origin; - int numverts; - int numtris; - int numframes; - int numposes; - int texdata; // LordHavoc: texture coordinate array - int posedata; // LordHavoc: vertex data for all the poses - int tridata; // LordHavoc: vertex indices for the triangles -} maliashdr_t; - #define MAXALIASVERTS 4096 #define MAXALIASFRAMES 1024 #define MAXALIASTRIS 4096 @@ -107,7 +94,6 @@ typedef struct // LordHavoc: grabbed this from the Q2 utility source, // renamed a things to avoid conflicts -#define MD2IDALIASHEADER (('2'<<24)+('P'<<16)+('D'<<8)+'I') #define MD2ALIAS_VERSION 8 #define MD2MAX_TRIANGLES 4096 @@ -134,17 +120,8 @@ typedef struct float scale[3]; // multiply byte verts by this float translate[3]; // then add this char name[16]; // frame name from grabbing - trivertx_t verts[1]; // variable sized } md2frame_t; -// must match md2frame_t, this is just used for sizeof() -typedef struct -{ - float scale[3]; // multiply byte verts by this - float translate[3]; // then add this -} md2framesize_t; - - // the glcmd format: // a positive integer starts a tristrip command, followed by that many // vertex structures. @@ -174,28 +151,17 @@ typedef struct int ofs_st; // byte offset from start for stverts int ofs_tris; // offset for dtriangles int ofs_frames; // offset for first frame - int ofs_glcmds; + int ofs_glcmds; int ofs_end; // end of file } md2_t; -typedef struct -{ - int framesize; // byte size of each frame - - int num_skins; - int num_xyz; - int num_st; // greater than num_xyz for seams - int num_tris; - int num_glcmds; // dwords in strip/fan command list - int num_frames; - - int ofs_tris; // offset for dtriangles - int ofs_frames; // offset for first frame - int ofs_glcmds; -} md2mem_t; - #define ALIASTYPE_MDL 1 #define ALIASTYPE_MD2 2 #define ALIASTYPE_ZYM 3 -#include "model_zymotic.h" \ No newline at end of file +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"