enable animation blending; do up/down aiming with it well now

diff --git a/models/player/gak.iqm_0.txt b/models/player/gak.iqm_0.txt
index 8aa74198143215bef4c609daeb34465d55b284c8..9a6f524017513ed63b921b32cbb1dedd3495e667 100644 (file)
--- a/models/player/gak.iqm_0.txt
+++ b/models/player/gak.iqm_0.txt
@@ -3,5 +3,9 @@ species alien
 sex Male
 weight 85
 age 16
+bone_upperbody spine2
+bone_aim spine2
+bone_weapon bip01 r hand
+fixbone 1
 
 Lightweight Xonotic Solider

diff --git a/models/player/gakarmored.iqm_0.txt b/models/player/gakarmored.iqm_0.txt
index 06ff3550b1ec43ff1eb968ea9193320e98c96ea6..3a7b199ac28484f2faf68f74080b2df2ca213e56 100644 (file)
--- a/models/player/gakarmored.iqm_0.txt
+++ b/models/player/gakarmored.iqm_0.txt
@@ -3,5 +3,9 @@ species alien
 sex Male
 weight 90
 age 20
+bone_upperbody spine2
+bone_aim spine2
+bone_weapon bip01 r hand
+fixbone 1
 
 Heavyweight Xonotic Solider

diff --git a/models/player/gakmasked.iqm_0.txt b/models/player/gakmasked.iqm_0.txt
index aff4f75ac6481403df54c8ec29c1f6adeb99c440..72e6947718b4c86c4f61ecbf9e421ba5b401dfb9 100644 (file)
--- a/models/player/gakmasked.iqm_0.txt
+++ b/models/player/gakmasked.iqm_0.txt
@@ -3,5 +3,9 @@ species alien
 sex Male
 weight 87
 age 18
+bone_upperbody spine2
+bone_aim spine2
+bone_weapon bip01 r hand
+fixbone 1
 
 Mediumweight Xonotic Solider

diff --git a/models/player/ignis.iqm_0.txt b/models/player/ignis.iqm_0.txt
index 7597e410a90b020efb3a01d1746674f86577fc09..ea1cb7a307d8f3d4c5974717d80bc2cd5deda664 100644 (file)
--- a/models/player/ignis.iqm_0.txt
+++ b/models/player/ignis.iqm_0.txt
@@ -3,5 +3,9 @@ species human
 sex Male
 weight 88
 age 31
+bone_upperbody spine2
+bone_aim spine2
+bone_weapon bip01 r hand
+fixbone 1
 
 Heavyweight Xonotic Solider

diff --git a/models/player/ignishalfmasked.iqm_0.txt b/models/player/ignishalfmasked.iqm_0.txt
index fd72a02f3f7a74c818b01a1479017bca6fdb9501..8c3be337108b755382254c802fc3313f3ece93e9 100644 (file)
--- a/models/player/ignishalfmasked.iqm_0.txt
+++ b/models/player/ignishalfmasked.iqm_0.txt
@@ -3,5 +3,9 @@ species human
 sex Male
 weight 90
 age 31
+bone_upperbody spine2
+bone_aim spine2
+bone_weapon bip01 r hand
+fixbone 1
 
 Heavyweight Xonotic Solider

diff --git a/models/player/ignismasked.iqm_0.txt b/models/player/ignismasked.iqm_0.txt
index d1c85665f2960081f7aae4f9637a71b8b9d83f21..c5944ca4c6adacd18afda7bc29b80bd61606e990 100644 (file)
--- a/models/player/ignismasked.iqm_0.txt
+++ b/models/player/ignismasked.iqm_0.txt
@@ -3,5 +3,9 @@ species human
 sex Male
 weight 92
 age 31
+bone_upperbody spine2
+bone_aim spine2
+bone_weapon bip01 r hand
+fixbone 1
 
 Heavyweight Xonotic Solider

diff --git a/models/player/megaerebus.iqm_0.txt b/models/player/megaerebus.iqm_0.txt
index b4e2aa85af896617132d445f8b8b6d372ce9d99f..2e7cfba0b9025719f14b423c6f7925854f3a6df7 100644 (file)
--- a/models/player/megaerebus.iqm_0.txt
+++ b/models/player/megaerebus.iqm_0.txt
@@ -3,5 +3,9 @@ species human
 sex Male
 weight 210
 age 26
+bone_upperbody spine2
+bone_aim spine2
+bone_weapon bip01 r hand
+fixbone 1
 
 Heavyweight Xonotic Solider

diff --git a/models/player/nyx.iqm_0.txt b/models/player/nyx.iqm_0.txt
index 9fb92f64752761666366b66efed9a2483c88e195..714f8212b11bcf7f2e85b7d713d9a33c59976eb0 100644 (file)
--- a/models/player/nyx.iqm_0.txt
+++ b/models/player/nyx.iqm_0.txt
@@ -3,5 +3,9 @@ species human
 sex Female
 weight 100
 age 24
+bone_upperbody spine2
+bone_aim spine2
+bone_weapon bip01 r hand
+fixbone 1
 
 Heavyweight Xonotic Soldier

diff --git a/models/player/pyria.iqm_0.txt b/models/player/pyria.iqm_0.txt
index 2c52f6085aa3325aa9c842978c357e3634dc4e86..47c8ef1ae22feddb84cbf88d43e02d31da493d16 100644 (file)
--- a/models/player/pyria.iqm_0.txt
+++ b/models/player/pyria.iqm_0.txt
@@ -3,5 +3,9 @@ species human
 sex Female
 weight 57
 age 53
+bone_upperbody spine2
+bone_aim spine2
+bone_weapon bip01 r hand
+fixbone 1
 
 Necro Warrior

diff --git a/models/player/seraphina.iqm_0.txt b/models/player/seraphina.iqm_0.txt
index 6b4fcf6301af663c75d957854b4599875e260980..a64d0c221536bdec949412db8c6803bb0b45496c 100644 (file)
--- a/models/player/seraphina.iqm_0.txt
+++ b/models/player/seraphina.iqm_0.txt
@@ -3,5 +3,9 @@ species human
 sex Female
 weight 89
 age 31
+bone_upperbody spine2
+bone_aim spine2
+bone_weapon bip01 r hand
+fixbone 1
 
 Heavyweight Xonotic Solider

diff --git a/models/player/seraphinamasked.iqm_0.txt b/models/player/seraphinamasked.iqm_0.txt
index 47763590e1ca439fe5ed13cbad8b14e75fa117e2..d3e9cf1f216e4bd204a8e490f686a8e1e782e892 100644 (file)
--- a/models/player/seraphinamasked.iqm_0.txt
+++ b/models/player/seraphinamasked.iqm_0.txt
@@ -3,5 +3,9 @@ species human
 sex Female
 weight 90
 age 31
+bone_upperbody spine2
+bone_aim spine2
+bone_weapon bip01 r hand
+fixbone 1
 
 Heavyweight Xonotic Solider

diff --git a/models/player/umbra.iqm_0.txt b/models/player/umbra.iqm_0.txt
index 21f4c80d96a921529e1ba4da4f2e42eff2cb1089..a8fa9181428a23fa56262217e367b6ec11e45db7 100644 (file)
--- a/models/player/umbra.iqm_0.txt
+++ b/models/player/umbra.iqm_0.txt
@@ -3,5 +3,9 @@ species human
 sex Female
 weight 61
 age 25
+bone_upperbody spine2
+bone_aim spine2
+bone_weapon bip01 r hand
+fixbone 1
 
 Lightweight Xonotic Solider

diff --git a/qcsrc/client/player_skeleton.qc b/qcsrc/client/player_skeleton.qc
index a731d3a1a3ffeda1f5ded7956c5eb9bc065539c8..d51ac0d9f72c6d48ab19d5a320aefbaef380b4b5 100644 (file)
--- a/qcsrc/client/player_skeleton.qc
+++ b/qcsrc/client/player_skeleton.qc
@@ -59,17 +59,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)
@@ -143,19 +150,18 @@ 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)
        {
-               vector aim = '-1 0 0' * self.v_angle_x;
-
-               skel_get_boneabs(s, e.bone_aim);
+               vector aim = '1 0 0' * bound(-90, self.v_angle_x, 90);
+               vector org = 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');
-
+               fixedmakevectors(ang);
+               skel_set_boneabs(s, e.bone_aim, org);
        }
 }