Commit graph

534 commits

Author SHA1 Message Date
Anthony Thibault
ecae92724e Added reaction api 2019-07-17 14:28:39 -07:00
Anthony J. Thibault
3a6d8dc383 Disable handTouch.js to prevent finger twitching
This PR disables handTouch.js.
handTouch.js allows the fingers to animate on the surface of an object.
However, it can sometimes detect collisions with walls or tables when the avatar is standing next to them.
We will more properly fix handTouch.js in a future PR, but for now we will disable the functionality.

Also, a small bug fix was made to the Rig to prevent the idleOverlayAlpha from exceeding the 0.0 to 1.0 range.
This can cause the fingers to bend incorrectly for a moment.

Also, three new items were added to the Developer > Show Animation Stats panel.

* Joint Override Count: displays the current count of joints that are overriden by MyAvatar.setJointRotation() JS API calls.
* Flow: displays if flow is active of disabled.
* Network Graph: displays if the network anim graph, used for teleportation, is enabled or disabled.

https://highfidelity.atlassian.net/browse/BUGZ-154
2019-06-20 15:52:36 -07:00
Anthony J. Thibault
4b5d5062b1 Improvement to Developer > Avatar > Draw Animation
This feature was added to help diagnose the root cause of a rarely occurring finger twitching bug.

Also, some asserts were added to AnimClip to also help catch a rarely occurring crash.
2019-06-17 14:50:19 -07:00
Angus Antley
27ed468946 made changes requested 2019-04-25 14:42:41 -07:00
Angus Antley
76164ecee8 corrected the case where you have a random switch state trigger and a random transition trigger in the same random state machine 2019-04-25 13:57:58 -07:00
Angus Antley
ea173b8d61 more time for talk ease in and updated json random choice times 2019-04-24 21:29:55 -07:00
Angus Antley
93b49a86db fixed build error 2019-04-24 15:50:00 -07:00
Angus Antley
45f4cb2018 added animation files and updated ease in function in rig 2019-04-24 14:56:38 -07:00
Angus Antley
5aee2f35f0 updated the ease in function 2019-04-24 08:27:36 -07:00
amantley
7f3101eefb working on the ease in function for the talk idle 2019-04-23 18:13:15 -07:00
Angus Antley
6d9e4188eb added AnimRandomSwitch class and got it integrated with a new avatar-animation.json that includes random idles and random fidgets and random talk 2019-04-22 14:14:17 -07:00
amantley
035c8a687d fixed merge conflict 2019-04-17 10:16:39 -07:00
Anthony J. Thibault
02d5769991 Better head vs camera checks for avatar head cauterization
* cameraInsideHead() check now uses detailed avatar collision when possible.
* head is now more constantly hidden in first person camera mode
* getEyeModelPositions() uses a better estimate when avatar eye joints are missing.
* moved findPointKDopDisplacement from Rig.cpp into AnimUtil.cpp
* added isPlayingOverrideAnimation() method to Rig class
2019-04-09 12:57:03 -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
Angus Antley
d71c6c28de added the new hand anims to the resource, and added hand reset to initAnimGraph 2019-03-27 12:00:50 -07:00
Angus Antley
02d9331603 This changes the avatar-animation json so that we have override
animations for the right and left hand, similar to how we have whole
body override animations.
2019-03-26 23:27:54 -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
David Rowe
24c7c8be19 Update JSDoc per merge from master 2019-03-09 12:03:59 +13: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
Thijs Wenker
d985d1bff0 use Rig instead of Avatar for height calculations 2019-03-08 03:36:56 +01:00
amantley
474a97d0fc now update the ikOverlayAlpha every frame 2019-03-06 15:15:30 -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
amerhifi
35dc13e06a
Merge branch 'master' into quest-demo 2019-02-28 14:06:47 -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
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
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
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