amantley
e72cc8b16e
put the ik optimized part of the conditional inside a android build define statement
2019-03-06 12:09:53 -08:00
amantley
442da66583
debugging tiny hulk problems
2019-03-05 17:44:36 -08:00
amantley
e955c02e07
Merge pull request #15046 from amantley/bugRootHips
...
Bug Fix for the Hips not translating correctly when Hips and Root have the same location
2019-03-04 14:05:33 -05:00
amantley
c046b8ffd3
made is so the boneLengthScale is only computed once per animation clip
2019-03-01 15:12:37 -08:00
Sam Gateau
cc9a3e2541
Merge pull request #15052 from amerhifi/quest-demo
...
case 21485: removing quest-demo specific changes
2019-03-01 15:03:44 -08:00
amantley
a11c4bf4e3
resolved conflict with master in AnimClip.cpp
2019-03-01 13:35:08 -08:00
amantley
54f14b2772
added the case where my avatar has no parent of hips, but the animation does
2019-03-01 12:41:05 -08:00
amantley
217145f4c5
This pr addresses two issues related to avatars that have parents joints
...
above their hip joints. First on the IK side this prevents parent joints
from being included in the accumulators in AnimInverseKinematics. Second
in AnimClip the boneLengthScale now takes into account translation and
scale on these extra parent joints.
2019-03-01 11:42:03 -08:00
Anthony Thibault
82b2050229
code review feedback
2019-03-01 11:13:56 -08:00
Anthony Thibault
9a2bd87278
Fix for case when animated joints are missing from the target avatar skeleton
...
By copying the animation rotations over to the target avatar in absolute frame, rather then relative,
we can properly "combine" animated rotations that aren't in the target avatar skeleton.
2019-02-28 18:02:07 -08:00
amerhifi
35dc13e06a
Merge branch 'master' into quest-demo
2019-02-28 14:06:47 -08:00
amer cerkic
faedc61c37
removing quest-demo specific changes
2019-02-28 10:54:30 -08:00
Anthony Thibault
b5f5900633
Replace animation scale with scale from avatar default pose
...
This allows avatars to have scale on their joints without being clobbered by animations.
Renamed variables for easier maintenance.
Also small optimization when no ikNode is present.
2019-02-27 14:40:08 -08:00
amantley
12dbaa0ea0
changed the condition so that you can turn off ik in hmd mode if you want to for debug purposes
2019-02-25 14:56:17 -08:00
amantley
363c0cc26f
moved the update of last ik to outside the if changed statement
2019-02-25 13:03:28 -08:00
amantley
cff0fd470a
re-enabled ik off by default on Desktop
2019-02-25 12:23:03 -08:00
amantley
87d98e5b85
These are the squashed commits for the ik optimization for the Quest
...
Implmented using a new AnimSplineIK node in the anim graph
(cherry picked from commit 4fe03ba238659fee7763991f2499a315482b351f)
2019-02-22 11:21:36 -08:00
Anthony Thibault
8785f733db
Merge pull request #14817 from amantley/animSplineIK
...
AnimSplineIK node added to inverse kinematics
2019-02-21 17:13:41 -08:00
Anthony Thibault
e54754c4ce
Merge pull request #14926 from luiscuenca/flowCpp
...
Cpp implementation of the Flow script
2019-02-21 17:10:05 -08:00
luiscuenca
dcbf57ee0b
Fix linux warning and HMD breaks flow
2019-02-21 16:41:24 -07:00
amantley
c9db426ce4
Merge remote-tracking branch 'upstream/master' into animSplineIK
2019-02-21 14:36:13 -08:00
amantley
6323f49f26
changed the define variable to HIFI_USE_OPTIMIZED_IK
2019-02-21 14:36:05 -08:00
amantley
0bdc527ce7
turned off pole vector when hand behind back
2019-02-21 13:14:51 -08:00
amantley
afed0b5442
review changes
2019-02-21 11:08:29 -08:00
luiscuenca
ec4d069011
Allow threads with only one joint, remove dummy joints and unused constants
2019-02-21 12:00:19 -07:00
amantley
33fd64c68c
direction on compare in positional theta function
2019-02-21 09:00:23 -08:00
amantley
f8a74efdc2
fixed build errors from jenkins
2019-02-20 17:59:45 -08:00
amantley
97da20781e
removed whitespace
2019-02-20 15:19:36 -08:00
amantley
27bfe2f0fe
changed name of pre processor variable
2019-02-20 15:14:12 -08:00
amantley
95b3fbdc35
removed ulnar coeff, too jumpy
2019-02-20 15:02:12 -08:00
John Conklin II
87556059d3
Merge pull request #13901 from Cristo86/android_handshake
...
case 20058: Android - Handshake implementation
2019-02-20 13:33:52 -08:00
luiscuenca
bea7680864
Fix shared_ptr not part of std error
2019-02-20 10:57:11 -07:00
luiscuenca
fa44687de6
fix errors and remove debug draw
2019-02-20 09:22:39 -07:00
Angus Antley
7639eac3ad
cleaning up theta functions
2019-02-20 07:18:14 -08:00
Angus Antley
1e73422b80
added the wrist and position coeffs back in, 1.0 works
2019-02-20 06:25:44 -08:00
amantley
951380db15
tweaked the constraints, to do: start conditions and possibly using base rotation on shoulder to determine hand offset
2019-02-19 17:53:59 -08:00
luiscuenca
04e57d0dd1
No Rig pointer on Flow class, solve network animations and fixed bug
2019-02-19 17:45:46 -07:00
Angus Antley
f2301e7dac
fixed relative wrist correction problem
2019-02-19 07:35:13 -08:00
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
luiscuenca
b670f72e84
fix warning on linux
2019-02-15 12:35:17 -07: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
