Commit graph

917 commits

Author SHA1 Message Date
Anthony Thibault
e210fadc7c Fix for glitch when entering inAir state from takeoff.
This was due to a frame lag of blend factor used for inAir blending.  So the first frame the upward velocity would be 0, followed by 3.5 m/s the next frame.
This is fixed by using the workingVelocity instead of _lastVelocity to drive the blend.
2018-09-04 14:36:56 -07:00
amantley
671bf32d58 removed whitespace 2018-08-23 17:36:35 -07:00
amantley
884be2f99d removed comment and whitespace 2018-08-23 17:30:03 -07:00
amantley
0cc302f68c set phase to 0.0 2018-08-23 17:28:38 -07:00
amantley
220dbf586f set the phase to 0.0 when it is negative 2018-08-23 16:46:58 -07:00
John Conklin II
644ff1eafa
Merge pull request #13655 from amantley/animationBlendChanges
New Default Strafe Animations Plus Animation Tuning Support
2018-08-10 15:03:30 -07:00
Anthony J. Thibault
3fa3cd8cfd In CCD IK chains, remove the LeftHand and RightHand constraint completely.
When used in combination with the elbow pole vector, this was causing the hand to never properly reach its rotation target.
It was also having side effects causing the elbow to never straighten properly to reach its position target.

There is possibly a bug in how this tip constraint is enforced and I've verified that there are no ill effects in removing it.
2018-08-08 13:56:47 -07:00
amantley
1353406254 more whitespace 2018-08-07 12:56:28 -07:00
amantley
4ad73fd821 removed whitespace 2018-08-07 12:51:23 -07:00
amantley
a61909446a Merge remote-tracking branch 'upstream/master' into animationBlendChanges 2018-08-07 10:40:22 -07:00
amantley
84619e7adc cleaned up to match coding standards 2018-08-07 10:40:11 -07:00
amantley
1ad6b041cd updated the elipes equation code for determining the forward speed of the avatar. We can now set the max forward == walkSpeed, max side and backwards == walkBackwardsSpeed and the sprint speed == sprintSpeed 2018-08-06 18:36:32 -07:00
Anthony Thibault
079b276c2b
Merge pull request #13733 from luiscuenca/fixElbowPoleVector3
Elbow pole vectors improvements
2018-08-06 17:33:03 -07:00
amantley
f1990378fd merged the json from the ik 2 bone pr into the new animation json 2018-08-06 14:27:09 -07:00
Angus Antley
a63b213d65 fixed the weight calculation for the hand overlays. to do: check the blends in hmd mode 2018-08-06 15:18:17 +01:00
amantley
bac9d195be working on the hand blend alphas, something is wrong with the print out 2018-08-03 17:56:49 -07:00
amantley
375d726535 added the new animations for strafe and walk to the resource file and updated the avatar-animation.json file 2018-08-03 16:48:43 -07:00
amantley
76b182f03b added the hmd strafe to the rig code 2018-08-03 12:12:01 -07:00
amantley
096cb0db81 working on strafe left and right transitions 2018-08-02 13:32:06 -07:00
amantley
bd88d5f15b merging with ik leg fix code in master 2018-08-02 09:48:04 -07:00
amantley
6b2c67e5bd more doug support 2018-08-01 18:22:51 -07:00
John Conklin II
fd1a431729
Merge pull request #13689 from ctrlaltdavid/M15244
Move scriptable caches' APIs into scripting interfaces
2018-08-01 11:50:13 -07:00
luiscuenca
fde77add79 Elbow pole vectors fixes 2018-08-01 11:49:18 -07:00
Anthony J. Thibault
fd780845bb Code review feedback 2018-07-31 18:25:04 -07:00
amantley
541d2deed5 added the parent alpha into the child animation weight, removed extra hand overlay print outs 2018-07-30 14:45:25 -07:00
Anthony J. Thibault
58f95bd07b assert fix 2018-07-30 13:14:32 -07:00
Anthony J. Thibault
6a6ece8910 Warning fixes and whitespace cleanup 2018-07-30 11:49:44 -07:00
Anthony J. Thibault
401995fb06 Leg IK fixes
Fixes for raising legs and sometimes squatting while in HMD mode.
2018-07-30 10:55:52 -07:00
amantley
637a214165 added the anim stack print out static object for the list of motion and weights 2018-07-27 17:25:00 -07:00
amantley
b28ce40f09 adding the anim stack print out feature half way done 2018-07-27 08:46:40 -07:00
David Rowe
9a9d190918 Remove unnecessary duplicate function 2018-07-26 20:26:13 +12:00
David Rowe
baf88ab508 Revise scriptable resource caches' interfaces 2018-07-26 16:12:16 +12:00
amantley
fee05b6b8d debug of anim state machine tree traversal 2018-07-25 17:46:19 -07:00
David Rowe
16e06de9cd Move scriptable caches into scripting interfaces
Removed non-working getResource() API functions.
2018-07-25 22:10:14 +12:00
amantley
b91df1b2d4 cleaned up stray files and old hud code 2018-07-24 17:25:27 -07:00
amantley
04dbafeedc removed the hard coded reference speeds in Rig.cpp. we now use the characteristic speeds from the avatar-animation.json file for blending. the computation of the blend alphas takes place in AnimBlendLinearMove.cpp 2018-07-24 17:13:57 -07:00
luiscuenca
e7d70a832d Pole Vectors always calculated when arms are crossed 2018-07-24 08:58:17 -07:00
amantley
aa92865b21 added the code to display the alphas for the motion blends 2018-07-23 17:45:24 -07:00
luiscuenca
8f547d9bdd fix warnings 2018-07-23 16:37:25 -07:00
luiscuenca
94bb8fc917 More unused code 2018-07-23 15:29:42 -07:00
luiscuenca
4a27189913 function consistancy 2018-07-23 14:27:55 -07:00
luiscuenca
2adb334034 unused code deleted 2018-07-23 14:25:30 -07:00
luiscuenca
9d2d7c3aa4 Redesign and enable hand's Pole Vectors for elbow simulation 2018-07-23 13:16:11 -07:00
amantley
65160e4513 changed the middle reference speed for forward movement so that run doesn't get blended into walk 2018-07-20 14:07:24 -07:00
amantley
6db108e78e added a third reference speed to the lateral speeds in rig.cpp 2018-07-19 15:27:57 -07:00
Anthony Thibault
f56c0a3a3f
Merge pull request #13502 from luiscuenca/eyelidFix
Fix closed eyelids when head is tilted down
2018-07-05 08:50:22 -07:00
Anthony J. Thibault
3a88582f42 Bug fix for feet poleVector smoothing.
This bug was introduced when I renamed the variable from poleVector to sensorPoleVector for readablity.
2018-07-02 15:16:47 -07:00
Anthony J. Thibault
fff4348a0f Bug fix for poleVector smoothing
Needs to occur in sensor space rather then avatar space.
2018-06-29 17:54:21 -07:00
luiscuenca
24d03ace4c Changes from CR and decreased looking at angle to mitigate freaky eyes 2018-06-29 14:34:17 -07:00
Andrew Meadows
6331395a89 remove crash mode in invokable methods 2018-06-15 10:27:35 -07:00