luiscuenca
f47ec09927
use UP_AXIS_Y
2019-02-26 14:01:30 -07:00
luiscuenca
db1c78246f
Read and apply the FBX upVector parameter
2019-02-26 11:32:43 -07:00
John Conklin II
5f0db88a20
Merge pull request #14914 from raveenajain/gltf_tangents
...
Case 21165: tangent attribute
2019-02-15 11:24:21 -08:00
raveenajain
01def37efd
spacing
2019-02-14 14:22:43 -08:00
SamGondelman
13ece79476
merge with master
2019-02-13 16:30:22 -08:00
raveenajain
a967d7a1bc
tangent attribute
2019-02-13 15:59:55 -08:00
sabrina-shanman
b2af6d1374
Have only one ColorChannel enum as header in image library
2019-02-12 16:14:41 -08:00
sabrina-shanman
2b355e9d52
Re-name ColorChannelMapping to ColorChannel and put versions in two specific libraries rather than shared
2019-02-12 11:56:44 -08:00
sabrina-shanman
2c5446dfb5
Merge branch 'master' into gltf_mat-support
2019-02-11 17:46:23 -08:00
Jeff Clinton
123c2301da
Merge pull request #14858 from SamGondelman/fst
...
Case 21046: Fix Subsurface Scattering and ResourceCache "extra" bug
2019-02-11 17:40:44 -08:00
SamGondelman
77a8ddb3f0
Merge remote-tracking branch 'upstream/master' into materialMapping
2019-02-11 16:35:05 -08:00
sabrina-shanman
e16e968e98
Merge branch 'fst' of github.com:SamGondelman/hifi into gltf_mat-support
2019-02-11 16:23:15 -08:00
SamGondelman
4202685a4b
Merge remote-tracking branch 'upstream/master' into fst
2019-02-11 16:07:36 -08:00
sabrina-shanman
23806ed67d
Add support for GLTF roughness/metallic
2019-02-08 18:54:40 -08:00
raveenajain
709f784fea
:}
2019-02-08 16:51:18 -08:00
raveenajain
43a1c78402
Merge branch 'master' into glb_files
2019-02-08 15:59:01 -08:00
Shannon Romano
bd33855820
Merge pull request #14786 from raveenajain/gltf_update
...
Case 20866: gltf color attribute
2019-02-08 15:27:41 -08:00
Shannon Romano
48db974aec
Merge pull request #14843 from raveenajain/gltf_embedded
...
Case 20937: gltf embedded data
2019-02-08 15:27:07 -08:00
raveenajain
446176d3a5
update to parse glb files
2019-02-07 15:08:04 -08:00
SamGondelman
e601f6c59f
move material mapping to hfm prep step
2019-02-07 14:10:09 -08:00
SamGondelman
3addcb630c
Merge remote-tracking branch 'sabrina/hfm_prep_joints' into materialMapping
2019-02-07 11:45:59 -08:00
SamGondelman
3ee448a89a
fix scattering and working on resource cache bug
2019-02-05 17:32:15 -08:00
raveenajain
253e3554af
feedback
2019-02-05 10:18:34 -08:00
raveenajain
21fa1878cb
spaces
2019-02-05 09:28:47 -08:00
raveenajain
d109c0fb1b
feedback changes
2019-02-05 09:23:10 -08:00
raveenajain
d1d8832e7a
read in embedded data
2019-02-01 11:27:43 -08:00
raveenajain
997660d430
review changes
2019-01-31 13:50:17 -08:00
raveenajain
216e9bd4cb
Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_update
2019-01-31 13:47:38 -08:00
raveenajain
ae09aec5d9
embedded model geometry
2019-01-31 13:36:53 -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
sabrina-shanman
eace901278
Fix not calculating joint freeLineage list properly
2019-01-29 10:29:12 -08:00
sabrina-shanman
3e7a80ac4c
Move FST joint name and rig processing to the model preparation step
2019-01-28 17:49:29 -08:00
sabrina-shanman
ff9280a496
Remove unused properties related to mapping from FBXSerializer
2019-01-28 16:29:36 -08:00
Jeff Clinton
9b09c09aeb
Merge pull request #14770 from sabrina-shanman/hfm_prep_tangents
...
(case 20822) Add normal/tangent generation to HFM preparation step
2019-01-28 12:41:55 -08:00
raveenajain
e112bf19cb
gltf color attribute
2019-01-28 11:08:09 -08:00
Adam Smith
e648ce38c0
Merge pull request #14679 from sabrina-shanman/bug_uv-scale
...
(case 20096) Fix missing support for UV scaling parameters in FBX files
2019-01-25 16:21:15 -08:00
sabrina-shanman
fe60b8e69b
Remove now redundant tangent generation code
2019-01-24 13:03:51 -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
sabrina-shanman
df17614fc3
Actually, don't support 3d vectors for Maya uv scale/offset
2019-01-15 11:16:22 -08:00
sabrina-shanman
f02d6433e3
Be more descriptive about Maya uv scale/translation property, and better guess for 3d vector case
2019-01-15 11:09:16 -08:00
sabrina-shanman
c875492d50
Be more efficient with MaterialParam in FBXSerializer::getTexture
2019-01-15 10:29:12 -08:00
sabrina-shanman
5173577a92
Fix issues with uv scale checking
2019-01-14 10:11:30 -08:00
sabrina-shanman
00a9e9e92f
Add support for Maya material uv scale/translation
2019-01-11 17:14:10 -08:00
sabrina-shanman
5b207775e7
Remove redundant TextureParam transform variables
2019-01-11 17:12:09 -08:00
Seth Alves
114bcc003a
quiet build warnings
2019-01-11 15:53:49 -08:00
sabrina-shanman
f349e48a25
Fix support for FBX texture scaling using ModelUVTranslation/ModelUVScaling
2019-01-09 17:14:03 -08:00
Ryan Huffman
c2ceeb3d76
Apply AvatarPackager code review cleanup
2019-01-04 09:41:31 -08:00
Thijs Wenker
cb33a91a34
- rename functionality
...
- avatar packager works in tablet now
2018-12-29 03:31:56 +01:00
Thijs Wenker
1ec8aa8fa5
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2018-12-28 17:13:05 +01:00
Adam Smith
0d27cb65ca
Merge pull request #14576 from sabrina-shanman/hfm_prep_graphics
...
(case 20297) Move graphics preparation from Serializers to runtime preparation step
2018-12-27 15:46:21 -08:00
Thijs Wenker
1a38abe230
- add jointIndexes to new
...
- attempt to fix OSX / linux build
- ability to actually load a recent project (previously was only able to load the top recent project)
2018-12-27 21:47:10 +01:00
Ryan Huffman
1da179dc04
Update avatar packager styling
2018-12-27 00:13:45 -08:00
Thijs Wenker
ad2d9bc79a
- fst read/write should work
...
- images are being copied into the correct directory
- scripts are added to fst upon project load
- modal overlay fix
2018-12-21 19:34:54 +01:00
Thijs Wenker
ea901aa179
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2018-12-21 14:11:57 +01:00
Thijs Wenker
dab4a621a3
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
2018-12-21 01:59:11 +01:00
Ryan Huffman
556f516be6
Update uploader screen
2018-12-20 16:30:08 -08:00
luiscuenca
52bfaafd91
Fix crash on glTF import when the file contains embedded buffers
2018-12-20 13:25:19 -07:00
Thijs Wenker
79a9c82168
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2018-12-20 18:56:33 +01:00
Ryan Huffman
202326dbac
Merge branch 'feat/avatarTools/avatarPackager' of https://github.com/thoys/hifi into feat/avatarTools/avatarPackager
2018-12-19 12:03:30 -08:00
Thijs Wenker
cb74313de8
create projects / style changes
2018-12-19 19:23:24 +01:00
Ryan Huffman
720cd90dc7
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2018-12-18 13:17:28 -08:00
amantley
3e1beb2dca
removed white space and stray semi colon
2018-12-17 15:05:51 -08:00
amantley
defdc9fbcb
removed humanIK joint name code from fbx serializer
2018-12-17 10:56:53 -08:00
amantley
6e5c52972a
removed member declarations in hfm.h and debug print statements
2018-12-17 10:42:08 -08:00
Angus Antley
77fa4e7d13
took out the unnecessary hfm.jointindex code
2018-12-16 17:29:16 -08:00
Ryan Huffman
78c4c2599e
Add start of marketplace uploading and project file list
2018-12-13 13:27:31 -08:00
sabrina-shanman
e8a2622ed6
Move graphics prep to baker and add related tasks for splitting
...
up the model
2018-12-13 11:15:56 -08:00
sabrina-shanman
ec748c60cf
Give more appropriate names for some model-related constants and move them into HFM.h
2018-12-13 10:37:35 -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
sabrina-shanman
f2e69aec5e
Fix mac warning for OBJSerializer::getFactory not marked with override
2018-12-07 13:41:33 -08:00
sabrina-shanman
7cbe3776f5
Simplify serializer registration process
2018-12-07 12:05:27 -08:00
amantley
f8ae0227c3
added the lean joint back and fixed a name mapping reversal in fbxserializer.cpp
2018-12-06 20:16:03 -08:00
amantley
ca0133a2a6
put the lean joint back in
2018-12-06 16:24:06 -08:00
sabrina-shanman
6ea4769173
Re-name MIMETypeLibrary to MediaTypeLibrary and update related references
2018-12-06 13:39:18 -08:00
amantley
edab74caa4
mapped the model joint names to hifi compliant joint names in FBX serializer
2018-12-04 16:20:46 -08:00
sabrina-shanman
a63888cac8
Remove unused default constructor for GLTFSerializer
2018-12-04 09:30:04 -08:00
sabrina-shanman
30c4830bd8
Make Serializers use SimpleFormat
2018-12-04 09:30:03 -08:00
amantley
f7fcf503c2
removed joint lean from fbxSerializer. it was unused
2018-12-03 14:50:57 -08:00
Angus Antley
a73f74d63c
Merge remote-tracking branch 'upstream/master' into jointNameMapping
2018-11-30 21:29:29 -08:00
sabrina-shanman
74015a1a5e
Implement hfm::Format/hfm::Factory for model serializers
2018-11-30 16:50:53 -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
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
fd9c05ce80
joint mapping. adding to fbx reader and avatar classes to get non standard names to map to hifi
2018-11-16 17:39:46 -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
Sam Gondelman
13f650d514
Merge pull request #14093 from SamGondelman/police
...
Case 19409, Case 19468: Fading fixes and shader cleanup
2018-11-13 15:00:23 -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
amantley
f83edf4b7f
joint offsets working. reset working. to do: handling extra joints
2018-11-13 11:29:01 -08:00
Howard Stearns
938b45d3da
more removal
2018-11-13 11:05:45 -08:00
sabrina-shanman
8e0fb0f9c4
Remove unused alternate read functions in FBXSerializer
2018-11-12 16:12:21 -08:00
sabrina-shanman
f971294d6d
Make HFMSerializer return a smart pointer to an HFMModel
2018-11-12 16:12:21 -08:00
sabrina-shanman
5a9af5b2c3
Correct the folder location in the FBXSerializer header/source top comment
2018-11-12 16:12:21 -08:00
