add cvars for world erp and cfm; remove pistons for ODE 0.9 support

[xonotic/darkplaces.git] / model_alias.h

diff --git a/model_alias.h b/model_alias.h
index 7466d7cb16431cfc86ea364ff8b9e324e5ea0f2d..6df1e01153f70876d9cc7c3e8f55c87be0a398bb 100644 (file)
--- 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,17 +118,6 @@ 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)
@@ -148,7 +129,9 @@ extern void Mod_AliasInit(void);
 // 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,71 +209,29 @@ 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];
+       char name[MD3NAME];
+       float matrixgl[12];
 }
-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
+aliastag_t;
+
+typedef struct aliasbone_s
 {
+       char name[MD3NAME];
        int flags;
-       rtexture_t *texture;
-       rtexture_t *nmap;
+       int parent; // -1 for no parent
 }
-aliaslayer_t;
+aliasbone_t;
 
-// indicates this skin is transparent
-#define ALIASSKIN_TRANSPARENT 1
+#include "model_zymotic.h"
 
-typedef struct aliasskin_s
-{
-       int flags;
-       int num_layers;
-       aliaslayer_t *data_layers;
-}
-aliasskin_t;
+#include "model_dpmodel.h"
 
-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;
+#include "model_psk.h"
+
+// for decoding md3 model latlong vertex normals
+extern float mod_md3_sin[320];
 
 #endif