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

9975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim Kulling
88d64388f8 Update AMFImporter.cpp 2021-05-03 20:57:17 +02:00
Kim Kulling
b87f67db4c Add missing include 2021-05-03 20:49:14 +02:00
Kim Kulling
60b99501a9 Merge branch 'master' into new-file-detection 2021-05-03 20:44:27 +02:00
Kim Kulling
71c48581f3 Merge pull request #3852 from krishty/3ds-namespace 
style fix: namespace instead of class with public static members
 2021-05-02 19:41:04 +02:00
Kim Kulling
9e27afe353 Merge branch 'master' into 3ds-namespace 2021-05-02 17:38:29 +02:00
Kim Kulling
afdec791a6 Merge pull request #3795 from assimp/kimkulling-patch-3 
Fix formatter.
 2021-05-02 17:38:16 +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
Kim Kulling
6c429a9d82 Merge branch 'master' into kimkulling-patch-3 2021-05-01 19:29:37 +02:00
Kim Kulling
b516d940b6 Merge pull request #3826 from krishty/fix-3ds-matrix 
reverted regression in 3DS transformation (issue #3802)
 2021-05-01 12:02:24 +02:00
Kim Kulling
78132d666f Merge branch 'master' into fix-3ds-matrix 2021-05-01 11:34:33 +02:00
Kim Kulling
f538b96e82 Merge pull request #3788 from BaldricS/SceneCombiner_Memory_Leaks 
Fix: Removing double delete of texture items after MergeScene.
 2021-05-01 11:07:34 +02:00
Kim Kulling
7843b24e03 Merge branch 'master' into SceneCombiner_Memory_Leaks 2021-05-01 09:16:06 +02:00
Kim Kulling
d28e2e0a39 Merge pull request #3775 from diiigle/patch-1 
Add PBRT to exportable file formats list
 2021-05-01 09:15:34 +02:00
Kim Kulling
2d51efa002 Merge branch 'master' into patch-1 2021-04-30 21:14:26 +02:00
Kim Kulling
911321b97b Merge pull request #3765 from krishty/md2-mdc-const 
moved MD2/MDC tables from BSS to const data
 2021-04-30 21:12:36 +02:00
Kim Kulling
2feda5b4b2 Merge branch 'master' into md2-mdc-const 2021-04-30 20:10:45 +02:00
Kim Kulling
9b36f62cb2 Merge pull request #3764 from krishty/empty-string-style 
style fix - initializing and assigning empty std::string properly
 2021-04-30 20:10:18 +02:00
Kim Kulling
60f030ccbc Merge branch 'master' into empty-string-style 2021-04-30 19:50:38 +02:00
Kim Kulling
9ef84a67f7 Merge pull request #3846 from assimp/issue_3831_update_zip 
closes https://github.com/assimp/assimp/issues/3831 : update zip
 2021-04-30 18:00:55 +02:00
Kim Kulling
feeb89a1dd closes https://github.com/assimp/assimp/issues/3831 : update zip 2021-04-30 16:49:15 +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
Scott Baldric
f523b1e0d7 Merge branch 'master' into SceneCombiner_Memory_Leaks 2021-04-29 08:52:51 -05:00
Kim Kulling
96d0524fab Merge pull request #3787 from ms-maxvollmer/ms-maxvollmer/importer_fixes 
Importer improvements
 2021-04-28 20:42:06 +02:00
Kim Kulling
41e5acf060 Merge branch 'master' into ms-maxvollmer/importer_fixes 2021-04-28 20:26:38 +02:00
Kim Kulling
7dd870f88c Merge pull request #3833 from assimp/kimkulling-fix_debug_crash 
Fix crash when reading 0 bytes
 2021-04-28 20:26:30 +02:00
Kim Kulling
9a0b703db1 Merge branch 'master' into ms-maxvollmer/importer_fixes 2021-04-28 20:25:10 +02:00
Kim Kulling
6abdd0cd3e Fix crash when reading 0 bytes 
- This is a valid option so crash shall not happen
 2021-04-28 16:38:22 +02:00
Scott Baldric
8e3fe6b30b Merge branch 'master' into SceneCombiner_Memory_Leaks 2021-04-28 09:16:02 -05: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
Kim Kulling
74577ae3c7 Merge pull request #3822 from JC3/patch-2 
Remove newline from name of Blender importer.
 2021-04-27 22:08:06 +02:00
Kim Kulling
30f55dcbbf Merge branch 'master' into patch-2 2021-04-27 20:30:06 +02:00
Kim Kulling
9504957534 Merge pull request #3821 from JC3/patch-1 
Update aiProcess_PreTransformVertices docs to match behavior.
 2021-04-27 20:29:21 +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
Jason C
708d124745 Update aiProcess_PreTransformVertices docs to match behavior. 
Addresses #3820, the easy way.
 2021-04-26 19:42:22 -04:00
Max Vollmer (Microsoft Havok)
e1d6e1f377 Merge branch 'master' into ms-maxvollmer/importer_fixes 2021-04-26 14:53:32 +01:00
Krishty
628cba9490 fixed warning 2021-04-24 00:44:50 +02:00
Krishty
b00de10eb3 Simplified importer search and fixed a few bugs 
The search for a matching importer had a few issues, see #3791. There were two different mechanisms to determine whether an importer accepts a specific file extension:
1. `aiImporterDesc::mFileExtensions`, which was forwarded to the UI via `BaseImporter::GetExtensionList()`.
2. `BaseImporter::CanRead()` when called with `checkSig == false`, which determines whether to actually use that importer.
Both were redundant and got out of sync repeatedly. I removed 2. completely and replaced it with 1., thereby syncing UI/import and shortening all `BaseImporter::CanRead()` implementations.

Further bugfixes:
- fixed glTF2 importer throwing exceptions when checking whether it can load a file
- removed `BaseImporter::SimpleExtensionCheck()` because it is no longer used and had a bug with case sensitivity

Since the `checkSig` parameter in `BaseImporter::CanRead()` is now useless, it can be removed completely. I’m not sure if this would break ABI compatiblity, so I’ll submit it with a later pull request.
 2021-04-24 00:17:50 +02:00
Kim Kulling
cd3e283bcb Merge branch 'master' into kimkulling-patch-3 2021-04-23 18:03:40 +02:00
Scott Baldric
44834408c8 Merge branch 'master' into SceneCombiner_Memory_Leaks 2021-04-23 09:00:12 -05:00
Kim Kulling
21d7085be6 Merge pull request #3794 from assimp/kimkulling-patch-1 
Update Readme.md
 2021-04-23 15:30:30 +02:00
Kim Kulling
0b14eb7523 Fix formatter. 2021-04-23 15:30:12 +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
Kim Kulling
4db4e7206d Update Readme.md 2021-04-23 15:14:38 +02:00
Scott Baldric
359fcadd87 Merge branch 'master' into SceneCombiner_Memory_Leaks 2021-04-23 08:14:26 -05:00
Kim Kulling
574ea5acf9 Merge pull request #3793 from assimp/kimkulling-codacy_batch 
Add Codacy Badge
 2021-04-23 15:13:55 +02:00
Krishty
196deea7ce added missing file extensions to aiImporterDesc::mFileExtensions 2021-04-23 15:05:09 +02:00
Kim Kulling
31438a03a6 Add Codacy Badge 
- Add assimp to codacy
- Add batch to readme
 2021-04-23 14:52:31 +02:00
Scott Baldric
4b47b7a552 Merge branch 'master' into SceneCombiner_Memory_Leaks 2021-04-23 07:42:32 -05:00