Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,032 Commits 19 Branches 43 Tags
9a2a0384f43a032d9cc522f48a5fc26d798f6721
Commit Graph

507 Commits

Author SHA1 Message Date
Jason C
9a2a0384f4 Merge branch 'master' into patch-3 2021-05-07 17:53:18 -04:00
Kim Kulling
bc7551b778 Merge branch 'master' into add-step-extension 2021-05-06 14:19:53 +02:00
Jason C
f5a31b70f5 Merge branch 'master' into patch-3 2021-05-05 16:24:46 -04:00
Kim Kulling
992f10e7bf Merge branch 'master' into remove-useless-scaling-prototype 2021-05-05 21:54:31 +02:00
Kim Kulling
5325b327c3 Merge branch 'master' into optimize_3mf_strings 2021-05-05 15:12:06 +02:00
kkulling
f15dcfa981 - Fix model parsing 2021-05-05 13:10:52 +02:00
kkulling
cbce6d3dad Merge branch 'optimize_3mf_strings' of https://github.com/assimp/assimp into optimize_3mf_strings 2021-05-05 10:46:54 +02:00
Kim Kulling
072aee7cbe Merge branch 'master' into add-step-extension 2021-05-04 22:35:21 +02:00
Kim Kulling
e85a69a960 Update D3MFImporter.cpp 2021-05-04 15:31:07 +02:00
vfxgordon
4231a86ad8 Merge branch 'master' into fbxBlendshapes 2021-05-04 06:22:22 -07:00
kimkulling
7690f92c81 Fix version of strnlen 2021-05-04 14:48:39 +02:00
kimkulling
ee5170c18a - fix security issue 2021-05-04 14:40:25 +02:00
Kim Kulling
9c44c0ab2b Merge branch 'master' into remove-useless-scaling-prototype 2021-05-04 13:02:00 +02:00
kimkulling
0e17939e8d Use const char* const 2021-05-04 12:09:38 +02:00
kkulling
55fd820ed7 use const chars 2021-05-04 10:57:30 +02:00
vfxgordon
9ae3e88f6c Merge branch 'master' into fbxBlendshapes 2021-05-03 07:40:25 -07:00
Kim Kulling
f29828f657 Merge branch 'master' into fix-file-detection 2021-05-02 19:41:33 +02:00
Kim Kulling
e278673fe7 Merge branch 'master' into 3ds-namespace 2021-05-02 15:08:11 +02:00
Krishty
e73a2ed5e0 style fix: namespace instead of class with public static members 2021-05-01 23:20:37 +02:00
Jason C
c2d3d22271 Fix crash in CanRead when file can not be opened. 
Addresses #3849
 2021-05-01 10:58:29 -04:00
Kim Kulling
78132d666f Merge branch 'master' into fix-3ds-matrix 2021-05-01 11:34:33 +02:00
Kim Kulling
2feda5b4b2 Merge branch 'master' into md2-mdc-const 2021-04-30 20:10:45 +02:00
Kim Kulling
57091d761e Merge branch 'master' into md2-mdc-const 2021-04-30 00:56:50 +02:00
Kim Kulling
0b92abe9b4 Merge branch 'master' into empty-string-style 2021-04-30 00:54:57 +02:00
vfxgordon
5298ed8f9e Merge branch 'master' into fbxBlendshapes 2021-04-29 15:21:16 -07:00
Kim Kulling
73e05ab6d3 Merge branch 'master' into add-step-extension 2021-04-30 00:13:32 +02:00
Krishty
666b5eff76 added .step extension to IFC loader 
The extension .step is at least as common as .stp, so both should be supported.
 2021-04-29 21:29:10 +02:00
Kim Kulling
9a0b703db1 Merge branch 'master' into ms-maxvollmer/importer_fixes 2021-04-28 20:25:10 +02:00
Krishty
260cc6bd26 reverted regression in 3DS transformation (issue #3802) 
The regression was introduced to align 3DS export and import, but in fact it broke the transformation matrices on import. This commit reverts the relevant lines. Furthermore, matrix layout was double-checked with two other 3DS importers. Export was not considered.
 2021-04-28 01:02:24 +02:00
Jason C
3acd42c22e Remove newline from name of Blender importer. 
Addresses #3797.

Re-submitting this as a quick fix to the immediate issue while I think about the website field.
 2021-04-26 20:27:28 -04:00
Gordon Chapman
64da2a4315 Merge remote-tracking branch 'upstream/master' into fbxBlendshapes 2021-04-26 13:51:22 -07:00
Gordon Chapman
a5d0e99548 Fixed error in blendShapeChannel Weighting 2021-04-26 12:19:20 -07:00
Max Vollmer (Microsoft Havok)
e1d6e1f377 Merge branch 'master' into ms-maxvollmer/importer_fixes 2021-04-26 14:53:32 +01:00
Krishty
e6a47d93c2 removed dead code from 0d29203e24 2021-04-24 13:29:15 +02:00
Krishty
9dc66b0003 removed dead code 
BaseImporter::GetExtensionList() is not a virtual function; overriding it is useless. This probably stemmed from a misunderstanding.
 2021-04-23 15:15:21 +02:00
Krishty
196deea7ce added missing file extensions to aiImporterDesc::mFileExtensions 2021-04-23 15:05:09 +02:00
Kim Kulling
8881e65d62 Merge branch 'master' into strip-useless-gltf-write 2021-04-22 09:55:00 +02:00
Max Vollmer (Microsoft Havok)
746d5cf964 * Throw instead of assert on invalid file input 
* Check JSON object type before accessing members
* Ensure samplers input and output references are set before accessing them
 2021-04-21 16:17:03 +01: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
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
21b56b0058 Merge branch 'master' into tr1 2021-04-14 12:46:59 +02:00
Kim Kulling
0b61a8875a Merge branch 'master' into patch-1 2021-04-14 10:22:42 +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
263d450300 Merge branch 'master' into master 2021-04-12 09:35:03 +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
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