added protocol.o

[xonotic/darkplaces.git] / model_alias.h

diff --git a/model_alias.h b/model_alias.h
index a00d41e1036b0393c661489772f85fba11fa363e..4d30cdaee3c9c1e6ef580216731a10f391921127 100644 (file)
--- a/model_alias.h
+++ b/model_alias.h
@@ -29,6 +29,7 @@ Alias models are position independent, so the cache manager can move them.
 
 #include "modelgen.h"
 
+/*
 typedef struct
 {
        int                                     firstpose;
@@ -54,19 +55,12 @@ typedef struct
        maliasgroupframedesc_t  frames[1];
 } maliasgroup_t;
 
-// !!! if this is changed, it must be changed in asm_draw.h too !!!
 typedef struct mtriangle_s {
        int                                     facesfront;
        int                                     vertindex[3];
 } mtriangle_t;
+*/
 
-// LordHavoc: new vertex format
-typedef struct {
-       byte v[3]; // location
-       signed char n[3]; // surface normal for lighting *127.0
-} trivert2;
-
-#define        MAX_SKINS       32
 typedef struct {
        int                     ident;
        int                     version;
@@ -83,30 +77,25 @@ typedef struct {
        synctype_t      synctype;
        int                     flags;
        float           size;
+} daliashdr_t;
 
-       int                                     numposes;
-       int                                     posedata;       // LordHavoc: numposes*numverts*trivert2
-       int                                     frontfaces; // LordHavoc: how many front faces
-       int                                     backfaces; // LordHavoc: how many back faces
-//     int                                     poseverts;
-//     int                                     posedata;       // numposes*poseverts trivert_t
-//     int                                     commands;       // gl command list with embedded s/t
-       int                                     texcoords;      // LordHavoc: texture coordinates
-       int                                     vertindices;    // LordHavoc: vertex numbers
-       int                                     gl_texturenum[MAX_SKINS][4];
-       int                                     texels[MAX_SKINS];      // only for player skins
-       maliasframedesc_t       frames[1];      // variable sized
-} aliashdr_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
 
-extern aliashdr_t      *pheader;
-//extern       stvert_t        stverts[MAXALIASVERTS];
-//extern       mtriangle_t     triangles[MAXALIASTRIS];
-//extern       trivertx_t      *poseverts[MAXALIASFRAMES];
-
 /*
 ========================================================================
 
@@ -124,7 +113,6 @@ extern      aliashdr_t      *pheader;
 #define        MD2MAX_TRIANGLES        4096
 #define MD2MAX_VERTS           4096
 #define MD2MAX_FRAMES          1024
-#define MD2MAX_SKINS   32
 #define        MD2MAX_SKINNAME 64
 // sanity checking size
 #define MD2MAX_SIZE    (16777216)
@@ -146,16 +134,15 @@ 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[0];       // variable sized
+       trivertx_t      verts[1];       // variable sized
 } md2frame_t;
 
-// LordHavoc: memory representation is different than disk
+// 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
-       trivert2        verts[0];       // variable sized
-} md2memframe_t;
+} md2framesize_t;
 
 
 // the glcmd format:
@@ -205,9 +192,10 @@ typedef struct
        int                     ofs_tris;               // offset for dtriangles
        int                     ofs_frames;             // offset for first frame
        int                     ofs_glcmds;     
-
-       int                     gl_texturenum[MAX_SKINS];
 } md2mem_t;
 
 #define ALIASTYPE_MDL 1
 #define ALIASTYPE_MD2 2
+#define ALIASTYPE_ZYM 3
+
+#include "model_zymotic.h"
\ No newline at end of file