X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=player_ragdoll.h;h=6f5a33137a8e5a48ef53b21da64d86b1a21555d7;hb=1fd91b77f23ce1593037e01b9abb62859545b400;hp=789db4c48e731acfd2054ebc6dd058db0bc74ccd;hpb=1b522daa02f28128498b04def4d60b63e590d1f3;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/player_ragdoll.h b/player_ragdoll.h
index 789db4c..6f5a331 100644
--- a/player_ragdoll.h
+++ b/player_ragdoll.h
@@ -33,31 +33,42 @@ struct player_ragdoll{
    rb_constr_swingtwist cone_constraints[32];
    u32                  cone_constraints_count;
 
+   /* TODO: Fix duplicated data */
+   u32 constraint_associations[32][2];
    int shoes[2];
 };
 
-VG_STATIC float k_ragdoll_floatyiness = 20.0f,
+static float k_ragdoll_floatyiness = 20.0f,
                 k_ragdoll_floatydrag  = 1.0f,
-                k_ragdoll_limit_scale = 1.0f;
+                k_ragdoll_limit_scale = 1.0f,
+                k_ragdoll_spring = 127.0f,
+                k_ragdoll_dampening = 15.0f,
+                k_ragdoll_correction = 0.5f,
+                k_ragdoll_angular_drag = 0.08f,
+                k_ragdoll_active_threshold = 5.0f;
 
-VG_STATIC int   k_ragdoll_div = 1,
+static int   k_ragdoll_div = 1,
                 ragdoll_frame = 0,
                 k_ragdoll_debug_collider = 1,
                 k_ragdoll_debug_constraints = 0;
 
-VG_STATIC void player_ragdoll_init(void);
-VG_STATIC void player_init_ragdoll_bone_collider( struct skeleton_bone *bone,
+enum player_die_type {
+   k_player_die_type_generic,
+   k_player_die_type_head,
+   k_player_die_type_feet
+};
+
+static void player_ragdoll_init(void);
+static void player_init_ragdoll_bone_collider( struct skeleton_bone *bone,
                                                   struct ragdoll_part *rp );
-VG_STATIC u32 ragdoll_bone_parent( struct player_ragdoll *rd,
-                                   struct player_avatar *av, u32 bone_id );
-VG_STATIC void player_setup_ragdoll_from_avatar( struct player_ragdoll *rd,
-                                                 struct player_avatar *av );
-VG_STATIC void copy_ragdoll_pose_to_avatar( struct player_ragdoll *rd,
-                                            struct player_avatar *av );
-VG_STATIC void copy_avatar_pose_to_ragdoll( struct player_avatar *av,
-                                            struct player_ragdoll *rd,
-                                            v3f velocity );
-VG_STATIC void player_debug_ragdoll(void);
-VG_STATIC void player_ragdoll_iter( struct player_ragdoll *rd );
+static u32 ragdoll_bone_parent( struct player_ragdoll *rd, u32 bone_id );
+static void setup_ragdoll_from_skeleton( struct skeleton *sk,
+                                         struct player_ragdoll *rd );
+static void copy_ragdoll_pose_to_localplayer( struct player_ragdoll *rd );
+static void copy_localplayer_to_ragdoll( struct player_ragdoll *rd, 
+                                         enum player_die_type type );
+                                          
+static void player_debug_ragdoll(void);
+static void player_ragdoll_iter( struct player_ragdoll *rd );
 
 #endif /* PLAYER_RAGDOLL_H */