e278673fe7
Merge branch 'master' into 3ds-namespace
2021-05-02 15:08:11 +02:00
e73a2ed5e0
style fix: namespace instead of class with public static members
2021-05-01 23:20:37 +02:00
78132d666f
Merge branch 'master' into fix-3ds-matrix
2021-05-01 11:34:33 +02:00
7843b24e03
Merge branch 'master' into SceneCombiner_Memory_Leaks
2021-05-01 09:16:06 +02:00
2feda5b4b2
Merge branch 'master' into md2-mdc-const
2021-04-30 20:10:45 +02:00
57091d761e
Merge branch 'master' into md2-mdc-const
2021-04-30 00:56:50 +02:00
0b92abe9b4
Merge branch 'master' into empty-string-style
2021-04-30 00:54:57 +02:00
f523b1e0d7
Merge branch 'master' into SceneCombiner_Memory_Leaks
2021-04-29 08:52:51 -05:00
41e5acf060
Merge branch 'master' into ms-maxvollmer/importer_fixes
2021-04-28 20:26:38 +02:00
9a0b703db1
Merge branch 'master' into ms-maxvollmer/importer_fixes
2021-04-28 20:25:10 +02:00
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
8e3fe6b30b
Merge branch 'master' into SceneCombiner_Memory_Leaks
2021-04-28 09:16:02 -05:00
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
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
e1d6e1f377
Merge branch 'master' into ms-maxvollmer/importer_fixes
2021-04-26 14:53:32 +01:00
4b47b7a552
Merge branch 'master' into SceneCombiner_Memory_Leaks
2021-04-23 07:42:32 -05:00
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
8881e65d62
Merge branch 'master' into strip-useless-gltf-write
2021-04-22 09:55:00 +02:00
44dc08f128
Remove GLTF tag, postprocessing is format independent
2021-04-21 16:20:58 +01:00
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
873c6ffabe
Merge branch 'master' into fix-import-export-confusion
2021-04-19 21:08:52 +02:00
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
3fead344ad
updated version string (if anyone cares)
2021-04-19 07:37:12 +02:00
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
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
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
21b56b0058
Merge branch 'master' into tr1
2021-04-14 12:46:59 +02:00
0b61a8875a
Merge branch 'master' into patch-1
2021-04-14 10:22:42 +02:00
4aa52b3af8
Flip the check on _MSC_VER for using TR1 containers.
2021-04-13 11:15:52 -07:00
263d450300
Merge branch 'master' into master
2021-04-12 09:35:03 +02:00
a3ee377af7
Merge branch 'master' into ms3d-fixes
2021-04-11 19:12:06 +02:00
cf4ef04a80
Merge branch 'master' into master
2021-04-07 20:58:40 +02:00
e66232d8c3
Merge branch 'master' into feature/gltf_fb_ngon_encoding
2021-04-07 13:54:31 +02:00
a44ba41413
Fix incorrect indices in the MilkShape 3D loader
2021-04-05 19:14:48 -07:00
7fee914776
Fix direct leak
...
closes https://github.com/assimp/assimp/issues/3747
2021-04-05 21:24:54 +02:00
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
22413d85ad
Merge branch 'master' into MalcolmTyrrell/tangentCheck
2021-04-03 17:42:44 +02:00
80fc8538be
Update AMFImporter_Material.cpp
2021-04-03 10:29:16 +02:00
d62c89557b
Remove dead code
2021-04-03 10:28:19 +02:00
46e49d0b83
Update AMFImporter_Geometry.cpp
2021-04-03 10:27:54 +02:00
cdb6a62cdb
Merge branch 'master' into issue_3678
2021-04-03 10:27:07 +02:00
da0543972b
Fix parsing for AMF-Files.
2021-04-03 10:25:03 +02:00
89a8f87dae
AMF: Remove unused macros
2021-04-02 13:10:24 +02:00
fc2c12ad6a
Fixing encoding when lines and points are encountered
2021-03-30 09:58:28 +02:00
fc0cf2ea8d
NGON encoding triangles only
2021-03-30 09:19:50 +02:00
2e90fed527
Refactoring and fixing remaining issues in triangulation process
2021-03-30 09:10:50 +02:00
596001c89c
Refactoring the extension
2021-03-30 09:10:50 +02:00
81019d5e58
Fixing quad encoding
2021-03-30 09:10:50 +02:00
6d1a0c6054
Adding quad proper handling
2021-03-30 09:10:50 +02:00
8e589221d7
[gltf2-exporter] Adding FB_ngon_encoding support
2021-03-30 09:10:50 +02:00
Kim Kulling
Krishty
Scott Baldric
Jason C
Max Vollmer (Microsoft Havok)
Scott Baldric
Hill Ma
Clement JACOB
Patrick Walton
Garux
Kim Kulling