Commit Graph

4465 Commits

Author SHA1 Message Date
Marc-Antoine Lortie
330d9ca916 Replaced strncpy by individual character assigments. 2019-12-17 16:37:32 -05:00
Marc-Antoine Lortie
e85776aaab Added missing null terminator. 2019-12-17 16:16:18 -05:00
Marc-Antoine Lortie
a45e13b183 Fixed compilation issue.
"insert_or_assign" was not defined in the Visual Studio 2013 toolset.
2019-12-17 15:12:19 -05: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
bzt
8a800e7aa5 Removed functionality and minor material-mapping fix 2019-12-15 12:25:34 +01:00
Kim Kulling
7244f53f5f Merge branch 'master' into partial-cleanup-m3d 2019-12-14 19:22:19 +01:00
bzt
a10b0d4de3 Requested modifications 2019-12-14 08:52:48 +01:00
Kim Kulling
0ff04b9769 Update ColladaParser.cpp
Fix the build and fix 2 possible nullptr dereferences.
2019-12-13 11:20:50 +01:00
bzt
512e6dff4f Fixed ANSI C compiler issue 2019-12-13 09:16:41 +01:00
Zoltan Baldaszti
2fc72c8f72 Merge branch 'master' into master 2019-12-13 09:17:06 +01:00
bzt
453eeb65cd Merge branch 'master' of https://github.com/bztsrc/assimp 2019-12-13 09:05:06 +01:00
bzt
f151a5d11d MSVC2013 alternative to thread_local 2019-12-13 09:04:40 +01:00
Kim Kulling
53bf442beb Update ColladaParser.cpp
Fix review findings.
2019-12-13 08:30:40 +01:00
Kim Kulling
9ef2d7fb7d Merge branch 'master' into collada_modeller_metadata 2019-12-13 08:28:50 +01:00
Kim Kulling
71d7ff63f5 Update ColladaHelper.cpp
Add spaces instead of tabs.
2019-12-13 08:25:45 +01:00
Kim Kulling
8be1060ec4 Update m3d.h
Fix vs-defines for unused define as well.
2019-12-13 08:21:45 +01:00
Kim Kulling
32835873f0 Update m3d.h
Fix review warning.
2019-12-13 08:19:39 +01:00
bzt
6b2fe41a3b Replaced mutex with thread-local variable 2019-12-13 07:30:59 +01:00
bzt
30634ff56e Be more tolerant to invalid input 2019-12-13 06:38:49 +01:00
Zoltan Baldaszti
7a83e89b02 Merge branch 'master' into master 2019-12-13 04:49:57 +01:00
Malcolm Tyrrell
b6553b8a78 Merge branch 'master' into fixTexcoord 2019-12-12 12:19:02 +00:00
Malcolm Tyrrell
b70c05b4e0 Fix texcoords. 2019-12-12 09:38:50 +00:00
bzt
e17431b993 Added extra check for file size 2019-12-11 06:21:35 +01:00
bzt
fb95e49824 More MSVC workarounds 2019-12-11 05:47:59 +01:00
Mike Samsonov
08c5fa37bf Add a support for 3DSMax Physically Based Materials for FBX format 2019-12-10 12:04:35 +00:00
bzt
17aabc34cc MSVC workarounds 2019-12-10 06:30:41 +01:00
RichardTea
986b67801d Add Copyright common metadata to glTF importer/exporter
Technically this only exists in glTF v2 but may as well include in both
2019-12-09 14:30:12 +00:00
RichardTea
f498a395e4 Add common metadata to Collada
Also add AI_METADATA_SOURCE_COPYRIGHT common metadata
2019-12-09 14:05:41 +00:00
RichardTea
4a8b7800ff Update M3D ASCII exporter ident and extension
Changed to match existing Assimp style.
Set extension as per:
https://gitlab.com/bztsrc/model3d/blob/master/docs/a3d_format.md
2019-12-09 11:23:57 +00:00
RichardTea
9cabeddf4f Odd Negative Scale: PretransformVertices
PretransformVertices postprocessing now reverses face order when transform is mirroring.
Fixes flip to backfacing in models that mirrored some nodes.

(Odd count of negative scale components, negative determinant)
2019-12-09 11:07:13 +00:00
RichardTea
193b02cdac Odd negative scale: OptimizeGraph
OptimizeGraph postprocessing now reverses face order when
node scale is mirroring.
Fixes flip to backfacing in models that mirrored some nodes.

(Odd count of negative scale components, negative determinant)
2019-12-09 10:42:50 +00:00
RichardTea
463573c771 Apply clangformat 2019-12-09 09:56:01 +00:00
Kim Kulling
e3da92f7d3 closes https://github.com/assimp/assimp/issues/2809: fix crash for special ifc file. 2019-12-08 10:12:14 +01:00
Kim Kulling
747e12465b Merge branch 'master' into partial-cleanup-m3d 2019-12-07 19:43:05 +01:00
Kim Kulling
9f3c26dbd8 Update Importer.cpp
fix typo
2019-12-07 09:18:45 +01:00
Kim Kulling
7648c438ca Update Importer.cpp
fix more typos.
2019-12-07 09:08:15 +01:00
Kim Kulling
26f6e5ad30 Update Importer.cpp
fix typo
2019-12-07 08:58:47 +01:00
Kim Kulling
ef13fb2ddd Update Importer.cpp
Fix minor review findings.
2019-12-06 21:38:07 +01:00
Kim Kulling
b2ab3fa35e Merge branch 'master' into ModellerMetaData 2019-12-06 21:19:29 +01:00
Malcolm Tyrrell
8956e567b2 Better comment. 2019-12-05 14:09:36 +00:00
Malcolm Tyrrell
81984002d3 Fix and test for GLTF. 2019-12-05 13:52:34 +00:00
Malcolm Tyrrell
fabfcf3cb0 More checking 2019-12-05 12:33:00 +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
Kim Kulling
a29e407853 Update B3DImporter.cpp
some minor format changes: add brackets for one-liner if statement.
2019-12-04 21:25:17 +01:00
RichardTea
fadf4a3ee2 Update M3DWrapper.h
Add missing include.
Odd that MSVC2013-2017, GCC and Clang were ok with this.
2019-12-04 14:05:46 +00:00
RichardTea
d8608156d3 Merge branch 'master' into partial-cleanup-m3d 2019-12-04 14:00:33 +00:00
Gordon MacPherson
bdb89413bc Merge branch 'master' into fix_gltf_accessor_overflow 2019-12-03 22:20:19 +00:00
RichardTea
4a29cc7fcb Merge branch 'master' into partial-cleanup-m3d 2019-12-03 14:16:11 +00:00
RichardTea
45a96af9ac Fix typo in M3DWrapper.cpp
Don't use std::mutex if not supported.
Allow override to force it to be used if does in fact exist
Thank you CI
2019-12-03 14:15:50 +00:00