Commit graph

469 commits

Author SHA1 Message Date
Stephen Birarda
bfb4dd0cdb disable warning c4267 when including draco 2017-09-13 14:00:41 -07:00
Stephen Birarda
dc86c6fe73 fixes for warnings in FBXReader/FBXWriter 2017-09-13 09:16:58 -07:00
Stephen Birarda
c445d914d7 make sure material IDs are de-duplicated 2017-09-12 22:04:33 -07:00
Stephen Birarda
b253d3b57c fix material triangle index insertion 2017-09-12 17:44:53 -07:00
Stephen Birarda
a25e5796dc use push_back instead of append for extracted mesh vectors 2017-09-12 16:35:21 -07:00
Stephen Birarda
bb7cd58e9a fix reference to part index 2017-09-12 16:28:12 -07:00
Stephen Birarda
5d9ed78369 fixes for extracted mesh construction 2017-09-12 16:09:40 -07:00
Stephen Birarda
cf282dd3fc add code to read draco mesh from FBX 2017-09-12 15:04:53 -07:00
Ryan Huffman
9243cf7590 Remove extraneous logging in FBXWriter 2017-09-12 09:45:46 -07:00
Ryan Huffman
3d6d383a15 Clean up duplicate list code in encodeFBXProperty 2017-09-08 16:58:57 -07:00
Ryan Huffman
9b462171f6 Add draco support to FBXBaker 2017-09-08 16:58:29 -07:00
Stephen Birarda
b153d1e177 use FBXReader/FBXWriter for texture baking in FBXBaker 2017-09-07 18:38:29 -07:00
Ryan Huffman
7a55c867be Fix _fbxNode rename to _rootNode in FBXReader 2017-09-07 12:56:46 -07:00
Ryan Huffman
aa1aad0a09 Add FBXWriter for serializing FBXNode 2017-09-07 12:56:36 -07:00
Atlante45
8a291f16ff Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-08-25 15:26:38 -07:00
Ryan Huffman
39f04adc8d Improve baking interface and add automatic baking to asset server 2017-08-24 16:15:28 -07:00
Anthony J. Thibault
ae98974d79 improve 14-dop generation for avatar joint collision
Also added debug rendering functionality.
2017-08-10 15:52:51 -07:00
Seth Alves
a3f4aeb182 code review 2017-07-24 19:41:30 -07:00
Seth Alves
6f86b266cb support writing of vertex colors 2017-07-23 08:04:34 -07:00
Seth Alves
5e04e84953 make OBJ reader able to handle files where some vertices have colors and others don't 2017-07-22 11:57:51 -07:00
trent
559e2e0ebb Fixing formatting issues; renamed ::getVec3Vec3 to ::getVertex. 2017-07-20 13:09:17 -04:00
trent
ff3e9263ef Stupid tabs. 2017-07-20 11:40:42 -04:00
trent
d71b0802a7 Added vertex color support to OBJReader.h|cpp. 2017-07-20 11:38:42 -04:00
Seth Alves
794495c197 make ResourceManager be owned by DependencyManager 2017-06-28 14:18:14 -07:00
Stephen Birarda
d2bea94768 simplify fileOnUrl to always look right beside FBX 2017-06-09 15:52:21 -07:00
Atlante45
ea870881ee Log warning when we detect a connection loop 2017-05-25 12:48:21 -07:00
Atlante45
babae456d2 Fix infinite loop in fbx reader 2017-05-25 10:42:33 -07:00
Seth Alves
48c78584c3 fix a bug that could cause OBJ models with external mtl references to hang the loading thread 2017-05-09 11:09:39 -07:00
Ryan Huffman
074a11306c Add support for atp and file urls in OBJReader 2017-05-01 13:22:02 -07:00
Ryan Huffman
8463fffc8c Merge pull request #10185 from highfidelity/revert-10116-bug/rel-ext-textures
Revert "fix relative/absolute path handling for external FBX textures"
2017-04-10 15:30:40 -07:00
Stephen Birarda
e86db26224 Revert "fix relative/absolute path handling for external FBX textures" 2017-04-10 14:31:02 -07:00
Seth Alves
8d00f0ab8f allow obj reader to either combine meshes or keep parts separate 2017-04-07 15:59:01 -07:00
Chris Collins
4e9e3cccea Merge pull request #10116 from birarda/bug/rel-ext-textures
fix relative/absolute path handling for external FBX textures
2017-04-06 15:58:02 -07:00
Stephen Birarda
e4021c168e add special handling for abs drive letter paths from windows 2017-04-05 16:52:22 -07:00
Stephen Birarda
70eada0f76 replace backslashes in parsed fbx relative filepaths 2017-04-04 15:01:18 -07:00
Stephen Birarda
137e73cf21 check absolute path before relative path 2017-04-04 14:42:03 -07:00
Stephen Birarda
0a7100e2d8 pass URLs to readFBX, not just URL path 2017-04-04 14:34:10 -07:00
Stephen Birarda
4e07a6a865 add new logic for absolute texture paths in FBX 2017-04-04 14:02:00 -07:00
Stephen Birarda
b9783d768e remove fileOnUrl since it is no longer used 2017-04-04 11:08:30 -07:00
trent
362ffba117 Fixes to OBJReader.cpp style inconsistencies. 2017-04-03 21:54:19 -04:00
trent
5cc87ccc4a Fixed warning for subtly-stupid unused variable. 2017-04-03 19:38:34 -04:00
Stephen Birarda
d4112f0e36 use full relative filepath for texture caching/referencing 2017-04-03 14:57:02 -07:00
trent
bec46747dd Merge branch 'master' of https://github.com/highfidelity/hifi into 21240 2017-04-03 16:46:36 -04:00
trent
2991332652 Rewrote the OBJ reader (again) to use FBXMeshPart instead of separate meshes. Works now! Multi-material support win. 2017-04-03 16:46:22 -04:00
trent
e9035a1efb More fixes for the OBJ reader. The data seems to be fine. The rendering seems not so fine. 2017-03-30 19:10:15 -04:00
trent
c5bb419bd1 Fixed OBJ reader crash, did not fix OBJ reader not working properly. 2017-03-30 18:16:55 -04:00
trent
864184a107 wip OBJ loader rewrite; wip because it crashes. 2017-03-30 17:11:40 -04:00
trent
5bf3da9a7f Restoring hifi version of the OBJ files to get rid of my debug nonsense. 2017-03-30 16:14:42 -04:00
Seth Alves
36ad3af48e attempt to avoid a hang on shutdown 2017-03-30 11:35:24 -07:00
trent
ada7664749 Merge branch 'master' of https://github.com/highfidelity/hifi into origin/21240 2017-03-28 18:43:30 -04:00