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
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
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
