physics: fix and refactor unsticking

[xonotic/darkplaces.git] / model_alias.h

diff --git a/model_alias.h b/model_alias.h
index 9b769bda84e43d7cf56e8061ca6b042e101c4803..8f153e555fb818866d3c4f18d3823acdd97ea737 100644 (file)
--- a/model_alias.h
+++ b/model_alias.h
@@ -21,6 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #ifndef MODEL_ALIAS_H
 #define MODEL_ALIAS_H
 
+#include <stddef.h>
+#include "qtypes.h"
 /*
 ==============================================================================
 
@@ -46,7 +48,7 @@ typedef struct daliashdr_s
        int                     numverts;
        int                     numtris;
        int                     numframes;
-       synctype_t      synctype;
+       int                     synctype;
        int                     flags;
        float           size;
 }
@@ -60,7 +62,7 @@ daliashdr_t;
 ========================================================================
 */
 
-// LordHavoc: grabbed this from the Q2 utility source,
+// LadyHavoc: grabbed this from the Q2 utility source,
 // renamed a things to avoid conflicts
 
 #define MD2ALIAS_VERSION       8
@@ -120,7 +122,7 @@ typedef struct md2_s
 
 // 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
@@ -129,7 +131,9 @@ typedef struct md2_s
 // 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;
 
@@ -210,7 +214,7 @@ md3modelheader_t;
 typedef struct aliastag_s
 {
        char name[MD3NAME];
-       matrix4x4_t matrix;
+       float matrixgl[12];
 }
 aliastag_t;
 
@@ -228,5 +232,24 @@ aliasbone_t;
 
 #include "model_psk.h"
 
+#include "model_iqm.h"
+
+// for decoding md3 model latlong vertex normals
+extern float mod_md3_sin[320];
+
+extern struct cvar_s r_skeletal_debugbone;
+extern struct cvar_s r_skeletal_debugbonecomponent;
+extern struct cvar_s r_skeletal_debugbonevalue;
+extern struct cvar_s r_skeletal_debugtranslatex;
+extern struct cvar_s r_skeletal_debugtranslatey;
+extern struct cvar_s r_skeletal_debugtranslatez;
+
+struct model_s;
+struct frameblend_s;
+struct skeleton_s;
+
+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 struct skeleton_s *skeleton, float * RESTRICT bonepose, float * RESTRICT boneposerelative);
+
 #endif