zhucan
32716002ac
Add DIFFUSE_ROUGHNESS_TEXTURE for gltf2 exporter
2023-08-18 01:03:49 +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
Aaron
0bfc588c39
Update Triangulate Process [more another case]
2023-08-15 18:01:16 +08: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
Martin Weber
d8a7399a04
Merge branch 'assimp:master' into collada-ignore-unit-size-property
2023-08-10 08:10:18 +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
Martin Weber
bb1873dd22
Collada: added import property to disable unit size scaling
2023-08-04 09:54:55 +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
Kim Kulling
7005a9caa2
Merge branch 'master' into 6520123362508800
2023-06-25 21:07:34 +02:00
Kim Kulling
6b1a2e91d5
Merge branch 'master' into 6091762766839808
2023-06-25 20:08:45 +02:00
Kim Kulling
438f9fe568
Merge branch 'master' into 6020769077657600
2023-06-25 18:11:54 +02:00
Kim Kulling
3545aab937
Merge branch 'master' into 5781186265350144
2023-06-25 17:51:01 +02:00
Kim Kulling
bd65af0d44
Merge branch 'master' into SupportOBJSpecifiedOnlyAPartOfVertexColors
2023-06-20 09:38:53 +02:00
Kim Kulling
6502b97d3e
Fix: Put unused var into comments to later use.
2023-06-19 23:38:57 +02:00
Kim Kulling
7f0c388ad8
Fix: Put unused var into comments to later use.
2023-06-19 23:27:32 +02:00
Kim Kulling
10059e6431
Add handling for negative indices.
2023-06-19 23:21:35 +02:00
emaame
22c8d97b54
Support OBJ specified only a part of vertex colors
...
The omitted vertex colors are treated as (0, 0, 0, 1).
e.g
v 0.0 0.0 0.0
v 0.0 0.0 1.0 0.0 0.0 0.0
v 0.0 1.0 0.0
v 1.0 0.0 0.0 1.0 0.6 0.3
v 1.0 1.0 0.0
2023-06-17 16:31:04 +09:00
Scott Johnston
aab3c8010c
Correct from full FOV to assimp half-fov in camera. Compute from filmWidth and focalLength if FOV not specified.
2023-06-15 12:16:06 -07:00
Alex
36dfa3bed3
Fix UNKNOWN WRITE in Assimp::SortByPTypeProcess::Execute
2023-06-14 15:50:50 +00:00
Alex
b158b716d1
Fix Memcpy-param-overlap in unzReadCurrentFile: bump zlib to 1.2.13
2023-06-14 07:41:41 +02:00
Alex
9ef71fe231
Merge branch 'master' into 5781186265350144
2023-06-14 07:40:47 +02:00
Alex
5bb1c6debd
Fix UNKNOWN READ crash in UpdateMeshReferences
2023-06-14 07:40:36 +02:00
Alex
b3a1c72c8f
Fix Heap-buffer-overflow READ in Assimp::FileSystemFilter::Cleanup
2023-06-14 07:40:28 +02:00
Alex
646d3591b6
Fix memory leak
2023-06-14 07:40:21 +02:00
Alex
496a4bf156
Fix unknown write in Assimp::ObjFileMtlImporter::getFloatValue
2023-06-14 07:40:21 +02:00
Alex
8012657169
Fix Heap-buffer-overflow READ in Assimp::MD5::MD5Parser::ParseSection
2023-06-14 07:38:57 +02:00
Alex
dbd15fd351
Fix UNKNOWN WRITE in std::__1::list<Assimp::LWO::Envelope, std::__1::allocator<Assimp::LWO::Envelope>
2023-06-14 07:38:47 +02:00
Alex
86aecf395e
Fix Bad-cast to Assimp::D3DS::Material from invalid vptr in Assimp::ASE::Parser::ParseLV2MaterialBlock
2023-06-14 07:38:38 +02:00
Alex
c6c95b69f6
Use SizeCheck
2023-06-14 07:38:02 +02:00
Alex
54b0c00418
Fix UNKNOWN READ in Assimp::MDLImporter::ParseSkinLump_3DGS_MDL7
2023-06-14 07:38:02 +02:00
Alex
f897b0c461
Merge branch 'master' into 6520123362508800
2023-06-13 22:06:08 +02:00
Kim Kulling
3ccf242bdb
Merge branch 'master' into memleak
2023-06-13 19:46:56 +02:00
Kim Kulling
bef66deeda
Update glTF2Importer.h
2023-06-08 20:56:14 +02:00
Kim Kulling
1ab4161cd7
Update glTF2Importer.cpp
2023-06-08 20:55:48 +02:00
Kim Kulling
186d7fd606
Merge branch 'master' into FixSkinnedWeightsAfterVertexRemappingOptimization
2023-06-08 13:16:08 +02:00
Kim Kulling
11dede8fc4
Merge branch 'master' into 4890437695700992
2023-06-08 13:02:15 +02:00
Alex
4c16a6a16b
Fix memory leak
2023-06-07 07:02:50 +00:00
Kristjan Skutta
cb86029153
Fixed missing config property lookup for removal of empty bones.
2023-06-06 14:30:35 +02:00
Alex
f5683b6f3a
Update MDLMaterialLoader.cpp
...
Add parentheses
2023-06-05 14:27:21 +02:00
Alex
23f9990b22
Fix UNKNOWN READ in aiTexture::~aiTexture
2023-06-04 07:50:00 +00:00
Alex
5cc4a61d66
Fix Heap-buffer-overflow READ in Assimp::MD5::MD5MeshParser::MD5MeshParser
2023-06-03 16:30:50 +02:00
Alex
6c5fe9d76f
Add missing include
2023-06-03 16:28:55 +02:00
Alex
57a55aa4d4
Fix memory leaks
2023-06-03 16:28:55 +02:00
Alex
f4d3b6e862
Fix Stack-buffer-overflow READ in aiMaterial::AddBinaryProperty
2023-06-03 16:28:55 +02:00
Alex
d3506c24e7
Update ObjFileParser.cpp
2023-06-02 18:57:53 +02:00
Kim Kulling
e30823fb1d
Merge branch 'master' into 5781186265350144
2023-06-01 16:40:46 +02:00
Alex
4cc70cb73c
Optimize
2023-05-31 14:10:57 +00:00
Alex
54f5d01190
Fix Heap-buffer-overflow WRITE in Assimp::ObjFileImporter::createVertexArray
2023-05-31 11:37:15 +00:00
Alex
c3e69b5b82
Fix Heap-buffer-overflow READ in Assimp::ObjFileParser::getFace
2023-05-31 08:01:41 +00:00
Kim Kulling
466f6960ac
Merge branch 'gltf2_metadata_export' of https://github.com/C-Tech-Development-Corp/assimp into C-Tech-Development-Corp-gltf2_metadata_export
2023-05-30 08:14:49 +02:00
Kim Kulling
17c1a9125f
Merge branch 'master' into FixSkinnedWeightsAfterVertexRemappingOptimization
2023-05-24 23:36:59 +02:00
Kim Kulling
f43cfa1fba
Merge branch 'master' into msvc-clang-unused-function
2023-05-24 23:23:40 +02:00
Kim Kulling
ca848c5b09
Merge branch 'master' into fix-pbrt-exporter
2023-05-24 22:28:32 +02:00
Kim Kulling
d73595b85d
Merge branch 'master' into master
2023-05-24 21:35:26 +02:00
Samuel Kogler
0fbd2f5894
Merge branch 'master' into fix-pbrt-exporter
2023-05-24 15:24:46 +02:00
Kim Kulling
b7a8c4ba75
Update glTF2Asset.inl
2023-05-23 10:33:14 +02:00
Kim Kulling
e947471549
Merge branch 'master' into refactor/KHR_material_specular
2023-05-22 09:49:01 +02:00
Kim Kulling
03163a1dda
Merge branch 'master' into master
2023-05-21 18:26:56 +02:00
Kim Kulling
7e16d4046e
Merge branch 'master' into FixSkinnedWeightsAfterVertexRemappingOptimization
2023-05-21 18:14:29 +02:00
Kim Kulling
9c45f727e3
Update ASELoader.cpp
2023-05-20 14:27:57 +02:00
Kim Kulling
94905d445f
Revert usage of unique_ptr - error.
2023-05-15 16:06:02 +02:00
Kim Kulling
71a4977dd1
Fix: Try unique_ptr
2023-05-15 15:46:21 +02:00
Kim Kulling
8ad4bb0b2c
Update StackAllocator.inl
2023-05-15 15:09:54 +02:00
Kim Kulling
b5b6400320
Fix: Use vector.
2023-05-15 15:08:52 +02:00
Kim Kulling
aed43878ef
Merge branch 'master' into FlorianBorn71-SmallAllocationFixInFBXLoader
2023-05-15 14:28:46 +02:00
Kim Kulling
ad399adf4b
Add missing include
2023-05-15 13:19:02 +02:00
Kim Kulling
121f09b62a
Fix: Fix the build.
2023-05-15 11:02:58 +02:00
Kim Kulling
e627f691a8
Merge branch 'SmallAllocationFixInFBXLoader' of https://github.com/FlorianBorn71/assimp into FlorianBorn71-SmallAllocationFixInFBXLoader
2023-05-15 09:30:57 +02:00
Lutz Hören
9ea37b5330
copy aiMetadata objects in scene combiner
2023-05-11 08:00:25 +02:00
Kim Kulling
ade4514752
Merge branch 'master' into fix-pbrt-exporter
2023-05-10 21:55:00 +02:00
Florian Born
d825eb7cf0
Skinning weights i gltf were broken by PR#5003 (vertex remapping)
2023-05-08 20:04:38 +02:00
Mathieu Westphal
69145c8929
Fix librt link
2023-05-05 08:47:14 +02:00
Kim Kulling
8cbfb44e9c
Remove dead code
2023-05-04 21:10:51 +02:00
Kim Kulling
1243325f10
Merge branch 'master' into kimkulling/refactoring_geoutils
2023-05-04 21:10:00 +02:00
Kim Kulling
75d024c91b
Reafctoring: Add GeoUtils usage
2023-05-04 20:57:20 +02:00
Kim Kulling
167d811ff7
Doc: Add missing doc to GeometryUtils.
2023-05-04 00:04:56 +02:00
Kim Kulling
d58201a579
Refactoring: Reuse code from GeometryUtils
2023-05-04 00:00:52 +02:00
Jackie9527
fbf8799cb5
Fix warning related to unused-function.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-05-03 23:02:38 +08:00
Samuel Kogler
55cb19f924
Fix PBRT exporter coordinate system
...
Was just mirroring the x axis. This uses aiProcess_ConvertToLeftHanded and
rotates the root node to match PBRT.
The problem is apparent when using an environment map texture.
2023-05-03 16:52:33 +02:00
Samuel Kogler
f32c21e6b3
Fix PBRT exporter FoV aspect ratio calculation
2023-05-03 16:46:54 +02:00
Jackie9527
92d426de2b
Remove unused -Wno-missing-noreturn.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-29 01:05:25 +08:00
Jackie9527
51494e1b4f
Remove unused -Wno-deprecated-copy-with-user-provided-dtor.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-29 00:55:13 +08:00
Jackie9527
cdefc9f7aa
Remove unused -Wno-deprecated-copy-with-dtor.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-29 00:43:40 +08:00
Jackie9527
cabf3a5d17
Fix warning related to unreachable-code-return.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-29 00:30:21 +08:00
Jackie9527
a8e7c23605
Fix warning related to unreachable-code.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-29 00:29:33 +08:00
Suhajda Tamás
71043ec164
Add missing cast
2023-04-28 11:44:29 +02:00
Kim Kulling
230bee2e34
Merge branch 'master' into msvc-clang-missing-variable-declarations
2023-04-26 11:15:32 +02:00
Kim Kulling
07aae9eaee
Merge branch 'master' into msvc-clang-deprecated-copy-with-dtor
2023-04-26 10:42:51 +02:00
Kim Kulling
71366fff8e
Merge branch 'master' into msvc-clang-inconsistent-missing-destructor-override
2023-04-26 09:31:55 +02:00
Kim Kulling
965ebaf78b
Merge branch 'master' into deprecated-copy-with-user-provided-dtor
2023-04-26 08:22:51 +02:00
Kim Kulling
1ecb8e9196
Merge branch 'master' into msvc-clang-missing-noreturn
2023-04-25 23:56:39 +02:00
Jackie9527
ff17f1fe3d
Remove -Wno-missing-variable-declarations.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 23:29:03 +08:00
Jackie9527
46677b835c
Fix warning related to missing-variable-declarations, add static to global variable.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 23:28:36 +08:00
Jackie9527
5738b3d172
Fix warning related to missing-variable-declarations, add static to global variable.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 23:27:23 +08:00
Jackie9527
739cf15a1e
Fix warning related to missing-variable-declarations, remove unused global variables.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 23:26:03 +08:00
Jackie9527
c0947b704e
Fix warning related to missing-variable-declarations, remove unused global variables.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 23:24:40 +08:00
Jackie9527
1b826afeda
Remove -Wno-unreachable-code-break.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 22:26:44 +08:00
Jackie9527
4d962057e5
Fix warning related to unreachable-code-break.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 22:18:35 +08:00
Jackie9527
12bc34a45c
Fix warning related to unreachable-code-break.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 22:18:35 +08:00
Jackie9527
0a05a1f17f
Fix warning related to unreachable-code-break.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 22:18:34 +08:00
Jackie9527
cec41f6dd5
Fix warning related to unreachable-code-break.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 22:18:34 +08:00
Jackie9527
7620a69e3e
Fix warning related to unreachable-code-break.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 22:18:34 +08:00
Jackie9527
9e80dfc42d
Fix warning related to unreachable-code-break.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 22:18:34 +08:00
Jackie9527
01488046e6
Fix warning related to unreachable-code-break.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 22:18:34 +08:00
Kim Kulling
9e056218cf
Merge branch 'master' into msvc-clang-unreachable-code-return
2023-04-17 22:04:07 +02:00
Kim Kulling
ca937788ee
Fix: Fix leak in Scope class, FBX
...
- closes https://github.com/assimp/assimp/issues/3421
2023-04-17 20:08:58 +02:00
Kim Kulling
aee4df9be8
Fix possible dereferencing of invalid pointer.
...
- closes https://github.com/assimp/assimp/issues/4918
2023-04-17 15:40:29 +02:00