Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-08 04:06:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
87009 commits 21 branches 0 tags 1.2 GiB
Commit graph

241 commits

Author SHA1 Message Date
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
utkarshgautamnyu
ff0af9f5cc Fixed issue with QTextStream 2017-10-24 20:14:02 -07:00
utkarshgautamnyu
221b293daf Indentation Fixes 2017-10-24 16:58:35 -07:00
utkarshgautamnyu
dccf449cf7 edited comments 2017-10-24 16:20:39 -07:00
utkarshgautamnyu
98ec464106 Indentation Fixes 2017-10-24 16:05:00 -07:00
utkarshgautamnyu
5d5e62d002 Refactored ModelBaker and OBJBaker 2017-10-24 15:44:54 -07:00
utkarshgautamnyu
46b46c2f4c Fixed issues with FBXBaker and refactoring of OBJBaker 2017-10-23 20:07:24 -07:00
utkarshgautamnyu
28baed18c0 Added code for OBJBaker and moved Texture and Mesh compression to ModelBaker superclass 2017-10-20 18:55:41 -07:00
Ryan Huffman
de195dd844 Merge pull request #11585 from huffman/fix/draco-material-ids 
Fix baking bug with single-part FBX + multiple materials
 2017-10-20 11:32:31 -07:00
Stephen Birarda
23563cca47 Merge pull request #11592 from birarda/bug/ignore-dds-in-fbx 
ignore unbakeable textures in FBXBaker
 2017-10-19 15:51:41 -05:00
Stephen Birarda
dabfec9436 ignore unbakeable textures in FBX files 2017-10-13 13:42:39 -07:00
Ryan Huffman
d6366083a7 Fix baking bug with single-part FBX + multiple materials 
In FBXBaker we were not packing in material IDs if there was only 1 part
in the mesh. This was unintentionally making the assumption that there
was only 1 material at index 0 - if there are more materials, the material index
that the part references may not be 0. The change ensures that we pack
material IDs if there are multiple parts or if the sole part uses a
material ID other than 0 (0 is the default).
 2017-10-12 18:33:57 -07:00
Stephen Birarda
8a331e29a2 Merge pull request #11455 from utkarshgautamnyu/feat/JS-Baker 
Feat/JS-Baker
 2017-10-12 16:16:02 -05:00
utkarshgautamnyu
49f601329f Update JSBaker.h 2017-10-12 11:35:38 -07:00
utkarshgautamnyu
f3983b3edc Update JSBaker.cpp 2017-10-12 11:34:28 -07:00
utkarshgautamnyu
6e4a5da69d Update JSBaker.h 2017-10-11 10:44:19 -07:00
utkarshgautamnyu
1d373c2988 Update JSBaker.cpp 2017-10-11 10:38:48 -07:00
Ryan Huffman
de2c1aabac Add removal of temporary files in FBXBaker 2017-10-05 09:08:42 -07:00
utkarshgautamnyu
5c14c7c3b9 Update JSBaker.cpp 2017-09-28 13:24:03 -07:00
utkarshgautamnyu
463afd6be5 made updates to fix building 2017-09-28 11:12:26 -07:00
utkarshgautamnyu
fbe3f2fbe3 Update JSBaker.h 2017-09-27 15:26:17 -07:00
utkarshgautamnyu
4486212e05 Update JSBaker.cpp 2017-09-27 15:20:30 -07:00
utkarshgautamnyu
5ad1efb923 Update JSBaker.h 2017-09-27 10:49:48 -07:00
utkarshgautamnyu
d4b8559cb2 Update JSBaker.cpp 2017-09-27 10:49:10 -07:00
utkarshgautamnyu
70a39f03f7 Update JSBaker.h 2017-09-26 19:36:41 -07:00
utkarshgautamnyu
167dda9f80 made bakeJS a static function 2017-09-26 19:35:54 -07:00
utkarshgautamnyu
4fd0452694 Update JSBaker.cpp 2017-09-26 12:04:03 -07:00
utkarshgautamnyu
0b387f5b38 Update JSBaker.cpp 2017-09-26 11:01:56 -07:00
utkarshgautamnyu
a9aab67a06 Update JSBaker.h 2017-09-26 11:01:26 -07:00
utkarshgautamnyu
1ba7aefd03 Update JSBaker.h 2017-09-26 09:57:02 -07:00
utkarshgautamnyu
b86dd9dea4 Update JSBaker.cpp 2017-09-25 20:20:30 -07:00
utkarshgautamnyu
209201e592 updates to handle white space within a single line comment 2017-09-25 15:55:12 -07:00
utkarshgautamnyu
0a57874cc2 Made updates to JSBaker 2017-09-25 14:46:38 -07:00
utkarshgautamnyu
6c40d39f81 refactored jsbaker.cpp 2017-09-24 20:53:09 -07:00
utkarshgautamnyu
cda5e94b33 Added JavaScript Baking 2017-09-22 20:57:18 -07:00
Ryan Huffman
abbe263142 Fix FBXBaker not properly handling textures with the same name 2017-09-21 13:40:39 -07:00
Stephen Birarda
e1d79ee8f4 add abort to Baker and subclasses 2017-09-19 13:18:23 -07:00
Stephen Birarda
608f8196c6 remove commented out removal of embedded media folder 2017-09-18 14:01:48 -07:00
Stephen Birarda
02a529923e don't export embedded textures, remove triangle warning 2017-09-18 14:00:03 -07:00
Stephen Birarda
1f961885cc Merge pull request #11369 from huffman/feat/bake-skinning-support 
Add animation support for draco encoded FBXs
 2017-09-15 15:21:35 -07:00
Ryan Huffman
c5852dfbe8 Add list compression to FBXWriter 2017-09-15 13:53:10 -07:00
Ryan Huffman
fd1d4b9bd1 Update FBXBaker to only pack original indices if needed 2017-09-14 16:49:53 -07:00
Ryan Huffman
7db8d1dcbc Add support for baked skinned meshes 2017-09-14 16:43:52 -07:00
Stephen Birarda
2a62bac4f9 refuse to re-bake an already baked FBX 2017-09-14 16:08:11 -07:00
Stephen Birarda
9cb4e2c5f2 address code review comments 2017-09-14 13:58:48 -07:00
Stephen Birarda
bfb4dd0cdb disable warning c4267 when including draco 2017-09-13 14:00:41 -07:00
Stephen Birarda
1e6154fbc8 make draco compile flags OS X only 2017-09-13 13:45:26 -07:00
Stephen Birarda
dc86c6fe73 fixes for warnings in FBXReader/FBXWriter 2017-09-13 09:16:58 -07:00
Stephen Birarda
8a9e4029ae use explicit conversion from size_t to int 2017-09-13 00:23:52 -07:00
Stephen Birarda
4efd9b8453 set explicit draco encoding options 2017-09-12 23:45:34 -07:00
Ryan Huffman
087a95a625 Add explicit draco encoder options to FBXBaker 2017-09-12 23:15:35 -07:00
Stephen Birarda
c445d914d7 make sure material IDs are de-duplicated 2017-09-12 22:04:33 -07:00
Stephen Birarda
88b8fb4c5e use general worker threads for fbx baking 2017-09-12 20:02:27 -07:00
Ryan Huffman
c9024f5e87 Update FBXBaker to bake triangleIndices and fix faces being lost 2017-09-12 19:59:43 -07:00
Stephen Birarda
2105f2da92 change unique ID for material and second tex coord 2017-09-12 10:27:07 -07:00
Ryan Huffman
2d9d432221 Update FBXBaker to remove unused nodes from the Geometry node 2017-09-12 09:45:24 -07:00
Ryan Huffman
8fc8b8100d Fix FBXBaker failing on bad mesh data and draco meshes that can't be encoded 2017-09-12 09:44:44 -07:00
Ryan Huffman
b1d0df06d9 Add error handling in FBXBaker for empty nodes and failed draco compression 2017-09-11 12:07:41 -07:00
Ryan Huffman
ebd925b966 Add proper per face materials and texCoords1 to fbx baking 2017-09-11 10:52:59 -07:00
Ryan Huffman
9b462171f6 Add draco support to FBXBaker 2017-09-08 16:58:29 -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
Stephen Birarda
4e1e483e27 link DL libs with FBX SDK for baking 2017-08-30 16:50:20 -07:00
Stephen Birarda
ed21ad11d2 add baking to default build, add default to baking status 2017-08-30 15:14:53 -07:00
Stephen Birarda
3abca67f1a remove use of auto in TextureBaker for OS X compile 2017-08-30 14:30:11 -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
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
ba34a0ddef fail bake of partially baked FBX that references KTX 2017-08-28 15:01:31 -07:00
Ryan Huffman
7d08a5788f Move outputFiles from FBXBaker to Baker 2017-08-25 16:21:00 -07:00
Ryan Huffman
39f04adc8d Improve baking interface and add automatic baking to asset server 2017-08-24 16:15:28 -07:00