Commit graph

1120 commits

Author SHA1 Message Date
Angus Antley
748368bfda mid tweak on the wrist and position coeffs 2019-02-17 23:32:52 -08:00
Angus Antley
e1dfd7d288 cleanup white space 2019-02-16 23:40:16 -08:00
Angus Antley
0982c37c5e took out the theta animvar and just use theta converted to pole vector 2019-02-16 14:50:47 -08:00
Angus Antley
70764bc3c4 Merge remote-tracking branch 'upstream/master' into animSplineIK 2019-02-15 19:24:30 -08:00
amantley
d78f253d24 code to generate pole vector from theta 2019-02-15 17:43:53 -08:00
amantley
95530e6ba5 removed the unnecessary animArmIK.h and .cpp 2019-02-15 15:41:23 -08:00
amantley
36093926d0 added fake android defines for running the new ik on pc 2019-02-15 15:00:39 -08:00
amantley
3f9b761e42 updating the android only if defs 2019-02-15 14:05:42 -08:00
Sam Gondelman
9aa99f24f0
Merge pull request #14905 from SamGondelman/materialMapping
Case 20242: FST materialMapping supports our material JSON format
2019-02-15 11:21:51 -08:00
amantley
7119bc5972 reverted the scale optimization in animspline.cpp 2019-02-15 10:54:02 -08:00
amantley
0fcaa695ba Merge remote-tracking branch 'upstream/master' into animArmIK 2019-02-15 10:35:33 -08:00
amantley
d6dfaacf6f adding ifdef for android os 2019-02-15 10:35:25 -08:00
amantley
425413419a fixed merge conflict in avatar.h 2019-02-15 08:26:54 -08:00
Angus Antley
07af2c525e tweaked ulnar radial limit and extend limit 2019-02-15 07:31:28 -08:00
Angus Antley
382a03929e changed back to regular 2 bone Ik for arms in json and cleaned up rig.cpp and polevector constraint 2019-02-15 07:06:43 -08:00
Angus Antley
f8554d10a8 starting cleanup 2019-02-14 23:45:45 -08:00
amantley
40196dcb40 wrist action works in rig now 2019-02-14 18:17:31 -08:00
amantley
5c26bbec5c moving the theta calculation to rig 2019-02-14 18:06:20 -08:00
Anthony Thibault
39b4eaac34 Revert "AnimPose operator* optimizations"
This reverts commit 569bef50fd.
2019-02-14 16:13:00 -08:00
Anthony Thibault
f0e163b4df Revert "AnimPose::inverse() optimization"
This reverts commit 5c7e81584c.
2019-02-14 16:10:26 -08:00
Angus Antley
1924018d2c added code to convert theta to a projected pole vector 2019-02-14 07:15:58 -08:00
Angus Antley
aa0c52abd7 fixed wrap around 180 degrees 2019-02-13 18:33:01 -08:00
amantley
fc978f0ee7 fixed twist angle bug. need to fix wrap around 180 to -180 behaviour 2019-02-13 17:31:48 -08:00
amantley
c6da7cc41d everything looks pretty good now but need to move the code to rig and need to get rig of wrap around problem with the twist decomp 2019-02-13 17:12:28 -08:00
SamGondelman
13ece79476 merge with master 2019-02-13 16:30:22 -08:00
Shannon Romano
8a07e2b31a
Merge pull request #14895 from ctrlaltdavid/M21132
Case 21132: Add "Avatar Script" classification to relevant JSDoc APIs
2019-02-13 10:35:00 -08:00
amantley
9baed717f9 integrated flex, ulnar and twist behaviour to pole vector theta computation 2019-02-12 17:55:12 -08:00
sabrina-shanman
b2e3b87ef4 Add two missing CMake includes 2019-02-12 16:24:13 -08:00
SamGondelman
189ccfde4a clement's comments from PR14858 2019-02-12 09:51:11 -08:00
Angus Antley
7bb353742a more tweaks to get the wrist action right 2019-02-12 07:40:18 -08:00
amantley
bb29e382f0 tweaking the hand pose correction on the pole vector 2019-02-11 18:05:29 -08:00
SamGondelman
77a8ddb3f0 Merge remote-tracking branch 'upstream/master' into materialMapping 2019-02-11 16:35:05 -08:00
SamGondelman
4202685a4b Merge remote-tracking branch 'upstream/master' into fst 2019-02-11 16:07:36 -08:00
David Rowe
5428bb19dc Add "Avatar Script" JSDoc API classification 2019-02-12 11:49:49 +13:00
Angus Antley
f125e90449 worked on the swing twist decomp to get the angles of the wrist for elbow adjustments 2019-02-11 07:41:41 -08:00
amantley
822ec1c529 working on the wrist tweak, dampened the spine twist 2019-02-08 17:53:23 -08:00
Sabrina Shanman
baf72eaae0
Merge pull request #14802 from sabrina-shanman/hfm_prep_joints
Case 20887: Move FST joint property handling to the model preparation step
2019-02-08 15:02:23 -08:00
amantley
9eceb1d0bd implemented the code for the heuristic elbows including code from the paper authors. to do: dampen the twist of the spine
caused by the hand azimuth and put in the constraints for the wrists on
the pole vector theta computation.
2019-02-07 17:46:18 -08:00
SamGondelman
3addcb630c Merge remote-tracking branch 'sabrina/hfm_prep_joints' into materialMapping 2019-02-07 11:45:59 -08:00
Anthony Thibault
f8608464fa warning fixes 2019-02-07 11:33:44 -08:00
amantley
4d9d597b4f tweaked the weights for the arms and negated the theta for the left arm 2019-02-07 11:14:33 -08:00
amantley
e2c9058f0a first try at the new elbow code 2019-02-06 18:29:33 -08:00
Anthony Thibault
5c7e81584c AnimPose::inverse() optimization 2019-02-05 18:23:58 -08:00
Anthony Thibault
87498b3dd2 Avoid dynamic_cast in getAnimInverseKinematicsNode 2019-02-05 18:15:05 -08:00
Anthony Thibault
a959d69554 Make AnimSkeleton::getParentIndex() more cache coherent 2019-02-05 18:10:32 -08:00
SamGondelman
3ee448a89a fix scattering and working on resource cache bug 2019-02-05 17:32:15 -08:00
amantley
9ad20b8129 adding the animcontext to the commit 2019-02-05 17:22:00 -08:00
amantley
07a4f49c58 adding the armik nodes into the json 2019-02-05 17:21:39 -08:00
amantley
3e553f015c added the arm ik files to the repo, this is for the shoulder and elbow extensions 2019-02-05 15:54:37 -08:00
Anthony Thibault
d8644a2745 Simplify isEqual computation for vectors used in Rig 2019-02-05 15:06:29 -08:00