Merge remote-tracking branch 'origin/master' into samual/notification_rewrite

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / player_skeleton.qc

diff --git a/qcsrc/client/player_skeleton.qc b/qcsrc/client/player_skeleton.qc
index a731d3a1a3ffeda1f5ded7956c5eb9bc065539c8..7784fc1f693fe2bb54674220bb47c4ace5f57162 100644 (file)
--- a/qcsrc/client/player_skeleton.qc
+++ b/qcsrc/client/player_skeleton.qc
@@ -8,6 +8,7 @@
 
 void skeleton_loadinfo(entity e)
 {
+       float i;
        if(e.skeleton_info_modelindex == e.modelindex && e.skeleton_info_skin == e.skin)
                return;
        e.bone_upperbody = 0;
@@ -16,18 +17,27 @@ void skeleton_loadinfo(entity e)
                e.bone_weapon = gettagindex(e, "tag_weapon");
        if(!e.bone_weapon)
                e.bone_weapon = gettagindex(e, "bip01 r hand");
-       e.bone_aim = 0;
+       for(i = 0; i < MAX_AIM_BONES; ++i)
+       {
+               e.(bone_aim[i]) = 0;
+               e.(bone_aimweight[i]) = 0;
+       }
        e.fixbone = 0;
        if(get_model_parameters(e.model, e.skin))
        {
                if(get_model_parameters_bone_upperbody)
                        e.bone_upperbody = gettagindex(e, get_model_parameters_bone_upperbody);
-               if(get_model_parameters_bone_weapon)
-                       e.bone_weapon = gettagindex(e, get_model_parameters_bone_weapon);
-               if(get_model_parameters_bone_aim)
-                       e.bone_aim = gettagindex(e, get_model_parameters_bone_aim);
                if(e.bone_upperbody)
                        e.fixbone = get_model_parameters_fixbone;
+               if(get_model_parameters_bone_weapon)
+                       e.bone_weapon = gettagindex(e, get_model_parameters_bone_weapon);
+               for(i = 0; i < MAX_AIM_BONES; ++i)
+               {
+                       if(get_model_parameters_bone_aim[i])
+                               e.(bone_aim[i]) = gettagindex(e, get_model_parameters_bone_aim[i]);
+                       if(e.bone_aim[i])
+                               e.(bone_aimweight[i]) = get_model_parameters_bone_aimweight[i];
+               }
        }
        else
                dprint("No model parameters for ", e.model, "\n");
@@ -59,17 +69,24 @@ void skeleton_markbones(entity e)
        }
 }
 
-void skeleton_fixbone(entity e, vector ang)
+void skel_set_boneabs(float s, float bone, vector absorg)
 {
-       if(!e.bone_upperbody)
-               return;
-       float s = e.skeletonindex;
+       vector absang = fixedvectoangles2(v_forward, v_up);
+
+       vector parentorg = skel_get_boneabs(s, skel_get_boneparent(s, bone));
+       vector parentang = fixedvectoangles2(v_forward, v_up);
+
+       vector relang = AnglesTransform_LeftDivide(parentang, absang);
+       vector relorg = AnglesTransform_Apply(AnglesTransform_Invert(parentang), absorg - parentorg);
 
-       skel_get_boneabs(s, e.bone_upperbody);
-       vector ang_cur = fixedvectoangles2(v_forward, v_up);
-       vector fix = AnglesTransform_LeftDivide(ang_cur, ang);
-       fixedmakevectors(fix);
-       skel_mul_bone(s, e.bone_upperbody, '0 0 0');
+       fixedmakevectors(relang);
+       skel_set_bone(s, bone, relorg);
+
+       /*
+       vector neworg = skel_get_boneabs(s, bone);
+       print(sprintf("ANG: want: %v, got: %v\n", absang, fixedvectoangles2(v_forward, v_up)));
+       print(sprintf("ORG: want: %v, got: %v\n", absorg, neworg));
+       */
 }
 
 void free_skeleton_from_frames(entity e)
@@ -81,8 +98,9 @@ void free_skeleton_from_frames(entity e)
        }
 }
 
-void skeleton_from_frames(entity e)
+void skeleton_from_frames(entity e, float is_dead)
 {
+       float i;
        float m = e.modelindex;
        if(!e.skeletonindex)
        {
@@ -143,19 +161,24 @@ void skeleton_from_frames(entity e)
        if(e.fixbone)
        {
                // FIX IT
-               skeleton_fixbone(e, fixbone_oldangles);
+               vector org = skel_get_boneabs(s, e.bone_upperbody);
+               fixedmakevectors(fixbone_oldangles);
+               skel_set_boneabs(s, e.bone_upperbody, org);
        }
 
-       if(e.bone_aim)
+       if(!is_dead)
        {
-               vector aim = '-1 0 0' * self.v_angle_x;
-
-               skel_get_boneabs(s, e.bone_aim);
-               vector ang_cur = fixedvectoangles2(v_forward, v_up);
-               vector ang = AnglesTransform_Multiply(aim, ang_cur);
-               vector fix = AnglesTransform_LeftDivide(ang_cur, ang);
-               fixedmakevectors(fix);
-               skel_mul_bone(s, e.bone_aim, '0 0 0');
-
+               for(i = 0; i < MAX_AIM_BONES; ++i)
+               {
+                       if(e.(bone_aim[i]))
+                       {
+                               vector aim = '1 0 0' * bound(-90, self.v_angle_x, 90) * e.(bone_aimweight[i]);
+                               vector org = skel_get_boneabs(s, e.(bone_aim[i]));
+                               vector ang_cur = fixedvectoangles2(v_forward, v_up);
+                               vector ang = AnglesTransform_Multiply(aim, ang_cur);
+                               fixedmakevectors(ang);
+                               skel_set_boneabs(s, e.(bone_aim[i]), org);
+                       }
+               }
        }
 }