Commit Graph

4108 Commits

Author SHA1 Message Date
Ghanshyam Bhutra
f69bf5f7ed fix for div by zero reported by address sanitizer 2019-08-16 17:04:42 -07:00
Kim Kulling
a2ee19e86d Merge branch 'master' into collada_zae 2019-08-14 20:02:53 +02:00
Kim Kulling
cc8e7dcc1b Merge branch 'master' into glTF-2.0-Lights-import 2019-08-09 20:03:51 +02:00
Kim Kulling
f1f409d538 Merge branch 'master' into RemoveStdIterator 2019-08-09 17:43:30 +02:00
Kim Kulling
2d7505b244 Merge branch 'master' into glTF-2.0-Lights-import 2019-08-08 21:57:32 +02:00
Gordon MacPherson
74d2eb842b Fixed armature being marked as 'limbnode'
This also fixes issue with root bone overwritten - which should not happen as it is a hack.

Before the behaviour would create an additional bone which would end up breaking animations completely on import.

Additionally this fixes required bones being removed.

Co-authored-by: K. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>
2019-08-08 01:02:30 +01:00
Kim Kulling
090e896ebf Merge branch 'master' into collada_zae 2019-08-06 21:22:02 +02:00
Kim Kulling
9f5b047f7c Merge branch 'master' into fix_export_group_as_bone 2019-08-06 19:27:37 +02:00
petrmohelnik
9330cca1cd glTF 2.0 Lights import
Importing of lights according to glTF 2.0 extension KHR_lights_punctual https://github.com/KhronosGroup/glTF/tree/master/extensions/2.0/Khronos/KHR_lights_punctual

Since glTF lights are based on PBR they use different attenuation model than conventional lights supported by assimp. It is possible to use attenuation factors in assimp to describe inverse square law fallof. But the light structure does not provide means to save range property. Therefore I resorted to use of metadata. When range parameter is present, I put it into 'PBR_LightRange' metadata of light's node. Please, see comment in glTF2Importer file.
2019-08-03 20:51:00 +02:00
Kim Kulling
83d2ec7f74 Merge branch 'master' into RemoveStdIterator 2019-08-02 10:35:59 +02:00
Minmin Gong
cfbe368d72 Remove the usage of std::iterator 2019-07-29 22:34:24 -07: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
RichardTea
e993cdc309 Merge branch 'master' into collada_zae 2019-07-25 12:42:08 +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
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
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
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