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
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
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
sabrina-shanman
b2e3b87ef4
Add two missing CMake includes
2019-02-12 16:24:13 -08:00
SamGondelman
189ccfde4a
clement's comments from PR14858
2019-02-12 09:51:11 -08: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
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
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
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
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
Anthony Thibault
2c40b120ca
Make Animation Tests Pass Again
2019-01-30 17:26:52 -08:00
sabrina-shanman
203e8e2455
Realize joint properties isFree and freeLineage are unused, so tear them out
2019-01-29 11:55:35 -08:00
Shannon Romano
fd04996853
Merge pull request #14755 from hyperlogic/bug-fix/joint-mesh-name-collisions
...
Bug fix for avatars that have mesh/joint name duplicates
2019-01-25 09:59:44 -08:00
John Conklin II
1768d91780
Merge pull request #14733 from hyperlogic/bug-fix/translation-precision
...
Avatar Protocol: Fix for precision issues with translation
2019-01-23 14:07:58 -08:00
Anthony Thibault
5146f3dfae
Bug fix for avatars that have mesh/joint name duplicates
...
This change has two parts. First we do a better job of identifying joints vs meshes in the FBXSerializer.
Second we use this information to better handle duplicate names in AnimSkeleton.
When a duplicate is detected, allow joints to override meshes.
This will ensure that when joints are looked up by name we will not return a mesh object with the same name by mistake.
2019-01-22 10:47:01 -08:00
Anthony Thibault
e68a8794ce
Remove unused variable
2019-01-17 16:18:43 -08:00
Anthony Thibault
286f23d512
Updated protocol version and fixed bugs
2019-01-17 15:19:54 -08:00
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
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
