Fix engine not starting on Windows if linked against SDL > 2.0.5

[xonotic/darkplaces.git] / model_alias.h

diff --git a/model_alias.h b/model_alias.h
index 338e2dd95dc6898565414f3d899e1e85cc7955bb..61c1099a3a033c8833fd4e39fb6c8e3191bfcb4b 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,17 +118,9 @@ 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_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
@@ -135,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;
 
@@ -213,51 +209,10 @@ typedef struct md3modelheader_s
 }
 md3modelheader_t;
 
-typedef struct aliasvertexboneweight_s
-{
-       unsigned int vertexindex;
-       unsigned int boneindex;
-       float origin[3];
-       float weight;
-}
-aliasvertexboneweight_t;
-
-typedef struct aliasmesh_s
-{
-       // skins to choose from (indexed by entity skin)
-       int num_skins;
-       texture_t *data_skins;
-
-       // triangles comprising the mesh
-       int num_triangles;
-       int *data_element3i;
-       int *data_neighbor3i;
-
-       // skin texcoords do not change
-       int num_vertices;
-       float *data_texcoord2f;
-
-       // morph blending, these are zero if model is skeletal
-       int num_morphframes;
-       float *data_morphvertex3f;
-
-       // base frame (frame zero typically)
-       // since most models do not animate, caching the base frame helps
-       float *data_basevertex3f;
-       float *data_basesvector3f;
-       float *data_basetvector3f;
-       float *data_basenormal3f;
-
-       // skeletal blending, these are zero if model is morph
-       int num_vertexboneweights;
-       aliasvertexboneweight_t *data_vertexboneweights;
-}
-aliasmesh_t;
-
 typedef struct aliastag_s
 {
        char name[MD3NAME];
-       matrix4x4_t matrix;
+       float matrixgl[12];
 }
 aliastag_t;
 
@@ -269,8 +224,29 @@ typedef struct aliasbone_s
 }
 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_Alias_GetMesh_Vertex3f(const struct model_s *model, const struct frameblend_s *frameblend, const struct aliasmesh_s *mesh, float *out3f);
+
+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