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
Marco Feuerstein
sfjohnston
Kim Kulling
Alex
PencilAmazing
dog
Kim Kulling
emaame
Scott Johnston
Kristjan Skutta
Kim Kulling
Samuel Kogler
Lutz Hören
Florian Born
Mathieu Westphal