Commit Graph

7817 Commits (c890a4d5214c89e1d96d32c7f220f6cd1bc8e0ca)

Author SHA1 Message Date
thewoz c890a4d521 Update .gitignore 2019-11-05 16:36:03 +01:00
Kim Kulling 308db73d0b
Merge pull request #2736 from bztsrc/master
Added M3D format support
2019-11-04 22:18:08 +01:00
Kim Kulling d29185ec7d
Merge branch 'master' into master 2019-11-03 21:22:01 +01:00
Kim Kulling 1aaec5ea7b
Merge pull request #2728 from RevoluPowered/feature/clang-formatting
Clang format added for code reformatting
2019-11-03 21:03:58 +01:00
Kim Kulling 2e84f5174d
Merge branch 'master' into feature/clang-formatting 2019-11-03 10:33:17 +01:00
Kim Kulling ef06cabe6c
Merge pull request #2741 from muxanickms/fbx_orphant_embedded_textures
FBX orphan embedded textures fix
2019-11-03 10:32:17 +01:00
Zoltan Baldaszti c49e67ee1e
Merge branch 'master' into master 2019-11-02 15:53:33 +01:00
Kim Kulling df30c83db4
Merge branch 'master' into fbx_orphant_embedded_textures 2019-11-02 15:10:32 +01:00
Kim Kulling d518950e80
Merge pull request #2744 from tanolino/patch-1
Update CXMLReaderImpl.h
2019-11-02 15:09:57 +01:00
Zoltan Baldaszti dda46f5f4d
Merge branch 'master' into master 2019-11-02 01:14:04 +01:00
bzt 7201ebdccc Make Clang happy 2019-11-01 21:52:11 +01:00
bzt 7d9e9aadbb Asked modifications and unit test 2019-11-01 17:21:24 +01:00
tanolino 82f926971b
Update CXMLReaderImpl.h
Issues with German locale number converter expecting German numbers.

In Germany we have numbers like #,## instead of #.## . Thus a unit conversion in COLLADA of 0.01 (centimeter) turned out to be 0.00.
2019-11-01 17:01:52 +01:00
Mike Samsonov 536fea1c8d operator less for old compilers 2019-11-01 14:50:30 +00:00
Mike Samsonov 55c2a3edb9 FBX orphant embedded textures 2019-11-01 12:29:54 +00:00
bzt 8ebd48442e Made the M3D SDK C++ wrapper optional 2019-11-01 03:39:36 +01:00
Kim Kulling aa4c9fb5fa
Merge pull request #2731 from RevoluPowered/feature/easy-armature-lookup
Implemented armature lookup and updated FBX importer to properly support this
2019-10-30 20:23:59 +01:00
bzt 3bf81375da Fixed clang's problem with register keyword 2019-10-30 03:06:24 +01:00
bzt 37cc29c020 Fixed clang's problem with register keyword 2019-10-30 03:04:33 +01:00
bzt 0ff3e40157 Fixed clang's casting issue and MSVC's buffer allocation problem 2019-10-30 02:35:51 +01:00
bzt 60e9157699 Fixed AI_MATKEY list string constant issue. My gcc didn't comply about this 2019-10-30 01:37:28 +01:00
bzt 5a79287041 More reduced scope fix, what's wrong with reusing i as a loop variable? 2019-10-30 01:21:15 +01:00
bzt 7ed621b53f More reduced scope fix by wasting more memory... 2019-10-30 01:14:20 +01:00
bzt 1c23d2e8de More reduced scope fix by wasting more memory... 2019-10-30 01:11:34 +01:00
bzt 5b18baf883 Fixed issues with MSVC 2019-10-30 00:55:54 +01:00
RevoluPowered 02a63f8b10 Fixed template being used in file 2019-10-29 20:21:16 +00:00
Kim Kulling be09110aa8
Merge branch 'master' into feature/easy-armature-lookup 2019-10-29 21:09:50 +01:00
Kim Kulling 6432fc8168
Merge pull request #2726 from quanterion/fix-3ds-material-names
Fix lower casing material names in 3DS importer
2019-10-29 21:06:15 +01:00
bzt a622e109a0 Fixed PR Quality Review Issues 2019-10-29 18:42:10 +01:00
bzt 0baec5f0bd Added M3D format support 2019-10-29 14:14:00 +01:00
Kim Kulling 459d8105a7
Merge branch 'master' into fix-3ds-material-names 2019-10-29 13:18:23 +01:00
Kim Kulling 15dcd5c096
Merge pull request #2725 from migenius/migenius-fix-pbrsg
glTF2 fix glossinessFactor being put into the wrong object on export
2019-10-29 12:57:23 +01:00
Kim Kulling 18555abed0
Merge branch 'master' into migenius-fix-pbrsg 2019-10-28 20:08:47 +01:00
Kim Kulling 2ed0d905ab
Merge pull request #2717 from migenius/migenius-fix-doublefree
Fix multiple deallocation of memory for texture data.
2019-10-28 20:00:05 +01:00
Kim Kulling 571d64e3c1
Merge branch 'master' into migenius-fix-doublefree 2019-10-28 07:51:19 +01:00
Kim Kulling 562ad9dc99
Merge pull request #2711 from RichardTea/collada_zae_textures_2710
Collada ZAE texture loading
2019-10-28 07:50:41 +01:00
Kim Kulling 61ea5a4ac6
Merge branch 'master' into collada_zae_textures_2710 2019-10-27 18:24:16 +01:00
Kim Kulling 3255f1ad17
Merge pull request #2709 from RichardTea/assimp_version_2693
Update assimp legal and version
2019-10-27 18:23:27 +01:00
RevoluPowered d7d79db0ac Tests should always debug log 2019-10-27 14:17:37 +00:00
RevoluPowered 5155efe888 Fixed bitmask issue
We are approaching the limit for the number of post processes
2019-10-27 14:16:39 +00:00
RevoluPowered a9a0d4d29b Tidying order of function calls and fixed debug statements 2019-10-27 14:16:39 +00:00
RevoluPowered 212bcfe75c Test disable cache 2019-10-27 14:16:39 +00:00
RevoluPowered 9c8d835704 Explicitly use nullptr 2019-10-27 14:16:39 +00:00
RevoluPowered 5d0c63391b Explicitly set the size of the parent node if we have no children 2019-10-27 14:16:39 +00:00
RevoluPowered a30936954e Best to check the number of children before checking the actual array 2019-10-27 14:16:39 +00:00
RevoluPowered 514257f587 Added unit tests for ArmaturePopulate when used (added huestos model to tests)
Added clear documentation for this too to explain, you need to enable it to make it available

Signed-off-by: RevoluPowered <gordon@gordonite.tech>
2019-10-27 14:16:39 +00:00
RevoluPowered 46cdd81d75 Added ArmaturePopulate scale process for all formats 2019-10-27 14:16:39 +00:00
RevoluPowered 93efe4197a Removed redundant rest matrix and fixed assert compile error 2019-10-27 14:16:39 +00:00
RevoluPowered 6ea97a1282 Updated test cases to test import of names
This now doesn't overwrite names anymore as this would cause nasty bugs application side.

We can now support these by default without having to handle them as edge cases.
2019-10-27 14:16:39 +00:00
RevoluPowered 168ae22ad4 Implemented easy armature lookup
This lets you directly retrieve the node a bone links to and informs you of the armature directly

This also fixes a bug with bone name being made unique which causes them to become not 1:1 what the modeller has imported.
2019-10-27 14:16:39 +00:00