Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,235 Commits 19 Branches 43 Tags
fe6730f225171fc90d2c7744e7724eb8b281ec0a
Commit Graph

6539 Commits

Author SHA1 Message Date
Kim Kulling
60b6d80936 Merge branch 'master' into xin-issue_5211 2023-08-24 21:03:57 +02:00
AnyOldName3
e50233b2c1 Use correct PDB paths 
The previously-specified paths were only correct for a static library
build.
I therefore fenced off that code to be specific to static library
builds.

For shared library builds, I added a generator-expression-based
alternative.
Annoyingly, this won't work with static library builds, so we don't get
the concise, reliable version in all circumstances.

I've avoided modifying any of the paths anything ends up at to avoid
breaking changes.

Resolves https://github.com/assimp/assimp/issues/4269
 2023-08-23 17:19:01 +01:00
tangxin
4389c3d80c The texture strength attribute in aiMaterial set when importing and exporting gltf files is inconsistent 2023-08-23 14:54:40 +08:00
Alex
5c45cdc0ad Fix Invalid-free in Assimp::FBX::Scope::Scope 2023-08-16 07:45:23 +00:00
Kim Kulling
d77903423f Merge branch 'master' into floatwarn 2023-08-15 12:55:37 +02:00
Kim Kulling
e5d9339c21 Merge branch 'master' into 5513536726761472 2023-08-12 08:05:27 +02:00
Kim Kulling
1c5dc86afb Merge branch 'master' into fix_magic 2023-08-12 07:39:40 +02:00
Alex
b9460dd959 Fix UNKNOWN READ in std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<ch 2023-08-08 16:01:00 +00:00
Gargaj
49ed0711d1 Fix another warning 2023-08-05 15:43:31 +02:00
Gargaj
8312b31d27 fix warning-as-error 2023-08-05 15:39:47 +02:00
Alex
f7e7f82b9d Add const 2023-08-03 17:10:17 +00:00
Alex
d7dc88e0d0 Fix UNKNOWN READ in Assimp::MDLImporter::InternReadFile_Quake1 2023-08-01 13:04:16 +00:00
Kim Kulling
439b3369c1 Merge branch 'master' into fix_magic 2023-07-23 21:21:29 +02:00
sfjohnston
dd40b0ccee Changed #define FBX_FOV_UNKNOWN to const float kFovUnknown 2023-07-23 12:05:01 -07:00
sfjohnston
3ec8a36764 Merge branch 'assimp:master' into sfjohnston_mods 2023-07-23 08:37:47 -07:00
Marco Feuerstein
37a1366fb7 Add missing rapidjson headers. 2023-07-21 11:33:06 +02:00
Marco Feuerstein
52e5c3f39e Fix violation of strict aliasing rule. 2023-07-21 09:48:45 +02:00
Kim Kulling
64e0ba2625 Merge branch 'master' into sfjohnston_mods 2023-07-20 09:21:13 +00:00
Kim Kulling
16021ef9ac Merge branch 'master' into cloud_storage_version 2023-07-14 11:47:24 +02:00
Marco Feuerstein
0e7cd18c8b Strip aws gcs version string. 2023-07-14 09:37:48 +02:00
Marco Feuerstein
bf38d67935 Fix detection of KHR_materials_specular. 2023-07-13 11:51:56 +02:00
sfjohnston
c7afea3cd7 Merge branch 'assimp:master' into sfjohnston_mods 2023-07-10 07:58:21 -07:00
Kim Kulling
e2b19ef776 Merge branch 'master' into file_extension 2023-07-10 11:19:27 +02:00
Marco Feuerstein
87cac888e4 More simplifications. 2023-07-08 12:58:11 +02:00
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
90ff723b6c Merge branch 'master' into gltf_binary 2023-07-03 21:31:28 +02:00
Kim Kulling
ed903543a7 Merge branch 'master' into 4879958521806848 2023-07-03 19:50:38 +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
PencilAmazing
f1561f03ce Merge branch 'master' into irrfix 2023-07-02 15:10:04 -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
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
Marco Feuerstein
82d3f47432 Unify way to check readable blender files. 2023-06-29 15:10:28 +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
1ec3dbd11a Merge branch 'master' into 5093294573486080 2023-06-27 17:04:58 +02:00
Kim Kulling
f24224fdc5 Merge branch 'master' into SupportOBJSpecifiedOnlyAPartOfVertexColors 2023-06-27 13:44:31 +02:00
Kim Kulling
db6c1a8b1c Merge branch 'master' into 5921493454815232 2023-06-27 11:03:50 +02:00
Kim Kulling
ef6bf03acd Merge branch 'master' into 5143879191494656 2023-06-27 10:23:36 +02:00
Kim Kulling
141e278e1f Merge branch 'master' into 5407417422970880 2023-06-27 10:07:21 +02:00
Kim Kulling
ff36ea7e23 Merge branch 'master' into 6521292621217792 2023-06-26 09:17:40 +02:00
Kim Kulling
b1181b1086 Merge branch 'master' into 4508318827937792 2023-06-25 21:20:02 +02:00