X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=progs.h;h=fedd19e554cd66501557b61766a0b29b1c8bf5d2;hb=e1059360b46e2c4ee50394441a696a5af8b285e4;hp=cf0239bfca46bb0ead7adc9241b8e698a8067f6e;hpb=f68ef7b22979928fb6b8d2ba6b28e14c4caeb7c2;p=xonotic%2Fdarkplaces.git

diff --git a/progs.h b/progs.h
index cf0239bf..fedd19e5 100644
--- a/progs.h
+++ b/progs.h
@@ -25,6 +25,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define ENTITYGRIDAREAS 16
 #define MAX_ENTITYCLUSTERS 16
 
+#define JOINTTYPE_POINT 1
+#define JOINTTYPE_HINGE 2
+#define JOINTTYPE_SLIDER 3
+#define JOINTTYPE_UNIVERSAL 4
+#define JOINTTYPE_HINGE2 5
+#define JOINTTYPE_FIXED -1
+
 typedef struct edict_engineprivate_s
 {
 	// true if this edict is unused
@@ -69,10 +76,15 @@ typedef struct edict_engineprivate_s
 	vec3_t moved_from;
 	vec3_t moved_fromangles;
 
+	framegroupblend_t framegroupblend[MAX_FRAMEGROUPBLENDS];
+	frameblend_t frameblend[MAX_FRAMEBLENDS];
+	skeleton_t skeleton;
+
 	// physics parameters
 	qboolean ode_physics;
 	void *ode_body;
 	void *ode_geom;
+	void *ode_joint;
 	float *ode_vertex3f;
 	int *ode_element3i;
 	int ode_numvertices;
@@ -80,10 +92,23 @@ typedef struct edict_engineprivate_s
 	vec3_t ode_mins;
 	vec3_t ode_maxs;
 	vec_t ode_mass;
+	vec3_t ode_origin;
+	vec3_t ode_velocity;
+	vec3_t ode_angles;
+	vec3_t ode_avelocity;
+	qboolean ode_gravity;
 	int ode_modelindex;
 	vec_t ode_movelimit; // smallest component of (maxs[]-mins[])
 	matrix4x4_t ode_offsetmatrix;
 	matrix4x4_t ode_offsetimatrix;
+	int ode_joint_type;
+	int ode_joint_enemy;
+	int ode_joint_aiment;
+	vec3_t ode_joint_origin; // joint anchor
+	vec3_t ode_joint_angles; // joint axis
+	vec3_t ode_joint_velocity; // second joint axis
+	vec3_t ode_joint_movedir; // parameters
+	void *ode_massbuf;
 }
 edict_engineprivate_t;