0729a6e20f
Merge branch 'master' into feature/bug-fbx-application-scale-wrong
2019-08-27 14:06:00 +02:00
c50a4d8ade
Fix segfault caused by FBX file with missing face #2614
2019-08-26 22:39:20 +01:00
d56198774e
Fix FBX units not being converted from CM to application scale
2019-08-26 22:03:56 +01:00
48f1f012eb
Merge branch 'master' into feature/fix-removal-of-bones
2019-08-25 09:34:20 +02:00
594d90a18e
Merge branch 'master' into feature/prototype-for-assimp-universal-scale
2019-08-24 10:22:08 +02:00
9a78f2c6f1
Merge branch 'master' into topic/fbxNodeChainFix
2019-08-23 17:24:04 +02:00
0d29203e24
Prototype unit system for assimp generic enough to be used across formats.
2019-08-21 21:41:41 +01:00
b8d4ae5a7c
Add git commit, original filename to DLL PE header
...
Windows only
2019-08-21 15:54:14 +01:00
4bc5e8c262
Stop JoinVerticiesProcess removing bones from mesh as per #2596
...
Co-authored-by: K. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>
2019-08-19 19:35:44 +01:00
eb55a6a3cd
Update ScaleProcess.cpp
...
Fix review findings.
2019-08-19 20:24:01 +02:00
fbb34b1de1
ScaleProcess overhauled to improve compatibility with animations and unit conversion.
...
./assimp Added arguments --gs to assimp command line option to enable global scaling.
No scaling for mScale of 1.0.
Co-Authored-By: K. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>
2019-08-19 17:36:57 +01:00
f69bf5f7ed
fix for div by zero reported by address sanitizer
2019-08-16 17:04:42 -07:00
84e9d9ddf8
Merge branch 'master' into topic/fbxNodeChainFix
2019-08-16 08:47:02 +02:00
a2ee19e86d
Merge branch 'master' into collada_zae
2019-08-14 20:02:53 +02:00
cc8e7dcc1b
Merge branch 'master' into glTF-2.0-Lights-import
2019-08-09 20:03:51 +02:00
f1f409d538
Merge branch 'master' into RemoveStdIterator
2019-08-09 17:43:30 +02:00
3c7a608956
Add an include.
2019-08-09 16:26:59 +01:00
181d3dd84f
Fix node chain bug.
2019-08-09 15:28:14 +01:00
2d7505b244
Merge branch 'master' into glTF-2.0-Lights-import
2019-08-08 21:57:32 +02:00
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
090e896ebf
Merge branch 'master' into collada_zae
2019-08-06 21:22:02 +02:00
9f5b047f7c
Merge branch 'master' into fix_export_group_as_bone
2019-08-06 19:27:37 +02:00
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
83d2ec7f74
Merge branch 'master' into RemoveStdIterator
2019-08-02 10:35:59 +02:00
cfbe368d72
Remove the usage of std::iterator
2019-07-29 22:34:24 -07:00
deee43f946
Merge branch 'master' into stl-white-ambient
2019-07-29 19:31:33 +02:00
d83af91095
Update Exporter.cpp
...
Add exporter detail.
2019-07-29 09:03:29 +02:00
762e039d15
Merge branch 'master' into test_exporter_ids
2019-07-28 22:20:57 +02:00
7d74a3354d
Merge branch 'master' into fix-multiUV-export
2019-07-28 09:37:00 +02:00
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
94328695d0
Merge branch 'master' into fix_export_group_as_bone
2019-07-26 11:00:04 +02:00
73914cd7e2
Update FBXExporter.cpp
...
small reformatting improvement
2019-07-26 10:55:28 +02:00
d8eaf0bc7f
cleanup empty lines
2019-07-25 15:53:57 -07:00
a6b06ad811
update
2019-07-25 15:49:41 -07:00
aaaa0a02a3
use ExportProperties to customize bind pose epsilon
2019-07-25 15:49:38 -07:00
0f0454c3b7
customize error rate for bind pose
2019-07-25 15:47:17 -07:00
f9f408690e
use ExportProperties to customize bind pose epsilon
2019-07-25 15:45:50 -07:00
2ddb00f4e0
clean up
2019-07-25 15:45:50 -07:00
029338940c
customize error rate for bind pose
2019-07-25 15:45:47 -07:00
0ed9158908
update
2019-07-25 15:43:43 -07:00
6e6765cae3
clean up
2019-07-25 15:43:43 -07:00
c597e21b67
customize error rate for bind pose
2019-07-25 15:43:43 -07:00
9b2aac8c96
use ExportProperties to customize bind pose epsilon
2019-07-25 15:43:43 -07:00
079e522eae
clean up
2019-07-25 15:43:43 -07:00
8fc899035c
customize error rate for bind pose
2019-07-25 15:43:43 -07:00
57a56b7b1d
extra layer for multi uv sets
2019-07-25 13:14:54 -07:00
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
e993cdc309
Merge branch 'master' into collada_zae
2019-07-25 12:42:08 +01:00
9b78060a4a
Add copyright headers to ZipArchiveIOSystem
2019-07-25 10:14:42 +01:00
3016f3a725
Convert Q3BSP Importer to use ZipArchiveIOSystem
...
Removes duplication, handles large files better
2019-07-25 10:13:53 +01:00
Kim Kulling
Gordon MacPherson
RichardTea
Ghanshyam Bhutra
Malcolm Tyrrell
petrmohelnik
Minmin Gong
RichardTea
ywang
thomasbiang