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

12435 Commits (a53bca85cbacaf3cadbaf6a398d213f1044aab13)

Author SHA1 Message Date
Marco Feuerstein bdde968677 Address reviewer comment. 2023-07-08 12:58:11 +02:00
Marco Feuerstein 506baa21e6 Unify extension check for importers. 
This enables proper checking for all kinds of extensions (including the
ones with multiple dots) for all importers and internal usage.
 2023-07-08 12:58:11 +02:00
Marco Feuerstein 0256047168 Extend token search flag from alpha to graph. 
This way we can fix Blender exported files being wrongly detected as
obj files.
 2023-07-08 12:57:45 +02:00
Kim Kulling 3423949490
Merge branch 'master' into master 2023-07-08 12:37:42 +02:00
Kim Kulling e08cb0b5b8
Merge pull request #5172 from feuerste/missing_header 
Add missing header.
 2023-07-08 12:36:52 +02:00
PencilAmazing 668db327f4 Fix misplaced quote 2023-07-07 13:27:45 -04:00
Marco Feuerstein 8b005eaa83 Add missing header. 2023-07-07 14:28:05 +02:00
Kim Kulling 6308de6e5b
Merge pull request #5154 from feuerste/gltf_binary 
Improve binary check for gltf and gltf2.
 2023-07-05 21:29:38 +02:00
Kim Kulling 90ff723b6c
Merge branch 'master' into gltf_binary 2023-07-03 21:31:28 +02:00
Kim Kulling 9a94b26cdc
Merge pull request #5168 from sashashura/4879958521806848 
Fix UNKNOWN READ in Assimp::SMDImporter::ParseNodeInfo
 2023-07-03 21:08:11 +02:00
Kim Kulling ed903543a7
Merge branch 'master' into 4879958521806848 2023-07-03 19:50:38 +02:00
Kim Kulling d3ee157342
Merge pull request #5166 from PencilAmazing/irrfix 
Fix IRR and IRRMESH importers
 2023-07-03 11:36:52 +02:00
Kim Kulling a5bb4b59e4
Merge branch 'master' into irrfix 2023-07-03 11:19:53 +02:00
Alex 093e35dd54 Fix eternal loop 2023-07-03 09:12:00 +00:00
Alex edb8375702 Fix integer overflow 2023-07-03 09:11:38 +00:00
Kim Kulling 0dcfe2f72c
Merge pull request #5167 from assimp/kimkulling/add_missing_licence_issue-5144 
Create licence.md
 2023-07-03 10:04:34 +02:00
Kim Kulling d1ad4e54d7
Create licence.md 
- closes https://github.com/assimp/assimp/issues/5144
 2023-07-03 08:26:50 +02:00
Kim Kulling 5770faac10
Merge pull request #5162 from feuerste/py_available_formats 
[pyassimp] Replace static list of file extensions with the actually supported ones.
 2023-07-02 21:26:07 +02:00
PencilAmazing f1561f03ce
Merge branch 'master' into irrfix 2023-07-02 15:10:04 -04:00
PencilAmazing 57306bcd63 Make unit test more useful in case importer breaks again 2023-07-02 14:55:25 -04:00
PencilAmazing 96eb87265e Apply clang-format to unit test 2023-07-02 14:35:22 -04:00
PencilAmazing 0bacc7134d Remove debugging code, clean up some notes 2023-07-02 14:32:17 -04:00
PencilAmazing 19da9cc84d Port mesh loading to pugixml. Untested. 2023-07-02 14:32:12 -04:00
dog 3e1fd74940 Fix up scene loading. pugixml is a breadth-first parser while irrxml is 
a depth first. This only parses scene structure, no mesh loading yet.
 2023-07-02 14:30:54 -04:00
Kim Kulling 7d542eb795
Merge branch 'master' into py_available_formats 2023-07-02 20:26:16 +02:00
PencilAmazing 537b445a59 Apply clang-format to files 2023-07-02 14:17:52 -04:00
Alex 6f3bfb5b60 Fix memory leak 2023-07-02 14:12:49 -04:00
Alex 3838a8aaf8 Fix unknown write in Assimp::ObjFileMtlImporter::getFloatValue 2023-07-02 14:12:49 -04:00
Kim Kulling e4cac7d00b
Merge pull request #5153 from feuerste/blender_can_read 
Unify way to check readable blender files.
 2023-07-01 13:14:55 +02:00
Kim Kulling 8a65dcc19e
Merge branch 'master' into blender_can_read 2023-07-01 12:54:45 +02:00
Kim Kulling 3e74453b69
Merge branch 'master' into gltf_binary 2023-06-30 11:16:08 +02:00
Kim Kulling 42386b829c
Merge pull request #5164 from feuerste/py_read_from_memory 
[pyassimp] Fix passing of file extension string.
 2023-06-30 00:55:27 +02:00
Kim Kulling b44dfd5ecf
Merge branch 'master' into py_read_from_memory 2023-06-29 21:08:25 +02:00
Kim Kulling b61fc49c30
Merge pull request #5163 from thegeeko/fix-gcc-13 
Fix: disabled dangling-reference warning in gcc13
 2023-06-29 21:07:27 +02:00
Marco Feuerstein 82d3f47432 Unify way to check readable blender files. 2023-06-29 15:10:28 +02:00
Marco Feuerstein b2cad5c58d Use file system encoding. 2023-06-29 14:56:11 +02:00
Marco Feuerstein d1edaa949b Fix passing of file extension string. 
Previously only the first letter of the string was passed to c, now it passes the whole extension.
 2023-06-29 14:51:16 +02:00
Abdelhadi ac2cf2f71b Fix: disabled dangling-reference warning in gcc13 2023-06-29 10:02:39 +03:00
Marco Feuerstein 59f2620164 Remove unneeded check for empty extension. 2023-06-29 08:21:09 +02:00
Marco Feuerstein 261c7769b8 Replace static list of supported file extensions with the actually supported ones. 2023-06-29 08:21:08 +02:00
Marco Feuerstein 2875de132f Fix compilation on windows. 2023-06-29 08:20:51 +02:00
Marco Feuerstein 17fac97b04 Fix magic token usage. 2023-06-29 08:20:51 +02:00
Marco Feuerstein 1c0f3c5f87 Fix string length calculation. 2023-06-29 08:20:50 +02:00
Marco Feuerstein a2bdfdd05a Improve binary check for gltf and gltf2. 
By checking the magic token we don't depend on the extension any more
and follow the official way to detect a gltf file as binary, see also
https://github.com/KhronosGroup/glTF/blob/main/extensions/1.0/Khronos/KHR_binary_glTF/README.md#header
and https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html#binary-header.
 2023-06-29 08:20:50 +02:00
Kim Kulling 03934128fc
Merge pull request #5149 from mosfet80/UpdatePugiXml 
show correct pugixml version
 2023-06-28 16:31:48 +02:00
Kim Kulling 7ae88225b3
Merge branch 'master' into UpdatePugiXml 2023-06-28 16:04:49 +02:00
Kim Kulling 5a568d485c
Merge pull request #5147 from mosfet80/UpdateZli 
switch to zlib 1.2.13
 2023-06-28 16:02:25 +02:00
Kim Kulling 507a3d2f8d
Merge branch 'master' into UpdateZli 2023-06-28 13:06:59 +02:00
Kim Kulling 876b1a0d6e
Merge pull request #5151 from severin-lemaignan/master 
[pyassimp] bumped pyassimp version to 5.2.5
 2023-06-28 11:40:49 +02:00
Kim Kulling c9111fe89a
Merge branch 'master' into master 2023-06-28 11:24:58 +02:00