Commit Graph
4148 Commits
Author SHA1 Message Date
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 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 MacPhersonandK. S. Ernest Lee 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 MacPhersonandK. S. Ernest Lee 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
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 MacPhersonandK. S. Ernest Lee 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