Commit graph

193 commits

Author SHA1 Message Date
sabrina-shanman
d80b40e5a5 Fix baked FSTs unable to be rebaked by creating an FST in the original
output folder
2019-04-17 16:37:01 -07:00
Sam Gateau
e6c76cdb19
Merge pull request #15329 from Zvork/amc
case 22219: Improved ambient maps
2019-04-17 10:20:53 -07:00
sabrina-shanman
39cf3c3d83 Fix TextureBaker failures and heap corruption in MaterialBaker 2019-04-11 13:44:26 -07:00
SamGondelman
a50cca006e use # instead of ? for material URL name selection 2019-04-08 23:45:47 -07:00
Sam Gondelman
88c278d357
Merge pull request #15319 from SamGondelman/materialBaker
Case 21764: Oven bakes model materials directly to separate material description
2019-04-05 17:08:22 -07:00
Olivier Prat
1322fef568 Taking into account samuel's remarks 2019-04-05 20:15:58 +02:00
Sam Gateau
eee5f87dcd
Merge pull request #15264 from Zvork/hdr
Case 22045: Added support for OpenEXR files (mostly for skyboxes)
2019-04-04 10:32:11 -07:00
NissimHadar
3ba5f8e574 Use place holder instead of RCC file.
(cherry picked from commit 709515dd74)
(cherry picked from commit 4e4526fbb2)
2019-04-03 15:25:34 -07:00
SamGondelman
2b376f7881 handle weird material name case 2019-04-03 14:26:45 -07:00
SamGondelman
cf7230f023 fix non-embedded textures 2019-04-03 11:26:07 -07:00
Olivier Prat
eadace70f8 Merge branch 'master' of https://github.com/highfidelity/hifi into amc 2019-04-03 18:19:46 +02:00
Olivier Prat
50fecf5e01 Ambient map has different hash than sky map to prevent using one instead of the other, even if they are using the same source texture. 2019-04-03 11:29:59 +02:00
SamGondelman
770b863604 fixing embedded textures and materialMapping priority 2019-04-02 19:04:23 -07:00
SamGondelman
14bd5ed687 remove need for destination path 2019-04-02 16:53:49 -07:00
SamGondelman
75a246b82d simplifying material baker and support bump/gloss maps 2019-04-01 22:35:28 -07:00
Olivier Prat
7af4a52587 Merge branch 'hdr' into amc 2019-04-01 10:44:38 +02:00
SamGondelman
585a022dca embedded textures and relative material paths 2019-03-29 10:08:31 -07:00
Olivier Prat
7455ddb7ba Created Image class to encapsulate some transforms with QImage 2019-03-29 12:23:44 +01:00
SamGondelman
b98f47d1f3 add baked materials to fst materialMapping 2019-03-28 15:11:27 -07:00
Ryan Huffman
7e805562ef Fix some URLs with query params not working with model baker
After talking with Sabrina, we decided that we could safely leave the
query param and fragment intact for a URL in the model baker.
2019-03-28 11:59:31 -07:00
SamGondelman
310d01feff wip 2019-03-27 15:44:01 -07:00
Olivier Prat
aa4401801e Added new texture types : sky and ambient in place of just cube 2019-03-27 11:54:45 +01:00
SamGondelman
3d2b71bc7b remove all existing material parsing 2019-03-26 17:16:13 -07:00
sabrina-shanman
64fbf51ac2 Warn if baked mesh is empty for OBJBaker 2019-03-18 16:49:09 -07:00
sabrina-shanman
266f3a8ad8 Warn if handleFinishedTextureBaker doesn't recognize the sender 2019-03-18 16:49:09 -07:00
sabrina-shanman
cf40ed953b Do not create temporary directory in ModelBaker and copy model directly to the original output folder 2019-03-18 16:49:09 -07:00
sabrina-shanman
c29b3a8c35 Bypass signals in JSBaker/MaterialBaker when resource is already loaded 2019-03-18 16:49:09 -07:00
sabrina-shanman
bc3b35aad3 Do not consolidate source images by file for now, since they may have the same filename but different paths 2019-03-18 16:49:00 -07:00
sabrina-shanman
0990b56952 Better avoid overwriting textures in ModelBaker::compressTexture 2019-03-18 16:48:47 -07:00
sabrina-shanman
b6c44ea443 Remove unused variables when iterating through mesh nodes in FBXBaker 2019-03-15 15:56:36 -07:00
sabrina-shanman
53429f459e Remove some redundancy involving model texture URL resolution 2019-03-15 15:32:39 -07:00
sabrina-shanman
60ed9e12a4 Attempt to fix build errors 2019-03-15 15:17:33 -07:00
sabrina-shanman
041db33578 Attempt to fix build warnings 2019-03-15 10:20:58 -07:00
sabrina-shanman
c54b23f647 Make material baking output unique textures per usage like model baking does 2019-03-14 17:09:26 -07:00
sabrina-shanman
c8209aa976 Do not have multiple copies of the original texture file in the baked output 2019-03-14 17:09:25 -07:00
sabrina-shanman
20d0ca0073 Fix baked material JSONS using wrong texture paths 2019-03-14 17:09:21 -07:00
sabrina-shanman
5e430c98c5 Attempt to fix build warnings 2019-03-14 09:56:25 -07:00
sabrina-shanman
5b75eb34e8 Fix ModelBaker not properly checking if texture file name exists 2019-03-13 17:26:02 -07:00
sabrina-shanman
27c7bf5c92 Remove duplicate FBX debug dump 2019-03-13 17:02:55 -07:00
sabrina-shanman
a3412bb25e Attempt to fix build errors 2019-03-13 16:44:50 -07:00
sabrina-shanman
cb1f42afe5 Copy pre-parsed node from FBXSerializer for baking 2019-03-13 16:44:50 -07:00
sabrina-shanman
3aaa18f529 Might as well deduplicate indices when loading model for baking 2019-03-13 16:44:50 -07:00
sabrina-shanman
32d5f7135f Give the oven model-baker Baker an appropriate materialMappingBaseURL, but disable ParseMaterialMappingTask for now 2019-03-13 16:44:50 -07:00
sabrina-shanman
7f77e163ac Restore 'Re-bake originals' checkbox to domain bake window 2019-03-12 18:17:11 -07:00
sabrina-shanman
a93825c2f9 Fix remaining issues with merge 2019-03-12 18:14:18 -07:00
sabrina-shanman
41c0594361 Make output folder cleaner for single model bake when baked model url is given as input 2019-03-12 15:36:13 -07:00
sabrina-shanman
b42c6d1352 Fix baked models not mapping to correct textures 2019-03-12 15:36:06 -07:00
sabrina-shanman
5b504c4759 Add encode/decode speed config to BuildDracoMeshTask 2019-03-12 15:36:05 -07:00
sabrina-shanman
efc9f993f5 Add FSTBaker, and make ModelBaker output an FST
Restore feature to look for baked model file in other oven directory
2019-03-12 15:34:57 -07:00
sabrina-shanman
1576125c42 Integrate HFM Asset Engine (aka model prep step) into Oven
Add 'deduplicateIndices' parameter to FBXSerializer and make deduplicate a required parameter for extractMesh

Add draco mesh and FBX draco node version

Support generating/saving draco meshes from FBX Model nodes
2019-03-06 15:54:12 -08:00