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

9959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Kim Kulling
c8ad1cb078 Merge pull request #3763 from krishty/strip-useless-gltf-write 
fixed glTF export stuff being pulled into the EXE even if building wi…
 2021-04-22 21:34:24 +02:00
Scott Baldric
aae3788247 Fix: Removing double delete of texture items. 
Textures were being double deleted after a merge scene because the
texture array wasn't being properly deleted at the end of merging.
Furthermore, the texture array was being sized to the number of
materials instead of the number of textures.
 2021-04-22 08:49:47 -05:00
Kim Kulling
8881e65d62 Merge branch 'master' into strip-useless-gltf-write 2021-04-22 09:55:00 +02:00
Max Vollmer (Microsoft Havok)
44dc08f128 Remove GLTF tag, postprocessing is format independent 2021-04-21 16:20:58 +01: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
Kim Kulling
6027c10969 Merge pull request #3776 from krishty/fix-import-export-confusion 
fixed export exceptions on import
 2021-04-20 20:39:00 +02:00
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