Commit graph

58521 commits

Author SHA1 Message Date
Stephen Birarda
09d18b5ba9 handle special include path for Draco on WIN 2017-09-08 09:47:16 -07:00
Stephen Birarda
91f4551598 add draco to the oven tool 2017-09-08 09:46:55 -07:00
Stephen Birarda
0d7b50cfb6 remove old texture type method 2017-09-08 09:44:19 -07:00
Stephen Birarda
3cf77f377c remove FBX SDK from CMake files 2017-09-07 18:46:44 -07:00
Stephen Birarda
b153d1e177 use FBXReader/FBXWriter for texture baking in FBXBaker 2017-09-07 18:38:29 -07:00
Ryan Huffman
7214f57376 Update FBXBaker::exportScene with FBXWriter 2017-09-07 14:12:15 -07:00
Ryan Huffman
b60d68c714 Replace FBX SDK loading of file in FBXBaker with FBXReader 2017-09-07 14:00:09 -07:00
Ryan Huffman
49e09f4838 Remove FBXBaker and TextureBaker from oven 2017-09-07 13:12:07 -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
Stephen Birarda
c5f7c5d314 Merge pull request #11281 from huffman/feat/bake-meta-errors
Add auto bake error handling to asset server
2017-09-06 13:20:16 -07:00
Clément Brisset
7d4f17506e Merge branch 'feat/auto-bake' into feat/bake-meta-errors 2017-09-01 17:33:25 -07:00
Stephen Birarda
55d44a8c8f Merge pull request #11285 from Atlante45/feat/baking-enabled
Wire "Use baked" checkbox
2017-09-01 16:25:49 -07:00
Stephen Birarda
b67f741ce9 Merge pull request #11284 from Atlante45/feat/auto-bake
Hide .baked folder in the Asset Browser
2017-09-01 15:43:10 -07:00
Atlante45
28402be37c Fix status glyphs 2017-09-01 14:17:28 -07:00
Ryan Huffman
eb2e87a798 Change it++ to ++it 2017-09-01 13:02:25 -07:00
Ryan Huffman
c67fcc1384 Add RedirectFail to ResourceRequest::getResultString() 2017-09-01 10:41:31 -07:00
Ryan Huffman
5ee33085a5 Add handling of failedLastBake error in getAssetStatus 2017-09-01 10:37:28 -07:00
Ryan Huffman
7a68788c8c Fix warning for non-const default in AssetServer 2017-08-31 16:22:46 -07:00
Atlante45
9b857eb53b Ensure "enabled" binding stays in place 2017-08-31 16:16:43 -07:00
Atlante45
2fd2bb1e92 Auto reload after changing baking enabled 2017-08-31 16:00:55 -07:00
Ryan Huffman
bf53161a0b Fix comparison between signed and unsigned int in MappingRequest 2017-08-31 15:55:27 -07:00
Atlante45
cdfae714b5 Remove baking tasks for hash once done 2017-08-31 15:51:47 -07:00
Ryan Huffman
25f64e1aa9 Merge branch 'feat/auto-bake' of github.com:highfidelity/hifi into feat/bake-meta-errors 2017-08-31 15:17:40 -07:00
Ryan Huffman
d2c7235fed Fix update to count width in GetAllMappings 2017-08-31 14:41:29 -07:00
Atlante45
a9cfc01df3 Set Baking Enabled API 2017-08-31 13:11:27 -07:00
Atlante45
aad0be2693 Set baking enabled mappings 2017-08-31 13:10:07 -07:00
Atlante45
764e5d2e4c Move constant to central location 2017-08-31 13:08:18 -07:00
Atlante45
da2bede6fe Hide .baked items from the Asset Browser 2017-08-31 13:08:18 -07:00
Atlante45
3aee6db1e8 Log baker errors 2017-08-31 13:08:18 -07:00
Stephen Birarda
b1bc899121 Merge pull request #11270 from birarda/feat/auto-bake
refuse to perform mapping operations in /.baked/
2017-08-31 13:06:28 -07:00
Ryan Huffman
0cd8a5cd41 Merge branch 'feat/auto-bake' of github.com:highfidelity/hifi into feat/bake-meta-errors 2017-08-31 12:09:21 -07:00
Ryan Huffman
9ce0f03aa2 Fix mapping comparision in getAssetStatus being done against path 2017-08-31 11:58:03 -07:00
Stephen Birarda
da8ae23756 move default to the bottom of bakingStatusToString 2017-08-31 11:52:42 -07:00
Stephen Birarda
84b5afaa4d mark task dispatcher as override 2017-08-30 17:28:17 -07:00
Ryan Huffman
2aa39e7da4 Fix baking library not automatically being built 2017-08-30 16:53:51 -07:00
Ryan Huffman
d68338f0b0 Add error handling to asset server baking 2017-08-30 16:53:31 -07:00
Stephen Birarda
4e1e483e27 link DL libs with FBX SDK for baking 2017-08-30 16:50:20 -07:00
Stephen Birarda
81fdc27ca8 use 2017.1 FBX SDK on all platforms, change linux location 2017-08-30 16:46:43 -07:00
Stephen Birarda
ed21ad11d2 add baking to default build, add default to baking status 2017-08-30 15:14:53 -07:00
Ryan Huffman
70430c009d Fix ATP requests not keeping track of all mapping redirects 2017-08-30 14:35:12 -07:00
Stephen Birarda
3abca67f1a remove use of auto in TextureBaker for OS X compile 2017-08-30 14:30:11 -07:00
Stephen Birarda
f2997c0997 refuse to perform mapping operations in /.baked/ 2017-08-30 14:30:08 -07:00
Ryan Huffman
31345e4264 Fix ATP requests not keeping track of all mapping redirects 2017-08-30 13:15:14 -07:00
Ryan Huffman
f89459525e Merge pull request #11257 from birarda/feat/delete-baked-with-original
add deletion of baked content when original removed
2017-08-29 13:18:58 -07:00
Ryan Huffman
e8a57e3b35 Merge pull request #11256 from birarda/feat/auto-bake
fail bake of partially baked FBX that references KTX
2017-08-29 13:17:05 -07:00
Stephen Birarda
e735c12e70 Merge pull request #11258 from huffman/feat/auto-bake-2
Fix loading standalone baked textures from Asset Server
2017-08-29 13:16:02 -07:00
Ryan Huffman
e9258ec97a Fix loading standalone baked textures from Asset Server
NetworkTexture was not properly handling redirected ATP files. For
instance, if going from .jpg -> .ktx, the NetworkTexture class needs to
be aware of this so it can stop the current request and make multiple
requests for the individual mip levels.
2017-08-28 15:54:40 -07:00
Stephen Birarda
6992bd6f48 add deletion of baked content when original removed 2017-08-28 15:38:31 -07:00
Stephen Birarda
ba34a0ddef fail bake of partially baked FBX that references KTX 2017-08-28 15:01:31 -07:00