Commit Graph

4229 Commits (18bbfdac1a3a6e30ea88bfac543a29673c72469e)

Author SHA1 Message Date
Ryan McCampbell 727cf0c49f Fixed unicode on windows 2019-09-03 11:18:01 -04:00
escherstair ceacad237f
prefer prefix ++/-- operators for non-primitive types 2019-09-03 08:00:12 +02:00
escherstair 33e71ee8df
prefer prefix ++/-- operators for non-primitive types 2019-09-03 07:59:17 +02:00
escherstair 75993ad653
prefer prefix ++/-- operators for non-primitive types 2019-09-03 07:57:58 +02:00
escherstair 53d795c1c9
possible inefficient checking for 'tlist' emptiness 2019-09-03 07:57:08 +02:00
escherstair ec1930478c
prefer prefix ++/-- operators for non-primitive types 2019-09-03 07:56:37 +02:00
escherstair c1d4ed7873
prefer prefix ++/-- operators for non-primitive types 2019-09-03 07:55:27 +02:00
Kim Kulling 0f18ec9e2c
Merge branch 'master' into accessibleIsVerbose 2019-09-02 20:47:04 +02:00
Kim Kulling b34f9839f1
Merge branch 'master' into fix-missing-scale-data 2019-08-31 12:42:40 +02:00
Malcolm Tyrrell 01d0f06d3a Make IsVerbose accessible outside the exporter 2019-08-30 11:42:23 +01:00
escherstair de51122639
fix regression 2019-08-29 12:09:56 +02:00
escherstair 2d0d2374c1
fix ColladaLoader::findMesh() declaration 2019-08-29 12:00:44 +02:00
escherstair 89079ead12
prefer prefix ++/-- operators for non-primitive types 2019-08-29 11:44:41 +02:00
escherstair 946d64282b
fix inefficient checking for 'url' emptiness 2019-08-29 10:58:01 +02:00
escherstair 340611785a
prefer prefix ++/-- operators for non-primitive types 2019-08-29 10:57:23 +02:00
escherstair cb2beba073
prefer prefix ++/-- operators for non-primitive types 2019-08-29 10:56:58 +02:00
escherstair aec4726d21
prefer prefix ++/-- operators for non-primitive types 2019-08-29 10:56:21 +02:00
escherstair b3788039df
prefer prefix ++/-- operators for non-primitive types 2019-08-29 10:55:09 +02:00
escherstair 3ef0860f30
prefer prefix ++/-- operators for non-primitive types 2019-08-29 10:54:21 +02:00
escherstair e8ae086b35
fix function definition 2019-08-29 10:48:51 +02:00
escherstair 75fed8340d
fix function declaration 2019-08-29 10:46:50 +02:00
escherstair a044852938
fix inefficient checking for lists emptiness 2019-08-29 10:44:19 +02:00
escherstair ba3e4ae892
prefer prefix ++/-- operators for non-primitive types 2019-08-29 10:42:47 +02:00
escherstair 2f53d42d45
fix inefficient checking for 'SceneNode_Child' emptiness 2019-08-29 10:42:09 +02:00
escherstair cca81e877a
prefer prefix ++/-- operators for non-primitive types 2019-08-29 10:41:34 +02:00
escherstair b363fa3883
prefer prefix ++/-- operators for non-primitive types 2019-08-29 10:41:00 +02:00
escherstair 69fce64b9c
prefer prefix ++/-- operators for non-primitive types 2019-08-29 10:40:31 +02:00
escherstair 44d7cb8177
possible inefficient checking for lists emptiness 2019-08-29 10:37:19 +02:00
escherstair 02444be251
prefer prefix ++/-- operators for non-primitive types 2019-08-29 10:36:09 +02:00
escherstair 65ba0c4b46
fix inefficient checking for lists emptiness 2019-08-29 10:30:50 +02:00
escherstair ebb061d89c
fix inefficient check for 'mNodeElement_List' emptiness 2019-08-29 10:29:24 +02:00
escherstair 0d17315166
prefer prefix ++/-- operators for non-primitive types 2019-08-29 10:25:38 +02:00
escherstair f009c216b6
prefer prefix ++/-- operators for non-primitive types 2019-08-29 10:24:58 +02:00
escherstair eadbc89a1f
prefer prefix ++/-- operators for non-primitive types 2019-08-29 10:23:27 +02:00
escherstair 438b070508
prefer prefix ++/-- operators for non-primitive types 2019-08-29 10:22:50 +02:00
escherstair 805fda3df8
possible inefficient checking for 'NodeElement_List' emptiness 2019-08-29 09:05:15 +02:00
escherstair b1f8f6ae3b
prefer prefix ++/-- operators for non-primitive types 2019-08-29 09:04:27 +02:00
escherstair ffb30fbc85
prefer prefix ++ operator for non-primitive types 2019-08-29 09:02:19 +02:00
escherstair 789e8abfe8
prefer prefix ++ operator for non-primitive types 2019-08-29 08:44:49 +02:00
escherstair f1e0c460ed
Prefer prefix ++ operator for non-primitive types 2019-08-29 08:43:56 +02:00
escherstair 8e90bf8381
fix inefficient checking for lists emptiness 2019-08-29 08:43:09 +02:00
escherstair 43865e6bc9
fix inefficient checking for 'url' emptiness 2019-08-29 08:34:18 +02:00
escherstair 60f2535dcd
fix inefficient check for 'SceneNode_Mesh' emptiness 2019-08-29 08:30:24 +02:00
escherstair 7d8a25993b
prefer prefix ++ operator for non-primitive types 2019-08-29 08:29:30 +02:00
escherstair 765c0e71f6
prefer prefix ++ operator for non-primitive types 2019-08-29 08:25:19 +02:00
escherstair 806bcf76b1
fix inefficient checking for lists emptiness 2019-08-29 08:23:09 +02:00
escherstair 30eb3c56c3
prefer prefix ++ operator for non-primitive types 2019-08-29 08:12:22 +02:00
escherstair dbb498095d
function parameter 'meshid' should be passed by const reference 2019-08-29 08:05:45 +02:00
escherstair 0dd1ae0196
prefer prefix ++ operator for non-primitive types 2019-08-29 08:02:51 +02:00
escherstair 9ad7ce1129
prefer prefix ++ operator for non-primitive types 2019-08-29 08:02:08 +02:00
escherstair a9d902946d
fix inefficient check for 'Composition' emptiness 2019-08-29 08:01:00 +02:00
Kim Kulling e20640c2c8
Merge branch 'master' into fix-segfault-fbx-import 2019-08-28 09:14:51 +02:00
Gordon MacPherson 43cb76653b Removed depreciated FBX Unit and scaling code 2019-08-27 15:54:27 +01:00
Gordon MacPherson abdd853ca5 FIX missing update call for scale to post process 2019-08-27 15:50:50 +01:00
Gordon MacPherson ad971468ef
size_t cannot be less than 0 2019-08-27 15:15:40 +01:00
Kim Kulling 0729a6e20f
Merge branch 'master' into feature/bug-fbx-application-scale-wrong 2019-08-27 14:06:00 +02:00
Gordon MacPherson 7e12257ebc Fix segfault #2614 2019-08-26 22:44:25 +01:00
Gordon MacPherson c50a4d8ade Fix segfault caused by FBX file with missing face #2614 2019-08-26 22:39:20 +01:00
Gordon MacPherson d56198774e Fix FBX units not being converted from CM to application scale 2019-08-26 22:03:56 +01:00
Kim Kulling 48f1f012eb
Merge branch 'master' into feature/fix-removal-of-bones 2019-08-25 09:34:20 +02:00
Kim Kulling 594d90a18e
Merge branch 'master' into feature/prototype-for-assimp-universal-scale 2019-08-24 10:22:08 +02:00
Kim Kulling 9a78f2c6f1
Merge branch 'master' into topic/fbxNodeChainFix 2019-08-23 17:24:04 +02:00
Gordon MacPherson 0d29203e24 Prototype unit system for assimp generic enough to be used across formats. 2019-08-21 21:41:41 +01:00
RichardTea b8d4ae5a7c Add git commit, original filename to DLL PE header
Windows only
2019-08-21 15:54:14 +01:00
Gordon MacPherson 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
Kim Kulling eb55a6a3cd
Update ScaleProcess.cpp
Fix review findings.
2019-08-19 20:24:01 +02:00
Gordon MacPherson 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
Ghanshyam Bhutra f69bf5f7ed
fix for div by zero reported by address sanitizer 2019-08-16 17:04:42 -07:00
Kim Kulling 84e9d9ddf8
Merge branch 'master' into topic/fbxNodeChainFix 2019-08-16 08:47:02 +02:00
Kim Kulling a2ee19e86d
Merge branch 'master' into collada_zae 2019-08-14 20:02:53 +02:00
ywang 3d0775eebc respect export flag if aiJoinIdenticalVertices is not needed 2019-08-12 18:10:43 -07: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
Malcolm Tyrrell 3c7a608956 Add an include. 2019-08-09 16:26:59 +01:00
Malcolm Tyrrell 181d3dd84f Fix node chain bug. 2019-08-09 15:28:14 +01: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