Commit Graph

502 Commits (69902c99c81d5b52ad04933683574d768817aa64)

Author SHA1 Message Date
Marc-Antoine Lortie eed0bd3ef6 Added support to load Half-Life 1 MDL files.
Added code to use Half-Life 1 MDL loader in MDLLoader.cpp.
Added Half-Life 1 MDL loader files to CMakeLists.
Added new options in config.h to use with Half-Life 1 MDL loader.
2019-12-16 10:26:46 -05:00
Kim Kulling c1706d9bf8
Update metadata.h
Fix possible crashes.
2019-12-06 21:24:04 +01:00
Kim Kulling b2ab3fa35e
Merge branch 'master' into ModellerMetaData 2019-12-06 21:19:29 +01:00
Malcolm Tyrrell a2f8c84c6c Fix deletion issue in aiMetadata::Add. 2019-12-05 17:06:28 +00:00
Malcolm Tyrrell 24f0a400b7 Extra comments. 2019-12-05 15:11:46 +00:00
Malcolm Tyrrell 894b8e3519 Initial version 2019-12-05 12:32:22 +00:00
Gordon MacPherson 505769935e
Merge branch 'master' into remove-cout-2797 2019-12-04 22:38:50 +00:00
RichardTea e5b065da3e Formatter is a stringstream
Used wrong API. Sorry about that.
2019-12-03 13:35:53 +00:00
RichardTea 496382982a Remove cout calls from FBX, LWO and B3D
Fixes #2797
2019-12-02 11:56:55 +00:00
Mike Samsonov 631da3a3d1
Merge branch 'master' into preserve_error_string 2019-12-02 10:35:29 +00:00
Loïc 5cfb0fd633 Add function aiGetVersionPatch() to be able to display Assimp version as in Git tags 2019-11-22 18:27:34 +01:00
Mike Samsonov 80f5283b2f Error string of Importer should contain a message in case of an exception 2019-11-18 16:57:01 +00:00
Justin Carpentier 28a9fb31fd
Merge branch 'master' into topic/c++11 2019-11-10 13:20:05 +01:00
Kim Kulling aa25c815bd closes https://github.com/assimp/assimp/issues/1320: make sure build works with all exporter disabled. 2019-11-10 09:47:50 +01:00
Justin Carpentier 031d3b648e
defs: use noexcept only for C++11 and more 2019-11-10 08:23:17 +01: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 9c8d835704 Explicitly use nullptr 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 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
Kim Kulling b8321925c3
Merge branch 'master' into mingw-fix-2685 2019-10-27 10:43:00 +01:00
Paul Arden e6a051d953 Fix compilation on VS2013 due to compiler bug with brace initialisers. This fixes issue #2678. 2019-10-16 19:06:57 +11:00
Kim Kulling d3ddf8de60
Merge branch 'master' into mingw-fix-2685 2019-10-12 11:24:33 +02:00
kimkulling 33af183bb8 Cleanup the public headers. 2019-10-11 13:27:36 +02:00
kkulling 789a2bdd36 Move stuff into def.h 2019-10-11 09:47:31 +02:00
Robikz 81d125a2cc dllexport ASSIMP_API in all Windows compilers, not just MSVC
This fixes a problem mentioned in issue #2685 where the libassimp.dll
compiled with MinGW doesn't export any symbols.
2019-10-06 19:02:41 +02:00
Victor Cebollada e0fee3d87b gltf2.0 importer - Support for mesh morph animations added.
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
2019-09-25 09:58:23 +01:00
Kim Kulling ab3c17419e fix warning 2019-09-22 12:27:44 +02:00
Kim Kulling 94c488d7ea fix compiler warnings. 2019-09-22 10:15:44 +02:00
Kim Kulling 69087abc56 Ensure that the aiString lenght is 4 bytes independent which platform and add mingw back to appveyor. 2019-09-21 16:36:22 +02:00
Kim Kulling f5dcd5060f add missing namespace." 2019-09-17 22:11:58 +02:00
Kim Kulling 2edcf82f5a add missing include. 2019-09-17 21:58:46 +02:00
Kim Kulling 8b95479bb0 closes https://github.com/assimp/assimp/issues/2598: introduce getEpsilon 2019-09-15 19:25:37 +02:00
Kim Kulling 28d0300dbe
Merge branch 'master' into gltf_add_ortho_cam 2019-09-11 09:32:14 +02:00
Kim Kulling d91eebf347 Add ortho camera. 2019-09-10 22:13:54 +02:00
RevoluPowered ddc26e1c46 Added maya stingray support for textures 2019-09-08 19:15:27 +01:00
RevoluPowered da97f1be79 Implemented basic PBR materials into assimp.
This adds the following texture types:
- BASE_COLOR
- NORMAL_CAMERA
- EMISSION_COLOR
- METALNESS
- DIFFUSE_ROUGHNESS

This is the first small change required.
We only support maya right now.
2019-09-08 19:15:27 +01:00
Mike Samsonov 873a358ce4 A crash in the aiMesh descructor 2019-09-05 11:44:02 +01:00
Gordon MacPherson abdd853ca5 FIX missing update call for scale to post process 2019-08-27 15:50:50 +01:00
Gordon MacPherson db8606ba57 Fix typo 2019-08-21 23:32:31 +01:00
Gordon MacPherson 0d29203e24 Prototype unit system for assimp generic enough to be used across formats. 2019-08-21 21:41:41 +01:00
Kim Kulling 7ee7946dc5
Update scene.h
use #include <cstdlib> only if the compiler is used to compile c++ code.
2019-08-18 09:40:13 +02:00
Kim Kulling a9b4909a2f
Merge branch 'master' into patch-1 2019-08-14 21:21:18 +02:00
Kim Kulling a2ee19e86d
Merge branch 'master' into collada_zae 2019-08-14 20:02:53 +02:00
Kim Kulling 4c1e8fe9c3
Update config.h.in
closes https://github.com/assimp/assimp/issues/2570: fix a typo.
2019-08-09 20:30:12 +02:00
follower 1e6eac9e65
Fix error when building assimp on older Mac OS X version.
Prevents this error when building with Mac OS X 10.9 SDK:

    error: no member named 'atoi' in namespace 'std'; did you mean simply 'atoi'?
2019-08-02 04:44:21 +12:00
RichardTea 9b78060a4a Add copyright headers to ZipArchiveIOSystem 2019-07-25 10:14:42 +01:00
Kim Kulling 41ea607739
Merge branch 'master' into collada_zae 2019-07-20 14:12:18 +02:00
kimkulling 8f74508e40 Fix missing doc in config.h 2019-07-12 16:28:36 +02:00