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

10725 Commits (75e7d0f6ef6b70f0301ce0103a8bf5db696030de)

Author SHA1 Message Date
Kim Kulling 873c6ffabe
Merge branch 'master' into fix-import-export-confusion 2021-04-19 21:08:52 +02:00
Krishty 55dd5faafb fixed export exceptions on import 
Ogre and 3MF imports threw DeadlyExportErrors under some circumstances. Bad for people who assumed that they only needed to catch DeadlyImportErrors. Changed them to DeadlyImportErrors.
 2021-04-19 19:33:41 +02:00
Tobias Rittig 0643786288
Add PBRT to exportable file formats list 
As of #3580 assimp can export to the newest version of the PBRT renderer. This was not listed here.
 2021-04-19 15:27:59 +02:00
Kim Kulling 0af558a11c
Merge pull request #3774 from krishty/version-string-fix 
Version string fix (if anyone cares)
 2021-04-19 13:20:26 +02:00
Krishty 930cc25c0e fixed version string test 2021-04-19 09:51:44 +02:00
Krishty 3fead344ad updated version string (if anyone cares) 2021-04-19 07:37:12 +02:00
Krishty a19299d501 moved MD2/MDC tables from BSS to const data 
Visual C++ is unable to identify them as constant data during optimization, so explicitly declare them const.
 2021-04-17 00:32:04 +02:00
Krishty f761dc72f4 style fix - initializing and assigning empty std::string properly 
std::string s(""); s = ""; calls the copy constructor, which in turn calls strlen(), … assigning a default-constructed string generates fewer instructions and is therefore preferred.

With C++11 uniform initialization, you’d simply write s = { } instead.
 2021-04-16 23:43:56 +02:00
Krishty 6cbeca5518 fixed glTF export stuff being pulled into the EXE even if building with ASSIMP_BUILD_NO_EXPORT 
“LazyDictBase::WriteObjects()” in the two glTF implementations is only used for export. Since it’s a virtual method, and many compilers have trouble removing unreferenced virtual methods, glTF export stuff is pulled into the binary even if compiling without exports.

This commit removes said virtual function if only compiling for import.

This removes 75 KiB of useless code when compiled with Visual Studio for x64.
 2021-04-16 20:44:40 +02:00
Kim Kulling cd42b9954b
Merge pull request #3757 from mahiuchun/tr1 
Flip the check on _MSC_VER for using TR1 containers.
 2021-04-14 13:03:51 +02:00
Kim Kulling 21b56b0058
Merge branch 'master' into tr1 2021-04-14 12:46:59 +02:00
Kim Kulling 83c0dce075
Merge branch 'master' into Q1MDLgroup 2021-04-14 10:48:26 +02:00
Kim Kulling c282b9a775
Merge pull request #3742 from Garux/patch-1 
Fix MDC loader
 2021-04-14 10:47:34 +02:00
Kim Kulling 0b61a8875a
Merge branch 'master' into patch-1 2021-04-14 10:22:42 +02:00
Kim Kulling bbfefd89d7
Merge pull request #3758 from assimp/kimkulling-update-assimp.net 
Update repo for assimp-net
 2021-04-14 09:37:20 +02:00
Kim Kulling bef2304c53
Update repo for assimp-net 2021-04-14 08:55:55 +02:00
Hill Ma 4aa52b3af8 Flip the check on _MSC_VER for using TR1 containers. 2021-04-13 11:15:52 -07:00
Kim Kulling 182418e818
Merge pull request #3755 from assimp/kimkulling-issue3754 
Not resize empty vectors.
 2021-04-12 23:31:06 +02:00
Kim Kulling a6e4672df1
Fix a typo. 2021-04-12 23:19:00 +02:00
Kim Kulling d1eeb80e1a
Not resize empty vectors. 
closes https://github.com/assimp/assimp/issues/3754
 2021-04-12 21:05:46 +02:00
Kim Kulling c9ba616eb6
Merge pull request #3708 from urschanselmann/master 
Fix import of FBX files with last UV duplicated (caused by bug in FBX SDK 2019.0+)
 2021-04-12 11:50:12 +02:00
Kim Kulling 263d450300
Merge branch 'master' into master 2021-04-12 09:35:03 +02:00
Kim Kulling 67fa0a13bc
Merge pull request #3749 from pcwalton/ms3d-fixes 
Fix incorrect indices in the MilkShape 3D loader
 2021-04-11 20:37:31 +02:00
Kim Kulling a3ee377af7
Merge branch 'master' into ms3d-fixes 2021-04-11 19:12:06 +02:00
Kim Kulling cf4ef04a80
Merge branch 'master' into master 2021-04-07 20:58:40 +02:00
Kim Kulling 6eae925441
Merge pull request #3695 from AllegorithmicSAS/feature/gltf_fb_ngon_encoding 
[gltf2-exporter] Adding FB_ngon_encoding support
 2021-04-07 20:52:05 +02:00
Clement JACOB e66232d8c3
Merge branch 'master' into feature/gltf_fb_ngon_encoding 2021-04-07 13:54:31 +02:00
Patrick Walton a44ba41413 Fix incorrect indices in the MilkShape 3D loader 2021-04-05 19:14:48 -07:00
Kim Kulling d51fce9e70
Merge pull request #3748 from assimp/kimkulling-issue_3747 
Fix direct leak
 2021-04-05 21:37:48 +02:00
Kim Kulling 7fee914776
Fix direct leak 
closes https://github.com/assimp/assimp/issues/3747
 2021-04-05 21:24:54 +02:00
Kim Kulling 4eb69d1e54
Merge pull request #3746 from BaldricS/rename_PI_to_avoid_macro_convention 
Renaming PI to aiPi.
 2021-04-05 18:40:27 +02:00
Scott Baldric 31e8042071 Renaming PI to aiPi. 2021-04-05 09:59:22 -05:00
Garux 856547be23 Fix Q1 MDL group frame loading, e.g. Q1 progs/flame2.mdl 2021-04-05 17:18:06 +03:00
Garux 437d7bf8b8
Fix MDC loader 
placement new was clearing input buffer by constructor, which was nothing to do with adequate parsing
changes are not analyzed in depth, but at least test model and models of Wolf:ET are loading and not crashing
 2021-04-05 16:39:41 +03:00
Kim Kulling 06a60c43cf
Merge pull request #3739 from assimp/kimkulling-patch-7 
Update INSTALL
 2021-04-04 20:46:43 +02:00
Kim Kulling 010c0853ea
Update INSTALL 2021-04-04 14:40:50 +02:00
Kim Kulling eb261c6581
Merge pull request #3718 from MalcolmTyrrell/MalcolmTyrrell/tangentCheck 
Malcolm tyrrell/tangent check
 2021-04-03 18:28:03 +02:00
Kim Kulling 22413d85ad
Merge branch 'master' into MalcolmTyrrell/tangentCheck 2021-04-03 17:42:44 +02:00
Kim Kulling cfad36d0f4
Merge pull request #3737 from assimp/615IO-ios-port-update 
615 io ios port update
 2021-04-03 17:41:07 +02:00
Kim Kulling 7d68eab4a7 Update license 2021-04-03 12:09:23 +02:00
Kim Kulling d677005487 Merge branch '615IO-ios-port-update' 2021-04-03 12:08:38 +02:00
Kim Kulling 0b628a0ebb Merge branch 'ios-port-update' of https://github.com/615IO/assimp into 615IO-ios-port-update 2021-04-03 12:04:03 +02:00
Kim Kulling 456af8c493
Merge pull request #3736 from assimp/issue_3678 
Issue 3678
 2021-04-03 11:23:17 +02:00
Kim Kulling 80fc8538be
Update AMFImporter_Material.cpp 2021-04-03 10:29:16 +02:00
Kim Kulling d62c89557b
Remove dead code 2021-04-03 10:28:19 +02:00
Kim Kulling 46e49d0b83
Update AMFImporter_Geometry.cpp 2021-04-03 10:27:54 +02:00
Kim Kulling cdb6a62cdb
Merge branch 'master' into issue_3678 2021-04-03 10:27:07 +02:00
Kim Kulling da0543972b Fix parsing for AMF-Files. 2021-04-03 10:25:03 +02:00
Kim Kulling 89a8f87dae AMF: Remove unused macros 2021-04-02 13:10:24 +02:00
Kim Kulling 91cb2947ac
Merge pull request #3723 from eliasdaler/master 
Add zlibstatic to the list of exported targets
 2021-04-01 21:05:58 +02:00