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

11152 Commits (b7a70ac707cfabe73b18ec8219cb80fd3d201805)

Author SHA1 Message Date
Krishty 65a2b98b86 updated C4D importer to use the Cineware SDK 
Maxon’s Melange SDK has been renamed Cineware SDK as of 21.004, and with it all namespaces and types. This commit
- makes CMake use contrib/Cineware instead of contrib/Melange;
- renames Assimp’s namespace melange to namespace cineware;
- removes useless functions and formatter references from class C4DImporter;
- removes duplicate conversion of cineware::String to aiString in the importer;
- updates comments accordingly;
- updates copyright info.
 2021-05-01 18:46:23 +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 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
Garux eab1c9c3c0 add `AI_CONFIG_IMPORT_MD3_LOAD_SHADERS` bool option 
the purpose is use of this loader with idtech3 FS
this requires full original material name, which euqals to Q3 shader path
result of deduction is not usable inside Q3 FS at all
option in general is "do not tinker with the path"
 2021-05-01 08:14:44 +03:00
contriteobserver 813b64ef52 corrected M3D_EXP_NOFACE test 2021-04-30 21:51:02 -07:00
contriteobserver bf653b4bd6 Merge branch 'M3DasciiByDefault' of https://github.com/contriteobserver/assimp into M3DasciiByDefault 2021-04-30 21:28:54 -07:00
contriteobserver e51bb1e77e fixed signed/unsigned mismatch warning 2021-04-30 21:26:57 -07:00
contriteobserver 694f4c2e34 Merge branch 'master' into M3DasciiByDefault 2021-04-30 21:12:48 -07:00
contriteobserver 302e47efc1
Merge branch 'master' into M3DasciiByDefault 2021-04-30 21:11:23 -07:00
contriteobserver af0aca796e now compiling M3D ASCII support by default 
addresses issue  #3777
 2021-04-30 21:07:01 -07:00
Jason C 07257f4c66
Merge branch 'master' into patch-4 2021-04-30 22:23:23 -04:00
Garux 55abc49d6d improve md3::Q3 shader::cull keyword support 
only use nonstandard winding order with `cull back`; might be excess too, since engine doesn't support this
 2021-04-30 22:59:05 +03:00
Garux 0b7ebef497 fix path separator in md3 shader loading 2021-04-30 22:51:21 +03: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
Garux 149224091f support missing closing brace in material list after Ascii Scene Exporter v2.51 2021-04-30 10:37:06 +03: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
Garux edf12bd357 fix md2 orientation 2021-04-30 00:02:37 +03: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
Garux 3717e66fae consider aiProcess_FlipWindingOrder in aiProcess_GenNormals & aiProcess_GenSmoothNormals 2021-04-29 20:52:06 +03:00
Garux 4798ff3882 fix hl1 mdl orientation, tex coords, face windings order 2021-04-29 20:50:50 +03:00
Garux ebf5ef9a4b consider pScene->mRootNode->mTransformation set by some importers while using AI_CONFIG_PP_PTV_ROOT_TRANSFORMATION 2021-04-29 20:43:37 +03:00
Garux db142da571 orient mdc correctly 2021-04-29 20:41:10 +03: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
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