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
Olivier Prat
7af4a52587
Merge branch 'hdr' into amc
2019-04-01 10:44:38 +02:00
Olivier Prat
7455ddb7ba
Created Image class to encapsulate some transforms with QImage
2019-03-29 12:23:44 +01: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
Olivier Prat
aa4401801e
Added new texture types : sky and ambient in place of just cube
2019-03-27 11:54:45 +01: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
SamGondelman
168e47aa62
bake particles and polylines
2019-03-06 15:34:12 -08:00
SamGondelman
1a1277e9e7
it's working!
2019-03-06 15:34:12 -08:00
SamGondelman
94de0c12bc
working on material baker
2019-03-06 15:34:11 -08:00
SamGondelman
4965adbc2f
bake js and collision hull
2019-03-06 15:34:11 -08:00
SamGondelman
7fc9a3fdb6
wip
2019-03-06 15:34:10 -08:00
SamGondelman
162573bc63
enable js baking from non-local file
2019-03-06 15:34:10 -08:00
SamGondelman
270b96aa8d
cleaning up oven
2019-03-06 15:34:09 -08:00
sabrina-shanman
e4d6d5af89
Streamline ModelBaker initialization and URLs
2019-03-06 15:18:19 -08:00
sabrina-shanman
b2af6d1374
Have only one ColorChannel enum as header in image library
2019-02-12 16:14:41 -08:00
sabrina-shanman
1b2cb94b0c
Fix not changing input to processImage in TextureBaker.cpp
2019-02-12 13:21:21 -08:00
sabrina-shanman
0f291612c3
Fix invalid processImage calls in TextureBaker.cpp
2019-02-11 09:04:41 -08:00
sabrina-shanman
2d30902813
Fix OBJBaker not setting combineParts
2018-11-14 09:11:56 -08:00
sabrina-shanman
5b6e2aae5a
Remove/move some unused serializer imports
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
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