Commit Graph

7407 Commits

Author SHA1 Message Date
Kim Kulling
090e896ebf Merge branch 'master' into collada_zae 2019-08-06 21:22:02 +02:00
Kim Kulling
42f07c8bbc Merge pull request #2536 from thomasbiang/fix_export_group_as_bone
Fix Issue: group node in fbx being exported as bone node
2019-08-06 21:21:35 +02:00
Kim Kulling
9f5b047f7c Merge branch 'master' into fix_export_group_as_bone 2019-08-06 19:27:37 +02:00
Kim Kulling
1c3e934ae9 Merge pull request #2563 from mosra/stl-white-ambient
Fix white ambient in STL loader
2019-07-30 14:16:09 +02:00
Kim Kulling
deee43f946 Merge branch 'master' into stl-white-ambient 2019-07-29 19:31:33 +02:00
Kim Kulling
1d565b0aab Merge pull request #2566 from RichardTea/test_exporter_ids
Test Exporter Descriptions and IDs
2019-07-29 10:09:28 +02:00
Kim Kulling
d83af91095 Update Exporter.cpp
Add exporter detail.
2019-07-29 09:03:29 +02:00
Kim Kulling
762e039d15 Merge branch 'master' into test_exporter_ids 2019-07-28 22:20:57 +02:00
Kim Kulling
69265273c2 Merge pull request #2572 from thomasbiang/fix-multiUV-export
Fix issue # 2571: extra layer for multi uv sets
2019-07-28 11:13:31 +02:00
Kim Kulling
7d74a3354d Merge branch 'master' into fix-multiUV-export 2019-07-28 09:37:00 +02:00
RichardTea
361609c60b Merge branch 'master' into test_exporter_ids 2019-07-26 22:21:16 +01:00
RichardTea
7fc4cf1552 ASSIMP_BUILD_NO_*_EXPORTER
Full fix for #2557

These macros should be all-caps.
Correct the cmakelists
2019-07-26 22:17:24 +01:00
Kim Kulling
94328695d0 Merge branch 'master' into fix_export_group_as_bone 2019-07-26 11:00:04 +02:00
Kim Kulling
73914cd7e2 Update FBXExporter.cpp
small reformatting improvement
2019-07-26 10:55:28 +02:00
Kim Kulling
982914754e Merge pull request #2564 from RichardTea/test_gitignore_cleanup
Add Export Unit Test output to gitignore
2019-07-26 10:47:20 +02:00
RichardTea
72e18ed4aa Fix Travis CI sign-compare warning
EXPECT_* triggers sign compare error with literal 0 and unsigned
Use 0u literal with size_t
2019-07-26 09:10:09 +01:00
ywang
d8eaf0bc7f cleanup empty lines 2019-07-25 15:53:57 -07:00
ywang
a6b06ad811 update 2019-07-25 15:49:41 -07:00
thomasbiang
aaaa0a02a3 use ExportProperties to customize bind pose epsilon 2019-07-25 15:49:38 -07:00
thomasbiang
0f0454c3b7 customize error rate for bind pose 2019-07-25 15:47:17 -07:00
thomasbiang
f9f408690e use ExportProperties to customize bind pose epsilon 2019-07-25 15:45:50 -07:00
thomasbiang
2ddb00f4e0 clean up 2019-07-25 15:45:50 -07:00
thomasbiang
029338940c customize error rate for bind pose 2019-07-25 15:45:47 -07:00
ywang
0ed9158908 update 2019-07-25 15:43:43 -07:00
thomasbiang
6e6765cae3 clean up 2019-07-25 15:43:43 -07:00
thomasbiang
c597e21b67 customize error rate for bind pose 2019-07-25 15:43:43 -07:00
thomasbiang
9b2aac8c96 use ExportProperties to customize bind pose epsilon 2019-07-25 15:43:43 -07:00
thomasbiang
079e522eae clean up 2019-07-25 15:43:43 -07:00
thomasbiang
8fc899035c customize error rate for bind pose 2019-07-25 15:43:43 -07:00
thomasbiang
5a7c226c30 set->unordered_set;unsigned int for iteration 2019-07-25 15:43:24 -07:00
ywang
57a56b7b1d extra layer for multi uv sets 2019-07-25 13:14:54 -07:00
RichardTea
7e8a3ec4cb Add unit test of valid and unique Exporter IDs, rename assjson id
"json" is a very vague exporter ID, change to "assjson"

Add a unit test to ensure all exporter have unique IDs
and that they all have an ID, description and extension
2019-07-25 13:38:49 +01:00
RichardTea
e993cdc309 Merge branch 'master' into collada_zae 2019-07-25 12:42:08 +01:00
RichardTea
59a5343a1a Merge branch 'master' into test_gitignore_cleanup 2019-07-25 12:41:30 +01:00
RichardTea
9880db8d4d Merge pull request #16 from assimp/master
Update to upstream
2019-07-25 12:38:29 +01:00
RichardTea
e05ece2eec Add Exporter Unit Test output to gitignore 2019-07-25 11:12:06 +01:00
RichardTea
9b78060a4a Add copyright headers to ZipArchiveIOSystem 2019-07-25 10:14:42 +01:00
RichardTea
3016f3a725 Convert Q3BSP Importer to use ZipArchiveIOSystem
Removes duplication, handles large files better
2019-07-25 10:13:53 +01:00
RichardTea
5c6ea5d7ba Fix memory leak in Collada ZAE and 3MF ZipFile reading
Must close the file!
2019-07-25 09:54:39 +01:00
RichardTea
9e04df810e ZipArchiveIOSystem should be sorted, fix ZipFile::Read()
Q3BSP relies on the sort order
Read() should return number of elements read, not count of bytes
Read() should clip to the file size and return elements actually read,
instead of aborting if try to read too much
2019-07-25 09:53:18 +01:00
Vladimír Vondruš
dadf5c0020 Fix white ambient in STL loader.
A problem that sneaked in from #1293 (f84851e893) 
due to insufficient code review, later reported in #2059 but not fixed 
properly. Having a white ambient practically means all other color information 
is ignored and the model stays bright white no matter how you set up your 
lighting, so putting it back to how it was before the commit above.
2019-07-25 10:28:09 +02:00
Kim Kulling
d1b206a8ea Merge pull request #2558 from panquez/patch-1
Fix issue #2557
2019-07-24 22:05:02 +02:00
RichardTea
c6620478ec Fix GCC warnings reported by Travis 2019-07-24 16:12:06 +01:00
Pierre Anquez
17adc98eec Fix issue #2557 2019-07-23 15:58:30 +02:00
Kim Kulling
e828dd1757 Merge branch 'master' into collada_zae 2019-07-21 14:37:12 +02:00
Kim Kulling
46a8164af4 Merge pull request #2543 from thomasbiang/fix_export_custom_bindpose_error
Fix export custom bindpose error
2019-07-21 14:36:24 +02:00
Kim Kulling
78b283135e Update utIssues.cpp
use correct test for floats.
2019-07-21 13:32:31 +02:00
Kim Kulling
5895f04391 Merge branch 'master' into fix_export_custom_bindpose_error 2019-07-21 12:17:02 +02:00
Kim Kulling
41ea607739 Merge branch 'master' into collada_zae 2019-07-20 14:12:18 +02:00
Kim Kulling
5b6fe80883 Merge pull request #2550 from merwaaan/fix-obj-line-continuation
Fix line continuations in OBJ files
2019-07-20 14:08:08 +02:00