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
sabrina-shanman
baa8cdb054
Remove combineParts from the Serializer interface
2018-11-12 16:12:21 -08:00
sabrina-shanman
0cbe0bd266
Add missing copyright comment and header guard to OBJSerializer.h
2018-11-12 16:12:20 -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
92befbc5bf
implementing backup of cluster matrices
2018-11-12 11:12:56 -08:00
amantley
5bb2378cd9
changes to get the engineer working
2018-11-09 15:10:14 -08:00
SamGondelman
1d1510e18e
Merge remote-tracking branch 'upstream/master' into police
2018-11-09 13:32:41 -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
luiscuenca
2586811e76
Merge with master
2018-11-08 18:05:19 -07:00
Brad Davis
8c4237b520
Fix warnings
2018-11-08 12:27:56 -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
sabrina-shanman
8fa72396ef
Consolidate HFM class implementations into source file and move model
...
logging.
2018-11-06 14:05:36 -08:00
sabrina-shanman
1a69afb3e8
Move HFM.h to hfm subfolder per convention
2018-11-06 11:43:19 -08:00
luiscuenca
e0d1ef3be3
Fix debug output
2018-11-06 11:11:16 -07:00
luiscuenca
599b7761b2
Read quats from fst
2018-11-06 11:09:56 -07:00
luiscuenca
8310dd0cba
Delete leftovers
2018-11-05 15:10:09 -07:00
luiscuenca
bcde01621d
set offsets on FBXGeometry
2018-11-05 14:25:52 -07: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
sabrina-shanman
cbca77b12f
Rename HFMGeometry to HFMModel and adjust related variables
2018-11-01 17:17:48 -07:00
sabrina-shanman
0b7ddca5f6
Change naming for straggler names in model loading debug dumps
2018-10-31 14:03:20 -07:00
luiscuenca
914491ae27
fix YX coord swamp
2018-10-31 11:48:55 -07:00
luiscuenca
c070bce2ec
Read joint rotation offsets from .fst
2018-10-31 08:39:35 -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
Zach Fox
493262052c
Remove extraneous code changes; remove QUrlAncestry code; remove extra logging
2018-10-22 13:59:52 -07:00
Kerry Ivan Kurian
3b15548ea3
Display resource-access events in marketplace item tester
...
Includes refactoring marketplace item tester into a single-page app.
2018-10-18 01:04:47 -07:00
SamGondelman
cce0981d6c
Merge remote-tracking branch 'upstream/master' into police
2018-10-17 11:40:01 -07:00
sam gateau
e5df356774
Fixing warnings from jenkins
2018-10-02 12:38:14 -07:00
Sam Gateau
c593f00839
Merge branch 'master' of https://github.com/highfidelity/hifi into black-bis
2018-10-01 19:10:18 -07:00
sam gateau
392e2ff535
trying and failing andad trying and rince and repeat
2018-10-01 17:45:16 -07:00
Seth Alves
b69d0f3997
get interface building and working with clang-7 on ubuntu 18
2018-09-28 13:46:51 -07:00
sam gateau
eb97f0d193
Bringing back packed normal and tangents for static mesh!
2018-09-27 17:27:55 -07:00
SamGondelman
09a6053044
cleaning up fragment shaders
2018-09-26 14:10:47 -07:00
sam gateau
609bc6385e
Merge branch 'black' of github.com:samcake/hifi into black-bis
2018-09-18 17:40:45 -07:00
sam gateau
ec6117e9bb
bringing the blendshape in skin shader only work in master
2018-09-18 17:40:29 -07:00
Sam Gateau
986dece4ec
Add name of the batch during tracing and introduce detailed tracing if needed and one error message in the case the materialMap is detected in an fst file but not understood
2018-09-14 20:24:22 -07:00
SamGondelman
2b2091290e
fix everything
2018-09-12 15:32:35 -07:00
Sam Gateau
5140999445
Forcing all the meshes with 3 buffers aka the blendshape layout
2018-09-07 15:57:04 -07:00
sam gateau
fa72910ac1
fixing fuckeries
2018-09-07 11:14:12 -07:00
sam gateau
6544e9f0b0
Removing the commented debug code
2018-09-06 13:58:03 -07:00
sam gateau
21f65d8a78
position are used correctly for evaluting bounds in the Mesh
2018-09-05 17:50:06 -07:00
sam gateau
1feaf286b4
keeping position separated from the other attributes
2018-09-05 14:35:50 -07:00
sam gateau
ce86e94e6f
Add simple optim and instrumentation for tthe number of input buffer changes per frame"
2018-09-05 11:34:33 -07:00
sam gateau
8344cb9aff
REfactor the FBXReader_Mesh for different vertex formats
2018-09-05 11:07:04 -07:00
sam gateau
7de8f4867e
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-09-05 08:38:04 -07:00
sam gateau
adcabf52c5
Refactoring the FBXReader_MEsh.cpp for better interleaving
2018-09-04 17:33:18 -07:00
sam gateau
761e8a3f95
fixing warnings
2018-09-04 09:19:24 -07:00
Sam Gateau
e8d922a56c
Interleaving the attributes and relying on just 3 input buffers
2018-09-03 02:48:07 -07:00
NissimHadar
0f6fdef928
Fixed compilation error (within #ifdef)
2018-08-30 15:06:05 -07:00
NissimHadar
eeb63bd16a
Merge branch 'addMap_d' of https://github.com/NissimHadar/hifi into addMap_d
2018-08-30 15:04:39 -07:00
John Conklin II
26f76081e6
Merge pull request #13843 from luiscuenca/fixGLTFLoadTexFromDir
...
Read glTF resources from other than the main directory
2018-08-29 12:31:41 -07:00
NissimHadar
62814deb32
Added read of map_d from MTL files
2018-08-27 08:34:01 -07:00
SamGondelman
9ab1fc0500
Merge remote-tracking branch 'upstream/master' into perf
2018-08-20 17:04:42 -07:00
luiscuenca
d9b136cf5d
Read resources from other than the main directory
2018-08-20 11:06:51 -07:00
luiscuenca
c574305ddc
gltf importer accept local files and binary read fix
2018-07-16 10:19:38 -07:00
luiscuenca
fe571e9638
Fix scaling model twice
2018-06-26 16:37:12 -07:00
John Conklin II
286d09939d
Merge pull request #13205 from luiscuenca/GLTFfix1
...
Minor fix allows import glTF from Substance Painter
2018-05-25 08:28:29 -07:00
Anthony Thibault
eae5215d94
Merge pull request #13206 from ctrlaltdavid/21872-c
...
JSDoc fixes
2018-05-24 16:44:55 -07:00
Simon Walton
c205a856a7
Split canned FBX header in two; only check first part on read
2018-05-21 13:29:08 -07:00
David Rowe
e44e7ca35f
Fix up Resource and resource cache APIs' JSDoc
2018-05-21 11:57:16 +12:00
luiscuenca
1130f9998d
Minor fix allows import GLTF from Substance Painter
2018-05-19 10:42:55 -07:00
Simon Walton
7f2a90cdb9
Address couple of reviewer issues
2018-05-18 11:20:45 -07:00
Simon Walton
8716e9591e
Fixes for gcc compilation
...
Maybe even clang also.
2018-05-08 16:12:01 -07:00
Simon Walton
bcc4136462
Merge branch 'master' into half-baked-model
2018-05-08 15:51:25 -07:00
Simon Walton
82e43aea11
Baking - if mesh extraction or compression fails don't change node
...
Needed to prevent a null (would-be Draco mesh) node being added.
2018-05-08 13:59:38 -07:00
Simon Walton
37ead11cf9
Modify FBX reader to allow for multiple empty node
...
Some baked files can have spurious empty nodes in
them; this was causing chunks of the FBX file to be
missed. Also more tweaks for FBX to JSON conversion.
https://highfidelity.manuscript.com/f/cases/14329/
2018-05-07 18:18:16 -07:00
Simon Walton
94f4803d52
Add debug code to dump before/after FBXNode to file
...
Also fix trailing comma issue in json since gvim complains
bitterly.
2018-05-04 17:28:18 -07:00
Clement
da9fb9c751
Fix non self-sufficient headers
2018-05-04 16:26:41 -07:00
Simon Walton
e22bc7eff2
Add FBXNode to JSON stream class
2018-05-04 14:10:22 -07:00
Simon Walton
a17359d2df
Ensure a minimum of one joint-verts sets to prevent crash
...
A baked FBX that has no joints will cause a crash without
this.
2018-05-03 17:26:25 -07:00
John Conklin II
7a5fce4315
Merge pull request #12991 from luiscuenca/avatarScript
...
Avatar Scripts
2018-05-02 12:23:13 -07:00
luiscuenca
689fbd2da0
added requested changes
2018-05-02 11:09:17 -07:00
John Conklin II
83d370f1af
Merge pull request #12872 from huffman/fix/vertex-colors-fbx
...
Fix FBX vertex colors not being read correctly
2018-05-02 10:22:01 -07:00
luiscuenca
2de982a5a2
Added script types and better script reload
2018-04-30 12:04:35 -07:00
Oren Hurvitz
a226790295
Eliminated warnings in gcc
...
Note that the call to encodeNode() in FBXWriter.cpp can never be reached, so it's safe to remove it.
2018-04-30 15:05:27 +03:00
luiscuenca
e0770f06b1
Add scripts to Model Packager
2018-04-25 19:35:26 -07:00
luiscuenca
165c3214a7
Avatar Scripts
2018-04-24 18:43:53 -07:00
Seth Alves
bec39369f7
remove some uncatagorized logging, suppress some categories by default
2018-04-20 16:08:57 -07:00
Ryan Huffman
5bf894d1f7
Fix FBX vertex colors not being read correctly
2018-04-11 16:48:02 -07:00
Simon Walton
ed3347a89b
Repeated logging - reviewer fixes
2018-04-04 14:11:10 -07:00
Simon Walton
692ccfc09b
Create HIFI_FCDEBUG(_ID) variants that require a category
...
Original macros use default settings.
2018-04-04 09:49:15 -07:00
Simon Walton
7d16ca9c1c
Remove uses of addRepeatedMessageRegex() and its implementation
...
Change to new log-message ID scheme.
2018-04-03 17:54:01 -07:00
Ryan Huffman
ac0ecc8baa
Merge remote-tracking branch 'upstream/master' into feat/obj-baker-update
2018-03-05 10:41:49 -08:00
humbletim
f824edd04e
* remove Model_temporary_hack
...
* split gpuhelpers and mesh part
* fix objwriter
* more work on bufferview helpers
* cr cleanup
2018-02-26 04:58:22 -05:00
humbletim
d1c4bde677
revert OBJWriter.cpp
2018-02-22 20:53:27 -05:00
humbletim
ec4f9fdc11
fix displayName
2018-02-22 08:31:05 -05:00
humbletim
d52dce8e09
restore code for debugging
2018-02-22 08:24:56 -05:00
humbletim
e3c269d582
remove debug string
2018-02-22 08:22:13 -05:00
humbletim
e4a2a589a5
CR fedback and cleanup
2018-02-22 07:56:09 -05:00
humbletim
72fca7e57e
Merge remote-tracking branch 'samuel/scriptableMaterials' into Leopoly_Phase1_010_graphics-scripting-merge
2018-02-22 05:18:05 -05:00
humbletim
be8d79f53f
CR fedback and cleanup
2018-02-22 05:15:01 -05:00
SamGondelman
4c6169ec78
merge and a little cleanup
2018-02-20 15:45:34 -08:00
humbletim
5791ca4c51
interim checkin
2018-02-20 12:22:04 -05:00
Anthony J. Thibault
f07b1fa4c5
Revert "FBX node IDs aren't alphanumerically ordered per logical structure"
...
This reverts commit a7ec4501e6http://doc.qt.io/qt-5/qset.html
This was bug was causing scrambled avatars, because both the transmitter and receiver of the AvatarData packets
make the strong assumption that the joint orders are same. When they are not the avatar's appear scrambled.
2018-02-15 11:32:29 -08:00
humbletim
a08770c816
cleanup
2018-02-09 02:29:20 -05:00
David Back
f137fadc98
fix uint warnings
2018-02-08 16:56:13 -08:00
David Back
f929fa3bcb
filename space fix
2018-02-08 14:50:30 -08:00
David Back
6a23eea6ee
adjust shininess value
2018-02-08 14:15:47 -08:00
David Back
784b265a86
better texture option parsing
2018-02-07 18:11:00 -08:00
David Back
26a56f0173
Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials
2018-02-06 16:12:30 -08:00
humbletim
06afaa7470
BufferView <-> QVariant/QScriptValue conversion
...
update MeshProxy/SimpleMeshProxy and ScriptableModel
ModelScriptingInterface / scriptable::ModelProvider
integration
update to RC-63
initial graphics-scripting refactoring
graphics-scripting baseline commit
wip commit
Geometry -> MeshPart
remove SimpleMeshProxy
collapse graphics-utils -> graphics-scripting
scriptable::Model => scriptable::ScriptableModel
2018-02-01 16:30:29 -05:00
David Rowe
a7ec4501e6
FBX node IDs aren't alphanumerically ordered per logical structure
2018-02-01 13:43:14 +13:00
David Rowe
4cd130dd63
Don't reparent model node with clusters if it's a root node
2018-02-01 13:39:57 +13:00
Seth Alves
c146a231fa
Merge pull request #12284 from ctrlaltdavid/21717
...
FBX reader fixes
2018-01-30 10:49:02 -08:00
David Rowe
cadd4e61ad
Fix indent
2018-01-30 14:36:53 +13:00
David Rowe
09b92b93aa
Handle geometric offsets in FBX mesh extents calculations
2018-01-30 14:36:34 +13:00
MiladNazeri
3585bead96
Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes
...
Leopoly_Phase1_004_RayPick-Changes
2018-01-29 14:02:38 -08:00
David Rowe
d334f1c35c
Don't append trailing FBX root nodes to the tail of the tree
2018-01-29 13:45:39 +13:00
John Conklin II
049cf43de0
Merge pull request #12242 from hyperlogic/bug-fix/twisted-knees
...
Bug fix for twisted knees on some avatars.
2018-01-24 16:19:49 -08:00
Anthony J. Thibault
991ba7f195
Bug fix for twisted knees on some avatars.
...
The FBXReader inverse bind pose calculation can sometimes introduce floating point fuzz into
the bottom row of the matrix. The Transform class checks this bottom row before doing decomposition
into translation, rotation and scale. If it detects that this row is not exactly (0, 0, 0, 1) it aborts.
And returns identity. To guarantee that it preforms the decomposition correctly slam the row to (0, 0, 0, 1),
before conversion to a Transform instance.
2018-01-23 16:05:43 -08:00
humbletim
65455e7b50
Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes
2018-01-23 14:57:33 -05:00
Brad Davis
cbb2d9d854
Merge remote-tracking branch 'upstream/master' into android
2018-01-17 17:51:39 -08:00
David Back
d4db63f8f8
Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials
2018-01-17 17:02:29 -08:00
David Back
514eea5477
CR changes
2018-01-17 17:02:10 -08:00
Seth Alves
fda4cf10b9
Merge pull request #12159 from Zvork/compactvb
...
Fix potential assert exception in FBXMesh_Reader.cpp
2018-01-17 15:16:22 -08:00
Bradley Austin Davis
25b778be1d
Tracking down remaining SOX crashes
2018-01-17 12:18:39 -08:00
Brad Davis
6a06bf405a
Merge remote-tracking branch 'upstream/master' into android
2018-01-16 18:24:44 -08:00
humbletim
b91d536dd0
rename model:: -> graphics::
2018-01-16 12:46:16 -05:00
humbletim
08ccda9cfc
rename libraries/model(src/model) -> libraries/graphics(src/graphics)
2018-01-16 12:44:44 -05:00
David Rowe
67218a697b
Support FBX files that have nodes with non-XYZ rotation order
2018-01-16 14:01:20 +13:00
Sam Gateau
df0660f823
Merge branch 'master' of https://github.com/highfidelity/hifi into android-gles
2018-01-13 01:00:41 -08:00
Brad Davis
ab7aa52a10
GLES emulaton on windows
2018-01-12 19:17:35 -08:00
Anthony J. Thibault
7753b8a0b5
Merge branch 'master' into feature/dual-quat
2018-01-11 17:31:29 -08:00
David Back
0145b770da
fix warnings
2018-01-11 17:16:22 -08:00
David Back
5d96559579
Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials
2018-01-11 17:01:00 -08:00
Olivier Prat
3f8865594b
Fixed typo error that could potentially launch an assert when loading objects with blend shapes with normals but without tangents
2018-01-11 08:37:56 +01:00
Olivier Prat
db9e5fdae8
Merged from master but rendering seems broken
2018-01-09 11:05:34 +01:00
David Back
eaee9b3872
constants, pre-PR tweaks
2018-01-08 16:41:51 -08:00
Anthony J. Thibault
59b843781e
Merge branch 'master' into feature/dual-quat
2018-01-08 13:18:42 -08:00
David Back
4985c9db83
Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials
2018-01-05 13:55:43 -08:00
David Back
7c99c85eca
Revert "temp obj import fixes"
...
This reverts commit 188e476f2f
2018-01-05 13:54:16 -08:00
David Back
7558b00467
better fix for model scale floor, remove abs
2018-01-04 17:49:39 -08:00
David Back
307867a91f
adjust to for loop
2018-01-04 16:53:35 -08:00
David Back
fcac489efb
illum mode adjustments, small tweaks
2018-01-04 16:39:44 -08:00
Anthony J. Thibault
b8c88fca3b
Dual Quaternion skinning optimization
...
Reduce expensive conversion from quat -> matrix -> quat, by keeping
the inverseBindPose in a Transform instance instead of a mat4.
2018-01-04 16:17:23 -08:00
Anthony J. Thibault
b69edceb4f
Fixed rotation polarity and weights are now 16 bit.
2018-01-04 16:15:41 -08:00
David Back
2c5a433ea1
fix datum reset with comment token
2018-01-04 12:56:57 -08:00
David Back
e9f30549f4
ignore Tf, disable illum test
2018-01-03 18:20:07 -08:00
David Back
cbaba86881
more texture options
2018-01-03 15:50:24 -08:00
David Back
dfb9d9ce6b
illum model wip
2018-01-03 13:58:27 -08:00
humbletim
513a69cdcd
changes per CR feedback
2018-01-03 04:08:43 -05:00
David Back
88b034aa78
bump multiplier
2018-01-02 16:35:43 -08:00
David Back
a44e00142d
texture line parse wip
2018-01-02 15:41:14 -08:00
unknown
7531a2ef3b
map_bump wip
2017-12-29 18:00:07 -08:00
David Back
cee6bd2700
ignore Ni
2017-12-28 17:20:16 -08:00
David Back
a855916eb8
fix relative paths
2017-12-28 16:39:02 -08:00
David Back
dee06e72f6
ke is the new ka
2017-12-28 16:08:53 -08:00
David Back
188e476f2f
temp obj import fixes
2017-12-28 13:57:12 -08:00
David Back
38d2266d28
Tr
2017-12-27 17:14:45 -08:00
David Back
5e45ee456c
more ka
2017-12-27 16:55:45 -08:00
David Back
c3801fee7e
ka
2017-12-27 11:58:00 -08:00
David Back
fd297f1c03
convert negative relative indices to absolute indices
2017-12-21 10:36:41 -08:00
humbletim
61711f34cc
add support for tagging meshes with displayName
2017-12-21 12:25:48 -05:00
Olivier Prat
0d34569b1a
Merge branch 'master' of git://github.com/highfidelity/hifi into compactvb
2017-12-21 08:22:35 +01:00
Olivier Prat
24cc19aeaa
Partial fix of colors per vertex of FBX models exported by Blender 2.79
2017-12-18 14:37:50 +01:00
Olivier Prat
264f41472d
Added tangents to blendshape for possible break of bump mapping when doing blend shape animations
2017-12-15 12:06:07 +01:00
Olivier Prat
2a325d45e0
Mesh color attributes are now stored as RGBA8
2017-12-15 09:21:36 +01:00
Olivier Prat
f38e473218
Working packing of normals and tangents in GL_INT_10_10_10_2_REV format. Need to check this with all available 3D data input formats
2017-12-14 17:57:34 +01:00
Olivier Prat
deb0b6b06f
Working interleaved normals and tangents. I'm still wondering why it works with blendshapes though...
2017-12-14 16:12:44 +01:00
Olivier Prat
37deb2674a
Texture coordinates are now encoded in vec2 half float in FBXReader
2017-12-13 17:18:05 +01:00
Ryan Huffman
373b29c031
Merge branch 'master' of github.com:highfidelity/hifi into feat/obj-baker-update
2017-12-08 14:29:58 -08:00
Ryan Huffman
70c35f84b5
Update baker library with many style improvements
2017-12-08 10:30:38 -08:00
David Back
8b38c03a56
Allow space characters in material library name
2017-12-07 17:40:58 -08:00
Bradley Austin Davis
d6072f2bf2
Add bullet and draco to precompiled libraries
2017-11-28 11:32:34 -08:00
Ryan Huffman
7026337f24
Fix broken string serialization in FBXWriter
2017-11-21 09:05:37 -08:00
Brad Hefta-Gaub
a85a6f6795
Merge pull request #11308 from luiscuenca/patch-1
...
glTF import DEMO
2017-11-17 14:52:51 -08:00
Zach Fox
c64c2e17c8
First pass at consolidation
2017-10-24 12:01:05 -07:00
luiscuenca
25b419a1a1
fixed returning a reference to a local variable
2017-10-10 12:44:38 -07:00
luiscuenca
a7a1329c5f
Adapt code to coding standard
2017-10-10 12:10:03 -07:00
luiscuenca
297f591ce2
fixed errors and default avatar
2017-10-09 14:37:45 -07:00
Bradley Austin Davis
e42068f681
Merge branch 'master' into android_new
2017-09-26 14:31:29 -07:00
Bradley Austin Davis
b93e91b9f3
New android toolchain
2017-09-19 13:45:12 -07:00
Ryan Huffman
641addf397
Remove FBX.cpp
2017-09-19 11:13:39 -07:00
Ryan Huffman
d80aa50e79
Remove support for QList in FBXWriter
2017-09-18 09:04:13 -07:00
Stephen Birarda
1f961885cc
Merge pull request #11369 from huffman/feat/bake-skinning-support
...
Add animation support for draco encoded FBXs
2017-09-15 15:21:35 -07:00
Ryan Huffman
2a4f7712c3
Replace magic number for compressed flag in FBXWriter
2017-09-15 14:41:38 -07:00
Ryan Huffman
c5852dfbe8
Add list compression to FBXWriter
2017-09-15 13:53:10 -07:00
Ryan Huffman
7db8d1dcbc
Add support for baked skinned meshes
2017-09-14 16:43:52 -07:00
Ryan Huffman
3793062045
Add optional FBX 2015 encoding to FBXWriter
2017-09-14 16:31:10 -07:00
Stephen Birarda
2a62bac4f9
refuse to re-bake an already baked FBX
2017-09-14 16:08:11 -07:00
Stephen Birarda
43196cd0a6
fix buffer resizing to only occur when attribute is present
2017-09-14 14:46:48 -07:00
Stephen Birarda
bb98df38d4
remove re-grabbing of draco faces
2017-09-14 14:42:40 -07:00
