Commit graph

33704 commits

Author SHA1 Message Date
sabrina-shanman
83229db458 Fix GLTFSerializer not reading tangents 2019-10-24 15:49:03 -07:00
sabrina-shanman
1fe1321b6c Disable GLTF skinning 2019-10-24 15:48:59 -07:00
sabrina-shanman
d497052505 Fix GLTF claiming to have no cluster weights when it is skinned 2019-10-23 17:13:38 -07:00
Sabrina Shanman
6db993fe05
Merge pull request #16397 from sabrina-shanman/instancing_skinning
(DEV-561) First pass at skinning for GLTF
2019-10-23 15:41:12 -07:00
sabrina-shanman
ca164375f1 New skinning for GLTF 2019-10-23 10:41:36 -07:00
Sabrina Shanman
68e39eee2e
Merge pull request #16377 from samcake/instancing
Instancing: Clean ups, simpler Skin Cluster(s) updates
2019-10-18 11:46:27 -07:00
Sam Gateau
a95a4b5aa2 Address warnings and comments from review 2019-10-18 11:43:25 -07:00
sabrina-shanman
ad6720240f Introduce hfm::Mesh.clusterWeightsPerVertex 2019-10-18 11:30:48 -07:00
Sabrina Shanman
5d91d22314
Merge pull request #16379 from highfidelity/master
Merge master into instancing
2019-10-18 10:24:35 -07:00
Sam Gateau
0321e2c2c3 Merge branch 'instancing' of github.com:highfidelity/hifi into instancing 2019-10-18 10:22:20 -07:00
Sam Gateau
c93ac05994
Merge pull request #16378 from sabrina-shanman/instancing_skinning
(DEV-559) Move skinning reweighting code out of model prep
2019-10-18 10:21:26 -07:00
sabrina-shanman
be9931bcab Move skinning reweighting code out of model prep to hfm library; use in FBXSerializer. 2019-10-18 10:08:45 -07:00
Sam Gateau
695b9cdba6 Clening up left over comments and typos, simplify the code to update Matrices in the model classes and removed renderITemsIdMap because not needed, chasing the problem of the physics objects transform 2019-10-18 03:31:06 -07:00
Sam Gateau
c89e682b77 address warning 2019-10-17 16:24:21 -07:00
Sam Gateau
bd57cc7b14 Fixing bad indexing 2019-10-17 15:56:41 -07:00
luiscuenca
33ea63c708
Fix warnings and update controls 2019-10-17 15:06:12 -07:00
Sam Gateau
55ed7d9a53 Add support for shape generation for obj serializer 2019-10-17 14:53:32 -07:00
luiscuenca
63c2b41929
Restate legacy first person camera mode 2019-10-17 13:26:42 -07:00
Sam Gateau
01bb8fa601 Merge branch 'instancing' of github.com:highfidelity/hifi into instancing 2019-10-17 09:55:50 -07:00
Sam Gateau
9159258b50 clean ups 2019-10-16 17:42:36 -07:00
sabrina-shanman
acbdd2b3b5 Fix not building due to removed shape.transform 2019-10-16 17:04:19 -07:00
Brad Hefta-Gaub
6d895942f3
Merge pull request #16350 from ctrlaltdavid/DEV-2391
DEV-2391: Fix Recording.stopRecording() crash
2019-10-16 15:33:13 -07:00
sabrina-shanman
0c3e81f52f Merge branch 'instancing' of github.com:highfidelity/hifi into instancing_gltf 2019-10-16 14:03:01 -07:00
sabrina-shanman
5df4092f67 Merge branch 'instancing_gtlf_wip' into instancing_gltf 2019-10-16 13:40:23 -07:00
Sam Gateau
e9e9d1cdfe Merge branch 'instancing' of github.com:highfidelity/hifi into instancing 2019-10-16 13:15:40 -07:00
Sam Gateau
af269a4720 Merge branch 'master' of github.com:highfidelity/hifi into upstream-instancing 2019-10-16 11:57:15 -07:00
Shannon Romano
71ef645781
Merge pull request #16351 from dooglifeSF/transition-locomotion-to-idle-based-on-input-and-speed
Fix sliding when stopping from run.
2019-10-16 09:03:00 -07:00
Sam Gateau
0a9c389641 last issue 2019-10-16 08:06:35 -07:00
Sam Gateau
fc4a314fd3 Merge branch 'instancing' of https://github.com/highfidelity/hifi into instancing 2019-10-16 04:08:58 -07:00
Sam Gateau
eecaeb1155 FOund the issue why the skinning was incorrect, removed unecessary data structures in the newly added objects and renamed Deformer to SkinCluster and DYnamicTransform to SkinDeformer 2019-10-16 04:02:05 -07:00
Sam Gateau
f049ab7887 Understanding that CLuster can be just one for a mesh and we need the bindingMatrix to be applied correctly, differenciating intentionnally the transform for bound evaluation and the one used for render in the case of SKinned mesh because the clusterMatrices contain the extra offset from rig to model 2019-10-15 18:12:09 -07:00
dooglifeSF
0510215240 Move magic number to constant for SLOW_SPEED_THRESHOLD. 2019-10-15 17:48:06 -07:00
Shannon Romano
bebb21fa9e
Merge pull request #16352 from hyperlogic/bug-fix/legacy-sit-script
Bugfix for legacy sit scripts
2019-10-15 16:19:49 -07:00
Anthony J. Thibault
14e5962675 Bugfix for legacy sit scripts
Don't return additive clip nodes as valid "roles" for users to override.
2019-10-15 15:29:24 -07:00
Zach Fox
1527bf2e11
Merge pull request #16294 from RebeccaStankus/friction
First Time User Experience Project
2019-10-15 14:56:25 -07:00
dooglifeSF
a043f0a17e Create isNotInputSlow var for stategraph switch when no input and speed less than 1.5 m/s 2019-10-15 14:51:42 -07:00
David Rowe
185d6990eb Add missing threading checks to Recording API methods 2019-10-16 09:17:29 +13:00
Seth Alves
1f8a7cfea7 fix step translate actions 2019-10-15 09:23:35 -07:00
Sam Gateau
108d331d86 more 2019-10-14 17:45:07 -07:00
sabrina-shanman
acca22e2d6 Remove unused primitive reference in GLTFSerializer 2019-10-14 15:30:03 -07:00
David Rowe
e708cb98bb Fix crash in Recorder.stopRecording() when no recording is being made 2019-10-15 11:29:49 +13:00
sabrina-shanman
2c99ab5e54 Merge branch 'instancing' of github.com:highfidelity/hifi into instancing_gltf 2019-10-14 15:05:13 -07:00
Sabrina Shanman
c38462bf6d
Merge pull request #16345 from highfidelity/master
Merge master into instancing
2019-10-14 14:54:22 -07:00
sabrina-shanman
82247072de Create new mesh if GLTF primitive has different vertex attributes 2019-10-14 14:51:57 -07:00
Zach Fox
341abb8185 Merge branch 'master' of github.com:highfidelity/hifi into friction 2019-10-14 12:36:35 -07:00
Zach Fox
a1b6b0af35
Merge pull request #16336 from ctrlaltdavid/DEV-1867
DEV-1867: Fix toolbarTest.js
2019-10-14 11:50:59 -07:00
Sam Gateau
95cabb7597 Merge branch 'master' of github.com:highfidelity/hifi into instancing 2019-10-14 10:04:25 -07:00
Shannon Romano
83875089e4
Merge pull request #16328 from Atlante45/fix/account-settings
DEV-2376: Don't post account settings after pull
2019-10-14 08:49:22 -07:00
Sam Gateau
05ac9aefa8 the clusterMatrices should be working, but n skin index and weights are assigned yet 2019-10-14 02:21:01 -07:00
Sam Gateau
8af507571c Merge branch 'master' of https://github.com/highfidelity/hifi into instancing 2019-10-12 20:04:20 -07:00