Commit Graph

12783 Commits

Author SHA1 Message Date
Pierre Anquez
337df20209 Update CMakeLists.txt 2019-07-25 17:12:16 +02:00
Pierre Anquez
80047cd633 Update Exporter.cpp 2019-07-25 16:29:17 +02:00
Pierre Anquez
a879102309 Update CMakeLists.txt 2019-07-25 16:27:35 +02:00
Pierre Anquez
9dce8e40ba Update CMakeLists.txt 2019-07-25 16:03:26 +02: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
db3bb22933 Xml: Prepare replacement of irrXml. 2019-07-21 12:19:19 +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
Kim Kulling
ff7ec7e454 Merge branch 'master' into fix-obj-line-continuation 2019-07-20 12:07:49 +02:00
Kim Kulling
4bd8ae8211 Merge pull request #2552 from assimp/fix_new_compiler_warnings
Unit: Fix new compiler warnings.
2019-07-20 12:07:32 +02:00
Kim Kulling
103048ff85 Update UnrealLoader.h
use memcpy instead of = operator for pos copy.
2019-07-20 10:10:17 +02:00
Kim Kulling
f804036cf3 Update utBlenderWork.cpp
Fix compiler warning signed against unsigned.
2019-07-19 20:44:48 +02:00
kimkulling
b6616e7b79 Fix another signed unsigned comparison warning. 2019-07-19 13:28:00 +02:00
kimkulling
e84f961f78 change std::array<int, x > to std::array<unsigned int, x> to fix compiler warnings. 2019-07-19 13:03:08 +02:00
kimkulling
68520bff0c Fix another signed / unsigned comparison warning. 2019-07-19 11:55:12 +02:00
kimkulling
3416c04ad9 Unit: fix more compiler warnings. 2019-07-19 11:26:48 +02:00
kkulling
a8019cf8d8 Unit: Fix new compiler warnings. 2019-07-19 10:38:44 +02:00
Merwan
2f6a005fb8 Add unit test for OBJ line continuations 2019-07-17 20:17:49 +02:00
ywang
03b58e84c3 Merge branch 'fix_export_custom_bindpose_error' of https://github.com/thomasbiang/assimp into fix_export_custom_bindpose_error 2019-07-16 13:37:25 -07:00
ywang
e1e9d92c01 update 2019-07-16 13:36:46 -07:00
thomasbiang
e3683e49e4 clean up 2019-07-16 13:36:45 -07:00
thomasbiang
5121a835b5 customize error rate for bind pose 2019-07-16 13:36:45 -07:00
thomasbiang
6299c58fae use ExportProperties to customize bind pose epsilon 2019-07-16 13:34:00 -07:00
thomasbiang
6e0810d3c1 clean up 2019-07-16 13:34:00 -07:00
thomasbiang
cdf60d7423 customize error rate for bind pose 2019-07-16 13:33:59 -07:00
thomasbiang
c889699d58 set->unordered_set;unsigned int for iteration 2019-07-16 13:33:59 -07:00
thomasbiang
9210ff37f2 fix group node being exported as bone node 2019-07-16 13:33:59 -07:00
ywang
c979b4060d Merge branch 'fix_export_custom_bindpose_error' of https://github.com/thomasbiang/assimp into fix_export_custom_bindpose_error 2019-07-16 13:20:46 -07:00
ywang
4ff4938df4 Merge remote-tracking branch 'upstream/master' into fix_export_custom_bindpose_error 2019-07-16 13:17:04 -07:00
Merwan
2122dc231d Fix line continuations in OBJ files 2019-07-16 20:37:41 +02:00
Kim Kulling
0accbb58f1 Merge branch 'master' into fix_export_custom_bindpose_error 2019-07-16 16:03:09 +02:00
Kim Kulling
fed764d2a8 Merge pull request #2549 from assimp/issue_2548
closes https://github.com/assimp/assimp/issues/2548: check if weight …
2019-07-16 14:02:07 +02:00
kimkulling
c1670b6a97 closes https://github.com/assimp/assimp/issues/2548: check if weight are set or set the weight to 1.0f 2019-07-16 11:40:34 +02:00
ywang
f045170048 update 2019-07-15 15:52:45 -07:00