Commit graph

779 commits

Author SHA1 Message Date
Andrew Meadows
5a4f56388b Merge pull request #10881 from hyperlogic/feature/smooth-ik-chains
Smooth IK when trackers are disabled / enabled.
2017-07-14 16:59:30 -07:00
Anthony J. Thibault
de199bff9d code review feedback 2017-07-14 09:47:37 -07:00
Anthony J. Thibault
b0177c2522 remove comment, it does indeed work 2017-07-10 16:25:37 -07:00
Anthony J. Thibault
1cdc0071f3 Fixed issue with hips and chest not ramping off properly. 2017-07-10 16:17:25 -07:00
Anthony J. Thibault
bd8d6280a8 Interpolate out of ik chains when they are disabled 2017-07-07 09:29:57 -07:00
Seth Alves
15d379cc5a coding style 2017-07-06 17:36:28 -07:00
Seth Alves
24c8267030 in Rig joint accessors, if on the Rig's thread use internalPoseSet, else use external 2017-07-06 13:22:14 -07:00
Seth Alves
e9bdbd7715 Merge branch 'calvin' of github.com:samcake/hifi into faster-getters-on-avatar-for-scripts 2017-07-06 11:09:38 -07:00
Anthony J. Thibault
06d512dab9 Warning fixes 2017-07-05 10:43:24 -07:00
Anthony J. Thibault
56cd31e92d Merge branch 'master' into feature/smooth-ik-chains 2017-07-05 09:33:22 -07:00
Anthony J. Thibault
1a24d4d8ec added safeLerp, shortest angle quat lerp with post normalize 2017-07-05 09:31:02 -07:00
Anthony J. Thibault
7ed1382ac9 ik level interpolation of incoming targets 2017-07-03 16:32:46 -07:00
Anthony J. Thibault
2f6a37ee53 Removed interpolation of hand controllers 2017-07-03 16:31:05 -07:00
Anthony J. Thibault
aba164b26e more clean up of Rig::computeAvatarBoundingCapsule 2017-06-30 13:27:53 -07:00
Anthony J. Thibault
237872e477 sizes and order of IKTargetVarVec and IKTargetVec are now the same.
Also, A change in how the bone name to bone index lookup occurs exposed a bug
in Rig::computeAvatarBoundingCapsule(), basically it was not actually preforming IK,
and the ik targets were in the wrong coordinate frame.  So when IK was actually
performed it would give bad results.  This bug is now fixed.
2017-06-30 12:47:01 -07:00
Brad Davis
6fc82bb351 Switch to preprocessor macro for blocking invokes to capture function information 2017-06-30 11:36:24 -07:00
Anthony J. Thibault
75e1a4a1e6 Refactor of JointChainInfo data structure 2017-06-30 09:28:39 -07:00
Anthony J. Thibault
c7e4bf931b WIP: first steps toward smoothing ik chains 2017-06-30 09:28:38 -07:00
Brad Davis
b52dd7b822 Don't use blocking connections on the main thread 2017-06-29 20:45:17 -07:00
Sam Gateau
f7a3b3a411 Experimenting faster getters on Avatar for scripts 2017-06-29 15:55:47 +02:00
Clément Brisset
a2c15c9794 Merge pull request #10770 from jherico/fix_deps_1
Cleanup entity dependencies
2017-06-28 10:48:58 -07:00
Brad Davis
8130a91b8c Cleanup entity dependencies 2017-06-27 19:15:49 -07:00
Anthony J. Thibault
d4122cff5a warning fix 2017-06-27 11:29:08 -07:00
Anthony J. Thibault
2814c94582 Hips should no longer waggle when feet are active 2017-06-26 17:43:51 -07:00
Anthony J. Thibault
8602d57a57 Eliminated to wiggle while pucks are enabled.
* Added new anim node AnimDefaultPose
* AnimNodeLoader was changed to support the addition of the AnimDefaultPose node
* Edited default avatar-animation.json to insert an AnimOverlay and AnimDefaultPose between the IK node and the rest of the "underPose".
* Rig uses this to fade in default pose for the toes when the hip/feet puck are active.
  This effectively deadens the toe animations, without effecting the hand animations.
* Also, the rig was changed to use the LimitCenter solution when the feet are enabled but the hips are not.
2017-06-26 14:09:10 -07:00
Anthony J. Thibault
b8c638b2b7 warning fixes 2017-06-23 14:36:59 -07:00
Anthony J. Thibault
f320610681 opened up shoulder constraint + other fixes
* bent elbows will be away from the body a bit more.
* sped up smoothing of pole vectors
2017-06-23 14:06:00 -07:00
Anthony J. Thibault
54af6af651 Fix for pole vector stability and knee pole vector computation 2017-06-23 10:38:21 -07:00
Anthony J. Thibault
2dcca2125b Merge branch 'master' into feature/pole-vector 2017-06-21 15:50:03 -07:00
Anthony J. Thibault
0f51236fb0 Rig.cpp: take avatar scale into account when computing elbow pole vector 2017-06-21 14:36:42 -07:00
Anthony J. Thibault
1979ed7f3a Disable elbow pole vector if arm/shoulder pucks are enabled 2017-06-19 16:58:11 -07:00
Anthony J. Thibault
c236afe68c Simplify passing data from MySkeletonModel to Rig 2017-06-19 16:54:39 -07:00
Anthony J. Thibault
6bbc5bfbea formatting on initializers 2017-06-19 13:42:39 -07:00
Brad Davis
ed6620fc51 Merge pull request #10718 from jherico/frame_thread
Cleanup and refactoring
2017-06-19 13:31:44 -07:00
Anthony J. Thibault
3f5aba2655 improved elbow pole vector calculation
Also, pole vectors are blended spherical linearly, this might help fast moving
pole vectors from rotating too quickly.
2017-06-19 13:21:12 -07:00
Anthony J. Thibault
81852cd91c warning fixes 2017-06-16 18:15:41 -07:00
Anthony J. Thibault
323dc62ef2 Merge branch 'master' into feature/pole-vector 2017-06-16 17:37:11 -07:00
Anthony J. Thibault
e7991579ef Enabled elbow pole vectors
There are still some issues with rotations of the elbow pole vectors.
* When the (hand - shoulder) vector approaches the normal vector used in Rig::calculateElbowPoleVector() unexpected twists can occur.
* Also, when the (hand - shoulder) vector approaches zero, the IK system starts to flutter between two states.
* The shoulder twist constraint probably needs to be opened up for more natural range of motion.
2017-06-16 17:29:56 -07:00
Brad Davis
a69cf31f4b PR feedback and cmake fixes 2017-06-16 16:59:58 -07:00
Anthony J. Thibault
cdfba52488 precondition initial solution before solving to reduce limb locking. 2017-06-15 15:02:42 -07:00
Anthony J. Thibault
fac21033e7 Fixed matthew sitting pose by opening up UpLeg twist constraint to +- 90 degrees. 2017-06-14 11:53:54 -07:00
Anthony J. Thibault
10f94c2d60 Fixed pole vectors on straight limbs by using reference vector 2017-06-14 11:35:53 -07:00
David Rowe
570ec8457d Refactor 2017-06-14 10:45:30 +12:00
Anthony J. Thibault
f20c03fa6e Pole vectors can be controlled via anim vars. 2017-06-13 15:36:05 -07:00
David Rowe
5eee2d8352 Code review 2017-06-13 12:39:46 +12:00
Anthony J. Thibault
7521d6124e WIP: added blend between hips and foot for knee pole vector 2017-06-12 17:23:23 -07:00
Anthony J. Thibault
0cde22d937 Bug fix for pole constraint on legs 2017-06-12 12:13:03 -07:00
David Rowe
3e126c0517 Smoothly ease hands from uncontrolled to controlled positions 2017-06-12 17:14:13 +12:00
Anthony J. Thibault
e8ca1a3060 WIP: added magnitude to damping rotation near singularities.
Also knee pole constraints don't work..  why?
2017-06-09 18:09:38 -07:00
Anthony J. Thibault
bb45fe0388 WIP, straight arm still rotates.. 2017-06-09 09:48:03 -07:00