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 2b69fac964f35d615b0659c1d349e7f8b342bbab..6df1e01153f70876d9cc7c3e8f55c87be0a398bb 100644 (file)
--- a/model_alias.h
+++ b/model_alias.h
@@ -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,7 +49,8 @@ typedef struct {
        synctype_t      synctype;
        int                     flags;
        float           size;
-} daliashdr_t;
+}
+daliashdr_t;
 
 /*
 ========================================================================
@@ -64,19 +66,19 @@ typedef struct {
 #define MD2ALIAS_VERSION       8
 #define        MD2_SKINNAME    64
 
-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
@@ -92,7 +94,7 @@ typedef struct
 // and an integer vertex index.
 
 
-typedef struct
+typedef struct md2_s
 {
        int                     ident;
        int                     version;
@@ -116,18 +118,6 @@ typedef struct
        int                     ofs_end;                // end of file
 } md2_t;
 
-extern void Mod_IDP0_Load(struct model_s *mod, void *buffer);
-extern void Mod_IDP2_Load(struct model_s *mod, void *buffer);
-extern void Mod_IDP3_Load(struct model_s *mod, void *buffer);
-extern void Mod_ZYMOTICMODEL_Load(struct model_s *mod, void *buffer);
-extern void Mod_DARKPLACESMODEL_Load(struct model_s *mod, void *buffer);
-
-extern void Mod_AliasInit(void);
-
-#include "model_zymotic.h"
-
-#include "model_dpmodel.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)
@@ -139,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;
 
@@ -220,7 +212,7 @@ md3modelheader_t;
 typedef struct aliastag_s
 {
        char name[MD3NAME];
-       matrix4x4_t matrix;
+       float matrixgl[12];
 }
 aliastag_t;
 
@@ -232,10 +224,14 @@ typedef struct aliasbone_s
 }
 aliasbone_t;
 
-struct frameblend_s;
-void Mod_Alias_GetMesh_Vertex3f(const struct model_s *model, const struct frameblend_s *frameblend, const struct surfmesh_s *mesh, float *out3f);
-int Mod_Alias_GetTagMatrix(const struct model_s *model, int poseframe, int tagindex, matrix4x4_t *outmatrix);
-int Mod_Alias_GetTagIndexForName(const struct model_s *model, unsigned int skin, const char *tagname);
+#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