Commit Graph

998 Commits

Author SHA1 Message Date
Aaron Franke
1529f9518f Make file formatting comply with POSIX and Unix standards
UTF-8, LF, no BOM, and newlines at the end of files
2020-03-21 02:34:12 -04:00
kimkulling
5b8e6832c3 add mssing move constructor. 2020-03-19 16:53:05 +01:00
kimkulling
4de4c34fb2 ry to fix 2013-specific warnings in mesh.h 2020-03-19 15:10:46 +01:00
kimkulling
4d917c97bd fix warnings detected in vs2017. 2020-03-19 12:58:41 +01:00
Kim Kulling
9aa5e3e04f fix new vs2013 warnings. 2020-03-18 21:32:17 +01:00
kimkulling
d1afd97ec2 fix 2 more warnings for vs2013. 2020-03-18 16:48:32 +01:00
kimkulling
2eb8ff7136 disable 2 more warnings for vs2013. 2020-03-18 16:37:02 +01:00
kimkulling
a9e8f65941 fix the build - add misisng forward declaration for aiVector3t. 2020-03-16 10:50:07 +01:00
Kim Kulling
856ca9f2dd Fix static-code findings, 2020-03-15 12:16:17 +01:00
Kim Kulling
4210318a34 Merge branch 'master' into enable_vs_warning_all 2020-03-15 10:19:49 +01:00
kimkulling
255758e6ff fix read for precision-depending data. 2020-03-14 11:16:44 +01:00
kimkulling
69551e81ed Merge branch 'enable_vs_warning_all' of https://github.com/assimp/assimp into enable_vs_warning_all 2020-03-11 10:15:25 +01:00
kkulling
f8757322be fix warnings 2020-03-11 09:43:55 +01:00
Kim Kulling
7e7555a91b fix compiler warnings in tools and test- 2020-03-11 00:43:44 +01:00
kimkulling
f3b6b78d4d small refactorings. 2020-03-09 10:55:32 +01:00
Kim Kulling
e8d2b84017 clean all warnings for vs-2019 2020-03-08 21:24:01 +01:00
Marc-Antoine Lortie
424f5e939f Fixed wrong matrix type used in comparaison operators. 2020-03-08 12:18:09 -04:00
Kim Kulling
920535165d next fixed warnings 2020-03-01 13:15:45 +01:00
Paul Arden
e56def7585 Fix indentation. 2020-02-25 14:52:59 +11:00
Paul Arden
ae50c4ebdf Add support for orthographic camera information and use in glTF2 importer. Fixes #3030. 2020-02-25 14:45:00 +11:00
iamAdrianIusca
016c0a8665 small changes 2020-02-18 18:42:59 +02:00
Marc-Antoine Lortie
8c09cd2ef3 Fixed TextureTypeToString defined multiple times.
- Moved TextureTypeToString to it's own file.
- Added new file to CMakeLists.txt.
- Added 6 missing values in TextureTypeToString.
- Added 6 missing aiTextureType enum values in assimp_cmd/Info.cpp.
2020-02-06 13:19:01 -05:00
Kim Kulling
979153522c xml-migration: migration of XGLImporter. 2020-02-05 22:51:39 +01:00
Kim Kulling
bd2ffc8d58 Merge branch 'pugi_xml' of https://github.com/assimp/assimp into pugi_xml 2020-02-03 21:19:30 +01:00
Kim Kulling
c1fcee9c5a XMl-Migration: Migration of IrrMesh. 2020-02-03 21:19:03 +01:00
Kim Kulling
02df65d541 Merge branch 'master' into pugi_xml 2020-01-28 13:13:47 +01:00
Kim Kulling
8ef106e185 xml-migration: introduce xmlnode. 2020-01-27 22:11:27 +01:00
Marc-Antoine Lortie
770c822621 Updated places to achFormatHint referencing array size. 2020-01-23 15:26:49 -05:00
Kim Kulling
02acb3f8c2 Merge branch 'master' into pugi_xml 2020-01-23 21:26:04 +01:00
Kim Kulling
a905303764 IrrXml: replaced irrXml by pugixml. 2020-01-23 21:16:10 +01:00
Marc-Antoine Lortie
4e7e47bd43 Updated copyright dates.
Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, assimp team".

Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, ASSIMP Development Team".

Changed copyright end year to 2020 in LICENCE.rtf.

Changed copyright end year in CMakeFiles.txt files and any other places referencing Assimp with a copyright start and end year.
2020-01-20 08:53:12 -05:00
RichardTea
ae7a0aa6ef Merge branch 'master' into collada_modeller_metadata 2020-01-02 13:25:04 +00:00
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
RichardTea
f498a395e4 Add common metadata to Collada
Also add AI_METADATA_SOURCE_COPYRIGHT common metadata
2019-12-09 14:05:41 +00: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