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

9997 Commits (9a04f5d4b0ea3cafba84dfcdc3f8746cc3eaac0a)

Author SHA1 Message Date
Jason C 9a04f5d4b0 Fix garbage messages in SIB, MD2, and MDC loaders. 2021-05-04 21:53:16 -04:00
Jason C a9fb1e56ae Add ai_str_toprintable; fixed garbage messages in HMP, MDL, Q3D loaders. 
- ai_str_toprintable: See docs in StringUtils.h.
- HMP, MDL, Q3D: In particular, newlines in binary data were complicating logging.
 2021-05-04 20:33:16 -04:00
Jason C c8ad8c6017 [mmd] Remove stderr spam. 
Removed stderr spam and cleaned up exception text.

Addresses #3865.
 2021-05-04 20:33:16 -04:00
Kim Kulling 38df0f4376
Merge pull request #3834 from JC3/patch-4 
ASSIMP_ENABLE_DEV_IMPORTERS env var, applied to X3D importer
 2021-05-04 22:33:48 +02:00
Kim Kulling dc6fa58814
Merge branch 'master' into patch-4 2021-05-04 21:08:56 +02:00
Kim Kulling be85eac703
Merge pull request #3877 from olsoneric/olsoneric-issue_2339_py_cant_load_obj 
Use POINTER(char) for binary data. For pyassimp issue #2339: Can't load OBJ
 2021-05-04 21:08:35 +02:00
Kim Kulling 875acc5166
Merge branch 'master' into patch-4 2021-05-04 20:59:06 +02:00
Eric Olson f17d58cadd Use POINTER(c_char) for binary data with pyassimp 
"For a general character pointer that may also point to binary data,
POINTER(c_char) must be used." c_char_p is for a zero-terminated string.

Reference: https://docs.python.org/3/library/ctypes.html#ctypes.c_char_p

Applying this change to the 4.1.4 released python module fixes #2339 for
me in Ubuntu.
 2021-05-04 13:38:38 -05:00
Kim Kulling cd0fd30821
Merge pull request #3819 from vfxgordon/fbxBlendshapes 
Fixed weighting issue with blendShapeChannels
 2021-05-04 17:44:32 +02:00
vfxgordon 4231a86ad8
Merge branch 'master' into fbxBlendshapes 2021-05-04 06:22:22 -07:00
Kim Kulling ff18354997
Merge pull request #3869 from assimp/optimize_3mf_strings 
use const chars
 2021-05-04 12:46:38 +02:00
kimkulling 0e17939e8d Use const char* const 2021-05-04 12:09:38 +02:00
Kim Kulling 33a85e280f
Merge branch 'master' into optimize_3mf_strings 2021-05-04 11:47:11 +02:00
kkulling 55fd820ed7 use const chars 2021-05-04 10:57:30 +02:00
Kim Kulling 70ba2e9e74
Merge pull request #3805 from krishty/fix-scale-msg 
fixed malformatted message
 2021-05-04 09:18:12 +02:00
Kim Kulling 39522178aa
Merge branch 'master' into fix-scale-msg 2021-05-04 08:13:12 +02:00
Kim Kulling 79802ad836
Merge pull request #3796 from krishty/fix-file-detection 
small cleanup in file format detection
 2021-05-04 07:54:09 +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 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
Jason C 07257f4c66
Merge branch 'master' into patch-4 2021-04-30 22:23:23 -04: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
vfxgordon 5298ed8f9e
Merge branch 'master' into fbxBlendshapes 2021-04-29 15:21:16 -07:00
Scott Baldric f523b1e0d7
Merge branch 'master' into SceneCombiner_Memory_Leaks 2021-04-29 08:52:51 -05:00
Jason C 975de81ab6
Merge branch 'master' into patch-4 2021-04-28 22:23:17 -04: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
Jason C cf498c979a
ASSIMP_ENABLE_DEV_IMPORTERS env var to control registration of wip importers; applied to X3D 
- GetImporterInstanceList reads ASSIMP_ENABLE_DEV_IMPORTERS env var. Development importers are enabled if the env var is set and is not equal to the literal string "0".
- X3D importer will not be registered unless ASSIMP_ENABLE_DEV_IMPORTERS is set; addresses #3647.

TODO: If this change is incorporated, it should be documented.
NOTE: Effective git branch structure is a better solution. This is an alternate for #3825.
 2021-04-28 11:16:49 -04: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