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
amantley
d6dfaacf6f
adding ifdef for android os
2019-02-15 10:35:25 -08:00
luiscuenca
98c321c718
Fix warnings
2019-02-15 09:40:49 -07: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
luiscuenca
624a53449f
Merge branch 'master' into flowCpp
...
# Solved Conflicts:
# interface/src/avatar/MyAvatar.cpp
2019-02-14 18:55:43 -07:00
luiscuenca
3e66bce112
set useFlow function
2019-02-14 18:30:37 -07: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
luiscuenca
05d50f32ba
time budget
2019-02-13 08:16:22 -07:00
luiscuenca
bebbbc643b
add deltaTime to simulation
2019-02-13 06:27:49 -07:00
amantley
9baed717f9
integrated flex, ulnar and twist behaviour to pole vector theta computation
2019-02-12 17:55:12 -08:00
luiscuenca
954cac907d
Other avatars after update and mod timer when active
2019-02-12 15:02:56 -07: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
luiscuenca
942e9ccdfd
Hand collisions working
2019-02-11 18:21:00 -07: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
Cristian Duarte
514c552a4d
Android - Remove block that disabled AnimInverseKinematics::overlay method
2019-02-08 19:53:59 -03: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
luiscuenca
02646fb8a9
Working flow as rig param
2019-02-07 14:09:53 -07: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
Cristian Duarte
babb972d89
Merge remote-tracking branch 'hifi/master' into android_handshake
2019-02-07 14:44:22 -03: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
Anthony Thibault
569bef50fd
AnimPose operator* optimizations
2019-02-05 14:48:05 -08:00
amantley
af38a40b85
Merge remote-tracking branch 'origin/animSplineIK' into animSplineIK
2019-02-05 09:43:11 -08:00
amantley
031dd5639b
fixed pole vector over writing with the old json
2019-02-04 14:46:52 -08:00
amantley
78d6e42fc8
made the ik enable/disable work for the old animIK node json
2019-02-04 13:42:19 -08:00
amantley
a04e6d55ff
enabled/disable ik now works for the new animspline json
2019-02-04 13:31:36 -08:00
