Commit Graph

4083 Commits

Author SHA1 Message Date
Kim Kulling
9f5b047f7c Merge branch 'master' into fix_export_group_as_bone 2019-08-06 19:27:37 +02:00
Kim Kulling
deee43f946 Merge branch 'master' into stl-white-ambient 2019-07-29 19:31:33 +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
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
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
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
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
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
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