Seth Alves
b71f4e0204
remove commented-out code
2019-01-11 15:53:49 -08:00
Seth Alves
ecb34450bd
quiet uneeded logging
2019-01-11 15:53:49 -08:00
amantley
bd9405aef8
add arm ik class for cleanup of inverse kinematics
2019-01-10 10:27:15 -08:00
amantley
3b5d8db650
updated the json to have a spline node at the root
2019-01-08 17:33:14 -08:00
amantley
4fd80ff6bc
implementing the spline ik for the spline as an anim node
2019-01-08 15:26:46 -08:00
Angus Antley
77fa4e7d13
took out the unnecessary hfm.jointindex code
2018-12-16 17:29:16 -08:00
Shannon Romano
a3c870ed90
Merge pull request #14479 from sabrina-shanman/hfm_mimetype
...
(case 20037) Add robust MIME type detection for loading models in ModelCache
2018-12-11 18:41:55 +00:00
amantley
edab74caa4
mapped the model joint names to hifi compliant joint names in FBX serializer
2018-12-04 16:20:46 -08:00
Angus Antley
a73f74d63c
Merge remote-tracking branch 'upstream/master' into jointNameMapping
2018-11-30 21:29:29 -08:00
amantley
ad777201f6
changed comment and cleaned up variable name in getJointName
2018-11-27 15:08:50 -08:00
amantley
579e2dd2ee
removed unnecessary mirror joint code and cleaned up whitespace in rig.cpp
2018-11-27 14:10:20 -08:00
sabrina-shanman
98853b5d1d
Move FBXSerializer import by AnimationCache to source file
2018-11-26 16:30:18 -08:00
amantley
fb7b503ce9
removed unnecessary iteration of the joint name mapping in AnimSkeleton.cpp
2018-11-26 13:48:00 -08:00
amantley
26fc53ef78
cleaned up whitespace and removed debug prints
2018-11-26 11:08:59 -08:00
amantley
746c5ed621
we can now handle missing joints and extra joints
2018-11-21 15:46:54 -08:00
amantley
a488364976
fixed mirroring helper functions contains left and contains right
2018-11-20 17:14:35 -08:00
amantley
572cdcd008
remapping is now able to work remains to clean up code and check for gotchas from old fst code
2018-11-20 17:09:37 -08:00
sabrina-shanman
be511378cd
Merge branch 'master' into hfm_serializer
2018-11-20 13:42:24 -08:00
amantley
1fd03102c5
debugging name mapping code
2018-11-19 17:40:43 -08:00
amantley
eb00435353
removed whitespace
2018-11-16 10:35:50 -08:00
amantley
f9829c270d
merged new fbx.h
2018-11-15 10:19:04 -08:00
amantley
c8cd65c3bd
added getter for the orginal cluster bind matrix values in AnimSkeleton
2018-11-15 09:58:10 -08:00
amantley
80ebde1036
started cleanup of pr
2018-11-14 17:27:45 -08:00
amantley
8256c652fc
added the hook to put the copy of the mutated bind poses into tthe skeleton
2018-11-14 17:02:25 -08:00
sabrina-shanman
e08bc7296f
Merge branch 'master' into hfm_serializer
2018-11-13 15:41:49 -08:00
amantley
a8d7b0503d
removed more cruft
2018-11-13 14:24:18 -08:00
Brad Hefta-Gaub
bb2239c0bd
Merge pull request #14359 from howard-stearns/no-url-logging
...
remove urls from logs in Interface
2018-11-13 13:19:30 -08:00
amantley
c80ade98ec
cleaned up white space
2018-11-13 12:10:10 -08:00
Brad Hefta-Gaub
153b8920be
Merge pull request #14348 from sabrina-shanman/hfm_library
...
(case 19302) Create the HFM library and namespace
2018-11-13 12:03:53 -08:00
amantley
f83edf4b7f
joint offsets working. reset working. to do: handling extra joints
2018-11-13 11:29:01 -08:00
Howard Stearns
ad7266062d
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-13 10:33:27 -08:00
John Conklin II
85e5c1d6ef
Merge pull request #14363 from SimonWalton-HiFi/scale-avatar-joint-translations
...
Send avatar-joint translations at world scale
2018-11-13 10:04:30 -08:00
sabrina-shanman
f971294d6d
Make HFMSerializer return a smart pointer to an HFMModel
2018-11-12 16:12:21 -08:00
sabrina-shanman
00f2b4eeb9
Make the existing model serializers based on HFMSerializer
2018-11-12 16:12:20 -08:00
sabrina-shanman
83cc90ace0
Re-name GLTFReader to GLTFSerializer and do the same for other model readers
2018-11-12 16:12:20 -08:00
sabrina-shanman
753557736e
Merge branch 'master' into hfm_library
2018-11-12 15:03:30 -08:00
amantley
bcd651a65d
adding the member variable to keep track of the orig bind matrices to fbx.h
2018-11-12 14:39:48 -08:00
amantley
3f732baf86
Merge remote-tracking branch 'upstream/master' into avatarPipelineOffsets
2018-11-12 14:38:17 -08:00
Howard Stearns
66ae01e0c3
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-12 12:55:20 -08:00
amantley
5bb2378cd9
changes to get the engineer working
2018-11-09 15:10:14 -08:00
Angus Antley
fd365b5509
added debug print to fbx reader to see if the fst is being read correctly
2018-11-09 07:22:36 -08:00
Angus Antley
dce040978c
works two joint avatar with luis's new code. remains to do the engineer
2018-11-09 01:31:27 -08:00
Angus Antley
e36ab9efd6
cleaned up for merge with luis
2018-11-09 00:44:52 -08:00
Angus Antley
244b768b9a
fixed the absolute default joint poses so they work for the 2 joint avatar
2018-11-08 23:42:50 -08:00
amantley
2cd3575e32
merged with master with hfm file changes
2018-11-08 17:31:49 -08:00
amantley
8735b409ab
in the process of changing the rotation application to being absolute joints not local
2018-11-08 17:12:10 -08:00
amantley
6b4620b4a1
working on the input mapper problem for the offset rotations
2018-11-07 17:32:23 -08:00
amantley
1dbccc814b
working on the ik dislocation caused by the offsets, head is what I am working on
2018-11-06 17:35:53 -08:00
Simon Walton
f88168bdfb
Send avatar-joint translations at world scale
2018-11-06 17:29:02 -08:00
Roxanne Skelly
cef7000a72
Case 19754 - Remove logging URLs and related file locations.
...
The goal is to strip out data that can be used by untoward users in
copying models, avatars, etc.
2018-11-06 16:24:32 -08:00
amantley
e52f2ab7d6
works for two joints now
2018-11-06 14:14:57 -08:00
luiscuenca
0f1b12475e
Use clamp
2018-11-06 10:15:17 -07:00
luiscuenca
0f183b409b
Fix warnings
2018-11-06 10:08:06 -07:00
luiscuenca
f9b6d3dc6f
Merge addTransitAPI branch
2018-11-05 19:02:35 -07:00
amantley
f0c02bb49b
more debug
2018-11-05 17:36:54 -08:00
amantley
484eb8ba09
debugging unity offsets
2018-11-05 14:56:58 -08:00
sabrina-shanman
2801f324b7
Switch references to HFM to the HFM lib and remove HFM classes in FBX
2018-11-05 12:47:34 -08:00
sabrina-shanman
30eb360f62
Convert remaining HFMModels called model to hfmModel, and rename some missed local variables
2018-11-05 12:07:17 -08:00
amantley
d231a35dfa
changes to get spine2 and neck to work almost there
2018-11-05 08:35:01 -08:00
amantley
5392d21b1c
loading test file to check rotation offsets
2018-11-02 17:59:18 -07:00
sabrina-shanman
cbca77b12f
Rename HFMGeometry to HFMModel and adjust related variables
2018-11-01 17:17:48 -07:00
amantley
64d8fa6875
added the const argument to the AnimSkeleton constructor that allows the offset rotations to be passed in
2018-11-01 13:33:03 -07:00
amantley
f1d9ab76b4
Merge remote-tracking branch 'luis/readRotationOffsetsFromFst' into avatarPipelineOffsets
...
merging code from luis case #19420 for getting the rotations from the
fst into the rig class
2018-10-31 10:29:58 -07:00
luiscuenca
c070bce2ec
Read joint rotation offsets from .fst
2018-10-31 08:39:35 -07:00
amantley
e24f10a125
debugging offset vector
2018-10-30 17:33:28 -07:00
sabrina-shanman
becee7f010
Re-name FBXGeometry to HFMGeometry and do the same for related classes
2018-10-30 17:28:42 -07:00
amantley
339ecb1faa
adding the offsets to the AnimSkeleton.cpp
2018-10-30 16:54:34 -07:00
Jeff Clinton
eb383b1d09
Merge pull request #14040 from hyperlogic/feature/acceleration-limit-filter
...
Quality Improvements to Avatars driven by Vive Trackers
2018-10-25 08:51:59 -07:00
Jeff Clinton
67fe43ebb1
Merge pull request #14243 from hyperlogic/bug-fix/small-jumping-avatars
...
Small avatars now have a minimum jump height of 0.25 meters
2018-10-24 17:08:28 -07:00
luiscuenca
fa67e1b269
Remove logs and magic numbers
2018-10-23 11:51:15 -07:00
luiscuenca
afc76fec72
Added overrideNetworkAnimation and restoreNetworkAnimation methods
2018-10-22 15:20:32 -07:00
Luis Cuenca
e1c760b566
Merge branch 'master' into transitAddAnimation
2018-10-20 15:30:23 -07:00
luiscuenca
f8d67d124f
Hold flickering fixed and refactor
2018-10-20 15:22:25 -07:00
Seth Alves
2ce8ed25f8
Merge pull request #14125 from Atlante45/fix/mac-warnings
...
Fix new Mac warnings
2018-10-20 13:40:53 -07:00
Sam Gateau
6005b934ad
Merge pull request #13979 from AndrewMeadows/game-loop-optimizations-001
...
minor bug fix and optimization in ModelEntity animation
2018-10-19 17:02:48 -07:00
luiscuenca
31d099907a
Fix warnings
2018-10-19 14:00:52 -07:00
Anthony Thibault
ef74014075
Small avatars now have a minimum jump height of 0.25 meters
...
This should improve the quality of the jump animation and improve the mobility of small avatars.
2018-10-19 13:55:56 -07:00
John Conklin II
4dec304d66
Merge pull request #14162 from luiscuenca/cleanElbowPoleVectorSmooth
...
Clean up elbow smoothing code
2018-10-18 19:16:32 -07:00
luiscuenca
bb5c042f16
Blend network animation
2018-10-18 17:51:20 -07:00
Anthony Thibault
3e68a1d5a5
Merge branch 'master' into feature/acceleration-limit-filter
2018-10-18 16:51:57 -07:00
Sam Gondelman
e3543cf098
Merge branch 'master' into scriptvec3
2018-10-17 13:10:29 -07:00
Andrew Meadows
148944814b
consolidate two bad string checks into one
2018-10-17 11:45:39 -07:00
luiscuenca
078baa86e4
Sitting abort post transit animation
2018-10-16 13:16:01 -07:00
luiscuenca
7da5fa9ea7
Transit animations won't play, they just get sent over the network
2018-10-16 11:33:58 -07:00
Anthony Thibault
640ed6a32a
Added "Developer > Avatar > Show Tracked Objects" menu
2018-10-15 12:42:07 -07:00
Anthony Thibault
c0ceb713ec
Spine2 IKTarget now smoothly interpolates when ik target is disabled.
...
Also all smooth ik interpolations use easeInExpo instead of linear curves.
2018-10-09 16:48:28 -07:00
Clement
8983fe2bcf
Fix new Mac warnings
2018-10-09 12:11:55 -07:00
Anthony Thibault
4e75123740
Blend between non-estimated and estimated hips in Rig
2018-10-09 10:51:03 -07:00
Anthony Thibault
0283c9fbdc
Added CriticallyDampedSpringPoseHelper to help smooth out hips.
2018-10-09 10:51:02 -07:00
unknown
1172e29d95
Clean up elbow smoothing code
2018-10-08 13:21:47 -07:00
SamGondelman
4024f2a180
fix various resourcecache bugs
2018-10-04 11:29:22 -07:00
Sam Gondelman
5b6e7b2566
Merge branch 'master' into scriptvec3
2018-10-02 08:58:04 -07:00
Anthony Thibault
b0cde2afcc
Small addition to Anim Stats
...
* During a state machine interp the previous state now shows up in AlphaValues panel, with parentheses around the name.
* Added 3 new fields
* Position - in world coordinate frame.
* Heading - the facing angle in the world corrdinate frame.
* Local Vel - the velocity of the character in the local coordinate frame. (left, forward, up).
2018-09-14 15:05:17 -07:00
SamGondelman
c522d1bc93
merge with master
2018-09-14 00:57:13 -07:00
Anthony Thibault
5a059e9318
Fix for build failure on linux and android.
2018-09-07 09:44:19 -07:00
Anthony Thibault
acc7f1f168
Moved AnimStats into its own qml panels.
...
Added state machine tracking as well.
2018-09-06 16:18:58 -07:00
Anthony Thibault
3a3ffcc98c
First pass at improving anim stats.
2018-09-05 18:14:06 -07:00
SamGondelman
589e88af4a
Merge remote-tracking branch 'upstream/master' into scriptvec3
2018-09-04 17:54:45 -07:00
SamGondelman
9b75c7e07f
trying to separate colors and vectors
2018-09-04 17:20:05 -07:00
Anthony Thibault
e210fadc7c
Fix for glitch when entering inAir state from takeoff.
...
This was due to a frame lag of blend factor used for inAir blending. So the first frame the upward velocity would be 0, followed by 3.5 m/s the next frame.
This is fixed by using the workingVelocity instead of _lastVelocity to drive the blend.
2018-09-04 14:36:56 -07:00
