Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-27 12:46:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
82898 commits 76 branches 59 tags 1.2 GiB
Commit graph

222 commits

Author SHA1 Message Date
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
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
Brad Davis
8c4f0ec774 Vcpkg migration 2018-11-08 12:28:06 -08:00
sabrina-shanman
1a69afb3e8 Move HFM.h to hfm subfolder per convention 2018-11-06 11:43:19 -08:00
sabrina-shanman
2801f324b7 Switch references to HFM to the HFM lib and remove HFM classes in FBX 2018-11-05 12:47:34 -08:00
sabrina-shanman
30eb360f62 Convert remaining HFMModels called model to hfmModel, and rename some missed local variables 2018-11-05 12:07:17 -08:00
sabrina-shanman
cbca77b12f Rename HFMGeometry to HFMModel and adjust related variables 2018-11-01 17:17:48 -07:00
sabrina-shanman
becee7f010 Re-name FBXGeometry to HFMGeometry and do the same for related classes 2018-10-30 17:28:42 -07:00
Ryan Huffman
6be0c43fca Update generateIrradiance to take a BackendTarget 2018-08-08 10:00:02 -07:00
Ryan Huffman
26e69de81e Add braces around std::array intialization to suppress warning 2018-08-08 10:00:02 -07:00
Ryan Huffman
140b9be1c4 Update BackendTarget to include version 2018-08-08 10:00:02 -07:00
Ryan Huffman
9ea08f1850 Add ETC2 support to Oven 2018-08-08 10:00:01 -07:00
Ryan Huffman
015c092e1c Update oven to only produce uncompressed ktx for cubemaps 2018-06-11 16:37:40 -07:00
Ryan Huffman
38df5d3db5 Merge branch 'master' of github.com:highfidelity/hifi into feat/uncompressed-ktx-in-texmeta 2018-06-11 16:17:56 -07:00
Ryan Huffman
faafd26d2a Add uncompressed KTX files to baked texture output 2018-06-08 11:39:47 -07:00
Ryan Huffman
8e1c7531dc Add option to oven.exe to disable texture baking 2018-05-23 10:42:14 -07:00
Simon Walton
7f2a90cdb9 Address couple of reviewer issues 2018-05-18 11:20:45 -07:00
Simon Walton
df6609c1f5 Remove debugging #define 2018-05-08 16:26:19 -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
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
Ryan Huffman
ac0fe62086 Make ModelBaker ktx extension check case-insensitive 2018-05-04 10:53:10 -07:00
Ryan Huffman
697fde4a1a Cleanup meta texture related changes 2018-05-02 13:31:32 -07:00
Ryan Huffman
24ac342c6b Add support for client texture selection 2018-05-01 14:11:31 -07:00
Stephen Birarda
e8bea3a611
Merge pull request #12369 from simon-walton/BugFix 
Lexer code has confusion between strings and chars
 2018-03-22 12:03:47 -07:00
Simon Walton
10f3032746 Compare QString w/ char*, not char 2018-03-21 23:09:46 -07:00
Ryan Huffman
a5e491e29d Add OBJ support to domain baker 2018-03-13 10:38:21 -07:00
Ryan Huffman
975f0bfbd2 Fix OBJBaker not correctly waiting until all assets have been baked to finish 2018-03-07 16:30:23 -08:00
Ryan Huffman
ac0ecc8baa Merge remote-tracking branch 'upstream/master' into feat/obj-baker-update 2018-03-05 10:41:49 -08:00
Simon Walton
7dacc2f2c0 Lexer code has confusion between strings and chars 
Clang complained about this; at least two of these appear
to be actual bugs.
 2018-02-07 21:54:46 -08:00
humbletim
08ccda9cfc rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05:00
Ryan Huffman
c2e0f19591 Merge branch 'master' of github.com:highfidelity/hifi into feat/obj-baker-update 2017-12-11 13:39:58 -08:00
Clément Brisset
833f98b98b
Merge pull request #11920 from Atlante45/feat/reduce-memory-usage 
Reduce Image library memory usage
 2017-12-11 09:29:22 -08:00
Ryan Huffman
53ce137b7c Replace Texture/MaterialID in OBJBaker with NodeID 2017-12-08 15:58:32 -08:00
Ryan Huffman
373b29c031 Merge branch 'master' of github.com:highfidelity/hifi into feat/obj-baker-update 2017-12-08 14:29:58 -08:00
Ryan Huffman
6843001950 Update TextureID/MaterialID in OBJBaker to be compatible with QVariant 2017-12-08 14:03:33 -08:00
Ryan Huffman
70c35f84b5 Update baker library with many style improvements 2017-12-08 10:30:38 -08:00
Atlante45
4fd83ddd0e Reduce Image memory usage by moving the data 2017-12-07 12:54:34 -08:00
Ryan Huffman
94a58a2471 Remove baking dependency from assignment-client 2017-12-07 10:53:23 -08:00
Ryan Huffman
57b943ae98 Fix initialization order in ModelBaker 2017-11-21 13:51:44 -08:00
Ryan Huffman
8c9c069a5c Update OBJ/FBX bakers to inherit parent ctor 2017-11-21 11:56:06 -08:00
Ryan Huffman
5c522d556b Cleanup connection generation in OBJBaker 2017-11-21 09:43:22 -08:00
Ryan Huffman
6050b4d85c Cleanup ObjBaker and remove setPropertiesList 2017-11-21 09:05:22 -08:00
Ryan Huffman
dd2d3d97b4 Fix coding guideline violations in *Baker classes 2017-11-16 16:32:11 -08:00
utkarshgautamnyu
730202b7fc Refactored ModelBaker 2017-10-26 14:22:23 -07:00
utkarshgautamnyu
d8b0a6360e Fix for -Wreorder warning 2017-10-26 13:11:59 -07:00
utkarshgautamnyu
1092c09e8b changed variable names 2017-10-26 11:40:26 -07:00
utkarshgautamnyu
735e641548 fixed errors with Jenkins build 2017-10-26 10:48:50 -07:00
utkarshgautamnyu
2fa7c0a07d Removed unused library 2017-10-25 19:52:37 -07:00
utkarshgautamnyu
6c553e5923 moved FBXBaker::abort() to ModelBaker::abort() 2017-10-25 19:04:12 -07:00
utkarshgautamnyu
10eb258d3b moved more common members to ModelBaker parent class 2017-10-25 18:31:50 -07:00
utkarshgautamnyu
854c190f32 fixed names of protected members according to naming conventions 2017-10-25 17:10:12 -07:00
utkarshgautamnyu
8d3f11a990 moved code to set _textureContent to ModelBaker class 2017-10-25 16:27:09 -07:00
utkarshgautamnyu
d7f2e21dca Moved common variables between base and derived classes to base class 2017-10-25 16:13:06 -07:00
utkarshgautamnyu
54f9d52aa1 Moved _textureContent to parent class ModelBaker 2017-10-25 14:15:55 -07:00