Commit Graph

4066 Commits

Author SHA1 Message Date
Minmin Gong
cfbe368d72 Remove the usage of std::iterator 2019-07-29 22:34:24 -07: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
7d74a3354d Merge branch 'master' into fix-multiUV-export 2019-07-28 09:37:00 +02: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
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
Pierre Anquez
17adc98eec Fix issue #2557 2019-07-23 15:58:30 +02:00
Kim Kulling
5895f04391 Merge branch 'master' into fix_export_custom_bindpose_error 2019-07-21 12:17:02 +02:00
Kim Kulling
ff7ec7e454 Merge branch 'master' into fix-obj-line-continuation 2019-07-20 12:07:49 +02:00
Kim Kulling
103048ff85 Update UnrealLoader.h
use memcpy instead of = operator for pos copy.
2019-07-20 10:10:17 +02:00
kkulling
a8019cf8d8 Unit: Fix new compiler warnings. 2019-07-19 10:38:44 +02: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
Merwan
2122dc231d Fix line continuations in OBJ files 2019-07-16 20:37:41 +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
Frooxius
bcdb173e09 - Fixed anim meshes generated from blendshapes not being copied to output for multi-material meshes
- Fixed first vertex of each blendshape on a multi-material mesh having all unmapped vertice offsets being added to it
- Fixed blendshapes not importing for multi-material FBX meshes with no bones
2019-07-13 22:20:47 +02:00
kimkulling
53c0f91305 Add unittest for json. 2019-07-12 16:08:51 +02:00
Kim Kulling
3b3a965d2b Delete JTImporter.h 2019-07-11 22:31:40 +02:00
Kim Kulling
b1d8398243 Delete JTImporter.cpp
Remove JTImorter.cpp from pull request
2019-07-11 22:31:24 +02:00
Kim Kulling
8bf1b9ac5e Update CMakeLists.txt
remove jtimporter
2019-07-11 22:29:30 +02:00
Kim Kulling
82e7775d6d Update JTImporter.cpp
disable unused method,.
2019-07-11 19:23:00 +02:00
Kim Kulling
da33262bcc Update FBXConverter.cpp
Fix merge conflicts
2019-07-11 19:17:41 +02:00
kkulling
eb5e829436 Assjson: add json export to list of exporters. 2019-07-11 17:43:03 +02:00
kkulling
2e782f43e5 Merge branch 'master' into kimkulling_dev 2019-07-11 17:37:52 +02:00
kkulling
b463ddd399 closes https://github.com/assimp/assimp/issues/340: start integrating assimp2json. 2019-07-11 17:37:31 +02:00
thomasbiang
d7773dcfba set->unordered_set;unsigned int for iteration 2019-07-10 09:51:20 -07:00
thomasbiang
6b5e0a9914 fix group node being exported as bone node 2019-07-09 19:05:45 -07:00
Kim Kulling
39dc9801e0 Update ColladaLoader.cpp
- add header memory
- Fix format stuff
2019-07-09 20:35:57 +02:00
Kim Kulling
a01302dd4d Merge branch 'master' into issue_2182 2019-07-09 19:45:40 +02:00
Kim Kulling
ed6dbf9533 closes code/Collada/ColladaLoader.cpp: fix possible memleak when throwing an exception. 2019-07-09 19:44:56 +02:00
kkulling
b87f4c03ba Remove not needed init. 2019-07-09 11:49:59 +02:00
Kim Kulling
ae7b1f1a77 Merge branch 'master' into kimkulling_dev 2019-07-03 18:28:15 +02:00
Kim Kulling
0ec5eb752c Update FBXConverter.cpp
Removing dead and unused code.
2019-07-03 12:50:01 +02:00
Kim Kulling
1fc232effa closes https://github.com/assimp/assimp/issues/2368: just fix it 2019-07-02 21:46:52 +02:00
Kim Kulling
96f16c7aea closes https://github.com/assimp/assimp/issues/2527: use correct macro for Assimp-exporter. 2019-07-02 19:48:53 +02:00
Kim Kulling
3fcf3bd81f Merge branch 'master' into topic/embedded_texture_name_fix 2019-06-30 12:43:40 +02:00
Rob Conde
f5ece83f31 initial unnamed node uniqueness index outside of loop 2019-06-28 16:12:58 -04:00
Mike Samsonov
6d07473550 all textures use relative path except embedded, this is fix for it 2019-06-27 17:59:55 +01:00
Kim Kulling
05f5b54f75 Merge branch 'master' into issue_2518_active_importer_ident 2019-06-27 14:02:01 +02:00
Kim Kulling
af199c50aa Merge branch 'master' into issue_2456_text_formats_precision 2019-06-26 17:31:11 +02:00
Kim Kulling
853afdf42b Merge branch 'master' into fix_issue_2507_collada_import 2019-06-25 20:19:42 +02:00
Kim Kulling
1952144445 Merge branch 'kimkulling_dev' of https://github.com/assimp/assimp into kimkulling_dev 2019-06-24 21:46:05 +02:00
Kim Kulling
0f66a917e5 Add unittest. 2019-06-24 21:37:53 +02:00