e41fe74b2a
Merge branch 'master' into semi-desert-master
2023-08-30 21:17:25 +02:00
8c8f974ea3
Merge branch 'master' of https://github.com/semi-desert/assimp into semi-desert-master
2023-08-30 21:16:21 +02:00
e79d105957
Merge branch 'master' into vulcano/export_gltf2_with_roughness_texture
2023-08-29 15:13:43 +02:00
cc2c5d3ae3
Merge branch 'master' into collada-ignore-unit-size-property
2023-08-29 14:01:40 +02:00
60b6d80936
Merge branch 'master' into xin-issue_5211
2023-08-24 21:03:57 +02:00
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
4389c3d80c
The texture strength attribute in aiMaterial set when importing and exporting gltf files is inconsistent
2023-08-23 14:54:40 +08:00
d07934bf25
adjust comment
2023-08-18 01:03:49 +08:00
554fa8f5e2
code format
2023-08-18 01:03:49 +08:00
2b4606c082
add fallback strategy for metallicRoughnessTexture
2023-08-18 01:03:49 +08:00
3a03fe31b1
gltf2 export diffuse roughness
2023-08-18 01:03:49 +08:00
32716002ac
Add DIFFUSE_ROUGHNESS_TEXTURE for gltf2 exporter
2023-08-18 01:03:49 +08:00
5c45cdc0ad
Fix Invalid-free in Assimp::FBX::Scope::Scope
2023-08-16 07:45:23 +00:00
d77903423f
Merge branch 'master' into floatwarn
2023-08-15 12:55:37 +02:00
0bfc588c39
Update Triangulate Process [more another case]
2023-08-15 18:01:16 +08:00
e5d9339c21
Merge branch 'master' into 5513536726761472
2023-08-12 08:05:27 +02:00
1c5dc86afb
Merge branch 'master' into fix_magic
2023-08-12 07:39:40 +02:00
d8a7399a04
Merge branch 'assimp:master' into collada-ignore-unit-size-property
2023-08-10 08:10:18 +02:00
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
49ed0711d1
Fix another warning
2023-08-05 15:43:31 +02:00
8312b31d27
fix warning-as-error
2023-08-05 15:39:47 +02:00
bb1873dd22
Collada: added import property to disable unit size scaling
2023-08-04 09:54:55 +02:00
f7e7f82b9d
Add const
2023-08-03 17:10:17 +00:00
d7dc88e0d0
Fix UNKNOWN READ in Assimp::MDLImporter::InternReadFile_Quake1
2023-08-01 13:04:16 +00:00
439b3369c1
Merge branch 'master' into fix_magic
2023-07-23 21:21:29 +02:00
dd40b0ccee
Changed #define FBX_FOV_UNKNOWN to const float kFovUnknown
2023-07-23 12:05:01 -07:00
3ec8a36764
Merge branch 'assimp:master' into sfjohnston_mods
2023-07-23 08:37:47 -07:00
37a1366fb7
Add missing rapidjson headers.
2023-07-21 11:33:06 +02:00
52e5c3f39e
Fix violation of strict aliasing rule.
2023-07-21 09:48:45 +02:00
64e0ba2625
Merge branch 'master' into sfjohnston_mods
2023-07-20 09:21:13 +00:00
16021ef9ac
Merge branch 'master' into cloud_storage_version
2023-07-14 11:47:24 +02:00
0e7cd18c8b
Strip aws gcs version string.
2023-07-14 09:37:48 +02:00
bf38d67935
Fix detection of KHR_materials_specular.
2023-07-13 11:51:56 +02:00
c7afea3cd7
Merge branch 'assimp:master' into sfjohnston_mods
2023-07-10 07:58:21 -07:00
e2b19ef776
Merge branch 'master' into file_extension
2023-07-10 11:19:27 +02:00
87cac888e4
More simplifications.
2023-07-08 12:58:11 +02:00
bdde968677
Address reviewer comment.
2023-07-08 12:58:11 +02:00
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
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
90ff723b6c
Merge branch 'master' into gltf_binary
2023-07-03 21:31:28 +02:00
ed903543a7
Merge branch 'master' into 4879958521806848
2023-07-03 19:50:38 +02:00
093e35dd54
Fix eternal loop
2023-07-03 09:12:00 +00:00
edb8375702
Fix integer overflow
2023-07-03 09:11:38 +00:00
f1561f03ce
Merge branch 'master' into irrfix
2023-07-02 15:10:04 -04:00
0bacc7134d
Remove debugging code, clean up some notes
2023-07-02 14:32:17 -04:00
19da9cc84d
Port mesh loading to pugixml. Untested.
2023-07-02 14:32:12 -04:00
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
537b445a59
Apply clang-format to files
2023-07-02 14:17:52 -04:00
6f3bfb5b60
Fix memory leak
2023-07-02 14:12:49 -04:00
3838a8aaf8
Fix unknown write in Assimp::ObjFileMtlImporter::getFloatValue
2023-07-02 14:12:49 -04:00
82d3f47432
Unify way to check readable blender files.
2023-06-29 15:10:28 +02:00
2875de132f
Fix compilation on windows.
2023-06-29 08:20:51 +02:00
17fac97b04
Fix magic token usage.
2023-06-29 08:20:51 +02:00
1c0f3c5f87
Fix string length calculation.
2023-06-29 08:20:50 +02:00
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
1ec3dbd11a
Merge branch 'master' into 5093294573486080
2023-06-27 17:04:58 +02:00
f24224fdc5
Merge branch 'master' into SupportOBJSpecifiedOnlyAPartOfVertexColors
2023-06-27 13:44:31 +02:00
db6c1a8b1c
Merge branch 'master' into 5921493454815232
2023-06-27 11:03:50 +02:00
ef6bf03acd
Merge branch 'master' into 5143879191494656
2023-06-27 10:23:36 +02:00
141e278e1f
Merge branch 'master' into 5407417422970880
2023-06-27 10:07:21 +02:00
ff36ea7e23
Merge branch 'master' into 6521292621217792
2023-06-26 09:17:40 +02:00
b1181b1086
Merge branch 'master' into 4508318827937792
2023-06-25 21:20:02 +02:00
7005a9caa2
Merge branch 'master' into 6520123362508800
2023-06-25 21:07:34 +02:00
6b1a2e91d5
Merge branch 'master' into 6091762766839808
2023-06-25 20:08:45 +02:00
438f9fe568
Merge branch 'master' into 6020769077657600
2023-06-25 18:11:54 +02:00
3545aab937
Merge branch 'master' into 5781186265350144
2023-06-25 17:51:01 +02:00
bd65af0d44
Merge branch 'master' into SupportOBJSpecifiedOnlyAPartOfVertexColors
2023-06-20 09:38:53 +02:00
6502b97d3e
Fix: Put unused var into comments to later use.
2023-06-19 23:38:57 +02:00
7f0c388ad8
Fix: Put unused var into comments to later use.
2023-06-19 23:27:32 +02:00
10059e6431
Add handling for negative indices.
2023-06-19 23:21:35 +02:00
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
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
36dfa3bed3
Fix UNKNOWN WRITE in Assimp::SortByPTypeProcess::Execute
2023-06-14 15:50:50 +00:00
b158b716d1
Fix Memcpy-param-overlap in unzReadCurrentFile: bump zlib to 1.2.13
2023-06-14 07:41:41 +02:00
9ef71fe231
Merge branch 'master' into 5781186265350144
2023-06-14 07:40:47 +02:00
5bb1c6debd
Fix UNKNOWN READ crash in UpdateMeshReferences
2023-06-14 07:40:36 +02:00
b3a1c72c8f
Fix Heap-buffer-overflow READ in Assimp::FileSystemFilter::Cleanup
2023-06-14 07:40:28 +02:00
646d3591b6
Fix memory leak
2023-06-14 07:40:21 +02:00
496a4bf156
Fix unknown write in Assimp::ObjFileMtlImporter::getFloatValue
2023-06-14 07:40:21 +02:00
8012657169
Fix Heap-buffer-overflow READ in Assimp::MD5::MD5Parser::ParseSection
2023-06-14 07:38:57 +02:00
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
86aecf395e
Fix Bad-cast to Assimp::D3DS::Material from invalid vptr in Assimp::ASE::Parser::ParseLV2MaterialBlock
2023-06-14 07:38:38 +02:00
c6c95b69f6
Use SizeCheck
2023-06-14 07:38:02 +02:00
54b0c00418
Fix UNKNOWN READ in Assimp::MDLImporter::ParseSkinLump_3DGS_MDL7
2023-06-14 07:38:02 +02:00
f897b0c461
Merge branch 'master' into 6520123362508800
2023-06-13 22:06:08 +02:00
3ccf242bdb
Merge branch 'master' into memleak
2023-06-13 19:46:56 +02:00
bef66deeda
Update glTF2Importer.h
2023-06-08 20:56:14 +02:00
1ab4161cd7
Update glTF2Importer.cpp
2023-06-08 20:55:48 +02:00
186d7fd606
Merge branch 'master' into FixSkinnedWeightsAfterVertexRemappingOptimization
2023-06-08 13:16:08 +02:00
11dede8fc4
Merge branch 'master' into 4890437695700992
2023-06-08 13:02:15 +02:00
4c16a6a16b
Fix memory leak
2023-06-07 07:02:50 +00:00
cb86029153
Fixed missing config property lookup for removal of empty bones.
2023-06-06 14:30:35 +02:00
f5683b6f3a
Update MDLMaterialLoader.cpp
...
Add parentheses
2023-06-05 14:27:21 +02:00
23f9990b22
Fix UNKNOWN READ in aiTexture::~aiTexture
2023-06-04 07:50:00 +00:00
5cc4a61d66
Fix Heap-buffer-overflow READ in Assimp::MD5::MD5MeshParser::MD5MeshParser
2023-06-03 16:30:50 +02:00
6c5fe9d76f
Add missing include
2023-06-03 16:28:55 +02:00
57a55aa4d4
Fix memory leaks
2023-06-03 16:28:55 +02:00
f4d3b6e862
Fix Stack-buffer-overflow READ in aiMaterial::AddBinaryProperty
2023-06-03 16:28:55 +02:00
d3506c24e7
Update ObjFileParser.cpp
2023-06-02 18:57:53 +02:00
e30823fb1d
Merge branch 'master' into 5781186265350144
2023-06-01 16:40:46 +02:00
4cc70cb73c
Optimize
2023-05-31 14:10:57 +00:00
54f5d01190
Fix Heap-buffer-overflow WRITE in Assimp::ObjFileImporter::createVertexArray
2023-05-31 11:37:15 +00:00
c3e69b5b82
Fix Heap-buffer-overflow READ in Assimp::ObjFileParser::getFace
2023-05-31 08:01:41 +00:00
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
17c1a9125f
Merge branch 'master' into FixSkinnedWeightsAfterVertexRemappingOptimization
2023-05-24 23:36:59 +02:00
f43cfa1fba
Merge branch 'master' into msvc-clang-unused-function
2023-05-24 23:23:40 +02:00
ca848c5b09
Merge branch 'master' into fix-pbrt-exporter
2023-05-24 22:28:32 +02:00
d73595b85d
Merge branch 'master' into master
2023-05-24 21:35:26 +02:00
0fbd2f5894
Merge branch 'master' into fix-pbrt-exporter
2023-05-24 15:24:46 +02:00
b7a8c4ba75
Update glTF2Asset.inl
2023-05-23 10:33:14 +02:00
e947471549
Merge branch 'master' into refactor/KHR_material_specular
2023-05-22 09:49:01 +02:00
03163a1dda
Merge branch 'master' into master
2023-05-21 18:26:56 +02:00
7e16d4046e
Merge branch 'master' into FixSkinnedWeightsAfterVertexRemappingOptimization
2023-05-21 18:14:29 +02:00
9c45f727e3
Update ASELoader.cpp
2023-05-20 14:27:57 +02:00
94905d445f
Revert usage of unique_ptr - error.
2023-05-15 16:06:02 +02:00
71a4977dd1
Fix: Try unique_ptr
2023-05-15 15:46:21 +02:00
8ad4bb0b2c
Update StackAllocator.inl
2023-05-15 15:09:54 +02:00
b5b6400320
Fix: Use vector.
2023-05-15 15:08:52 +02:00
aed43878ef
Merge branch 'master' into FlorianBorn71-SmallAllocationFixInFBXLoader
2023-05-15 14:28:46 +02:00
ad399adf4b
Add missing include
2023-05-15 13:19:02 +02:00
121f09b62a
Fix: Fix the build.
2023-05-15 11:02:58 +02:00
e627f691a8
Merge branch 'SmallAllocationFixInFBXLoader' of https://github.com/FlorianBorn71/assimp into FlorianBorn71-SmallAllocationFixInFBXLoader
2023-05-15 09:30:57 +02:00
9ea37b5330
copy aiMetadata objects in scene combiner
2023-05-11 08:00:25 +02:00
ade4514752
Merge branch 'master' into fix-pbrt-exporter
2023-05-10 21:55:00 +02:00
d825eb7cf0
Skinning weights i gltf were broken by PR#5003 (vertex remapping)
2023-05-08 20:04:38 +02:00
69145c8929
Fix librt link
2023-05-05 08:47:14 +02:00
8cbfb44e9c
Remove dead code
2023-05-04 21:10:51 +02:00
1243325f10
Merge branch 'master' into kimkulling/refactoring_geoutils
2023-05-04 21:10:00 +02:00
75d024c91b
Reafctoring: Add GeoUtils usage
2023-05-04 20:57:20 +02:00
167d811ff7
Doc: Add missing doc to GeometryUtils.
2023-05-04 00:04:56 +02:00
d58201a579
Refactoring: Reuse code from GeometryUtils
2023-05-04 00:00:52 +02:00
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
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
f32c21e6b3
Fix PBRT exporter FoV aspect ratio calculation
2023-05-03 16:46:54 +02:00
92d426de2b
Remove unused -Wno-missing-noreturn.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-29 01:05:25 +08:00
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
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
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
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
71043ec164
Add missing cast
2023-04-28 11:44:29 +02:00
230bee2e34
Merge branch 'master' into msvc-clang-missing-variable-declarations
2023-04-26 11:15:32 +02:00
07aae9eaee
Merge branch 'master' into msvc-clang-deprecated-copy-with-dtor
2023-04-26 10:42:51 +02:00
71366fff8e
Merge branch 'master' into msvc-clang-inconsistent-missing-destructor-override
2023-04-26 09:31:55 +02:00
965ebaf78b
Merge branch 'master' into deprecated-copy-with-user-provided-dtor
2023-04-26 08:22:51 +02:00
1ecb8e9196
Merge branch 'master' into msvc-clang-missing-noreturn
2023-04-25 23:56:39 +02:00
ff17f1fe3d
Remove -Wno-missing-variable-declarations.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-19 23:29:03 +08:00
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
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
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
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
Kim Kulling
Kim Kulling
AnyOldName3
tangxin
zhucan
朱灿
Alex
Aaron
Martin Weber
Gargaj
sfjohnston
Marco Feuerstein
PencilAmazing
dog
emaame
Scott Johnston
Kristjan Skutta
Kim Kulling
Samuel Kogler
Lutz Hören
Florian Born
Mathieu Westphal
Jackie9527
Samuel Kogler
Suhajda Tamás