Commit graph

103 commits

Author SHA1 Message Date
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