Anthony Thibault
65507cfe11
Merge pull request #15180 from luiscuenca/flowCppFixes
...
Fix Flow touch and scale issues
2019-03-28 11:11:08 -07:00
Anthony Thibault
b0d5a82c80
Merge pull request #15169 from hyperlogic/bug-fix/rig-assert-fix
...
Rig.cpp: Fix for index out of range assert in debug builds
2019-03-28 11:10:32 -07:00
David Rowe
cf4370ed3a
Merge branch 'master' into M21222
2019-03-26 09:44:48 +13:00
David Rowe
b78ae80ae6
Address review comments and add further examples
2019-03-26 09:40:47 +13:00
amantley
bc696d6db6
fixed memory leak caused by bone length scale computation
2019-03-14 13:49:13 -07:00
luiscuenca
c14b135f2b
Fix flow touch and scale issues
2019-03-13 15:42:04 -07:00
David Rowe
ea84847950
Update AnimStateDictionary JSDoc per feedback
2019-03-13 16:20:38 +13:00
David Rowe
7445d73857
Merge branch 'master' into M21222
...
# Conflicts:
# libraries/avatars/src/AvatarData.h
2019-03-13 16:14:14 +13:00
Anthony Thibault
fff0d1a80e
Rig.cpp: Fix for index out of range assert in debug builds
2019-03-12 17:43:23 -07:00
Anthony Thibault
c36d752b6b
Merge pull request #15141 from luiscuenca/flowAPIExtra
...
add getFlowData method to MyAvatar
2019-03-08 17:45:11 -08:00
luiscuenca
80150565f6
Fix bug on group settings
2019-03-08 16:30:28 -07:00
David Rowe
24c7c8be19
Update JSDoc per merge from master
2019-03-09 12:03:59 +13:00
luiscuenca
4858f64810
get the colliding joints
2019-03-08 14:36:47 -07:00
luiscuenca
f363d95ca2
clear group settings on init
2019-03-08 13:02:47 -07:00
luiscuenca
cb6f573b35
Merge branch 'master' into flowAPIExtra
2019-03-08 12:43:02 -07:00
David Rowe
4779a6b156
Merge branch 'master' into M21222
2019-03-09 07:57:53 +13:00
David Rowe
5068075645
Fill in MyAvatar animation JSDoc
2019-03-09 07:42:55 +13:00
luiscuenca
e8da6b5a0c
add getFlowData
2019-03-08 10:36:58 -07:00
Thijs Wenker
d985d1bff0
use Rig instead of Avatar for height calculations
2019-03-08 03:36:56 +01:00
Anthony Thibault
dcd1258439
Merge pull request #15119 from hyperlogic/feature/improve-anim-pose-negative-scale
...
Improve AnimPose support for negative scale
2019-03-07 17:05:46 -08:00
Anthony Thibault
0cf8f3e5c3
Code review feed back remove NEW_VERSION ifdef
2019-03-07 14:11:01 -08:00
amantley
474a97d0fc
now update the ikOverlayAlpha every frame
2019-03-06 15:15:30 -08:00
Anthony Thibault
5fcfa265d2
Remove alternate versions of AnimPose(mat4) constructor
2019-03-06 14:02:58 -08:00
Anthony Thibault
0dbc83049b
Make AnimPose from mat4 work better for matrices with negative determinants.
...
Took part of this code from glm::decompose() which references
https://opensource.apple.com/source/WebCore/WebCore-514/platform/graphics/transforms/TransformationMatrix.cpp
2019-03-06 13:28:14 -08:00
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
