v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,967 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

7967 Commits (a10b0d4de3061e11d430898f0d7a14a2ee18246e)

Author SHA1 Message Date
bzt a10b0d4de3 Requested modifications 2019-12-14 08:52:48 +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 b2ea762b02
Merge pull request #2829 from MalcolmTyrrell/fixTexcoord 
Fix texcoord
 2019-12-13 08:23:30 +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 2124da8340 Add a texcoord unit test. 2019-12-12 12:06:36 +00:00
Malcolm Tyrrell b70c05b4e0 Fix texcoords. 2019-12-12 09:38:50 +00:00
Kim Kulling 7223e0e3fc
Merge pull request #2827 from muxanickms/3dsmax_pbr_materials 
Add a support for 3DSMax Physically Based Materials for FBX format
 2019-12-11 18:35:39 +01: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
Gordon MacPherson 6df5e10c88
Merge pull request #2818 from RichardTea/backfacing-odd-negative-scale-2383 
Backfacing odd negative scale 2383
 2019-12-09 19:06:32 +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 d8575b2b55
Merge pull request #2814 from assimp/issue_2809 
closes https://github.com/assimp/assimp/issues/2809: fix crash for sp…
 2019-12-08 12:58:28 +01: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 fbebeba2b0
Merge pull request #2805 from RichardTea/partial-cleanup-m3d 
Some cleanup of M3D support
 2019-12-08 09:02:06 +01:00
Kim Kulling 747e12465b
Merge branch 'master' into partial-cleanup-m3d 2019-12-07 19:43:05 +01:00
Kim Kulling e7ed315145
Merge pull request #2801 from RichardTea/fix-2799-2785 
MSVC: Disable optimisations in debug build
 2019-12-07 19:34:54 +01:00
Kim Kulling f9e861527b
Merge branch 'master' into fix-2799-2785 2019-12-07 13:47:25 +01:00
Kim Kulling 016115628e
Merge pull request #2810 from MalcolmTyrrell/ModellerMetaData 
Modeller meta data
 2019-12-07 13:40:21 +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 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
Gordon MacPherson 6d71921a2f
Merge pull request #2802 from RichardTea/remove-cout-2797 
Remove cout calls from FBX, LWO and B3D
 2019-12-06 19:52:56 +00: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 8956e567b2 Better comment. 2019-12-05 14:09:36 +00:00
Malcolm Tyrrell 6639d5180b Add a test for gltf2 and FBX metadata. 2019-12-05 14:05:49 +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 81cb2433bc
Merge pull request #2779 from turbosquid/fix_gltf_accessor_overflow 
Fix glTF validation error related to accessor min and max values
 2019-12-04 13:43:38 +00:00
Gordon MacPherson bdb89413bc
Merge branch 'master' into fix_gltf_accessor_overflow 2019-12-03 22:20:19 +00:00