64e0ba2625
Merge branch 'master' into sfjohnston_mods
2023-07-20 09:21:13 +00: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
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
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
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
9ef71fe231
Merge branch 'master' into 5781186265350144
2023-06-14 07:40:47 +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
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
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
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
aed43878ef
Merge branch 'master' into FlorianBorn71-SmallAllocationFixInFBXLoader
2023-05-15 14:28:46 +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
d825eb7cf0
Skinning weights i gltf were broken by PR#5003 (vertex remapping)
2023-05-08 20:04:38 +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
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
230bee2e34
Merge branch 'master' into msvc-clang-missing-variable-declarations
2023-04-26 11:15:32 +02:00
71366fff8e
Merge branch 'master' into msvc-clang-inconsistent-missing-destructor-override
2023-04-26 09:31:55 +02:00
1ecb8e9196
Merge branch 'master' into msvc-clang-missing-noreturn
2023-04-25 23:56:39 +02: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
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
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
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
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
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
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
9e056218cf
Merge branch 'master' into msvc-clang-unreachable-code-return
2023-04-17 22:04:07 +02:00
ca937788ee
Fix: Fix leak in Scope class, FBX
...
- closes https://github.com/assimp/assimp/issues/3421
2023-04-17 20:08:58 +02:00
aee4df9be8
Fix possible dereferencing of invalid pointer.
...
- closes https://github.com/assimp/assimp/issues/4918
2023-04-17 15:40:29 +02:00
5d841ec9a5
Refactoring: Cleanup post-processing steps.
2023-04-16 18:20:14 +02:00
e193220ad8
Merge branch 'master' into refactor/KHR_material_specular
2023-04-06 02:42:18 +02:00
3dd08cdd60
Added note
2023-04-05 13:01:38 +02:00
74509ef8bd
Revert "FBXConverter : import FbxCamera correctly"
...
This reverts commit cdfdd75a66
2023-04-05 12:19:39 +02:00
d4c21ba9a8
Fix warning related to error=return-type.
...
/home/runner/work/assimp/assimp/code/AssetLib/Ogre/OgreXmlSerializer.cpp: In member function ‘T Assimp::Ogre::OgreXmlSerializer::ReadAttribute(Assimp::XmlNode&, const char*) const [with T = bool]’:
Error: /home/runner/work/assimp/assimp/code/AssetLib/Ogre/OgreXmlSerializer.cpp:131:1: error: control reaches end of non-void function [-Werror=return-type]
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-05 07:39:17 +08:00
a7cb3b4dbb
Fix warning related to unreachable-code-return, remove redundant return.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-05 07:37:49 +08:00
55c6eaee0c
Fix warning related to unreachable-code-return, remove redundant return.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-05 07:37:48 +08:00
502bceb6e8
Fix warning related to unreachable-code-return, remove redundant return.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-05 07:37:48 +08:00
a87585668d
Fix warning related to unreachable-code-return, disable warning.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-05 07:37:48 +08:00
89ccc89298
Merge branch 'master' into fix_pretransform_vertices_with_cameras
2023-04-04 17:21:05 +02:00
1733d9f795
Merge branch 'master' into msvc-clang-unreachable-code
2023-04-04 17:02:22 +02:00
a259277498
Merge branch 'master' into master
2023-04-03 23:54:28 +02:00
9915e875bf
glTF2: Fix incorrect camera position
2023-04-03 23:35:04 +02:00
8aa959fa19
Merge branch 'master' into MemoryOptimizationForGLTFWithSharedAttr
2023-04-03 20:48:51 +02:00
d6885d4025
Merge branch 'master' into msvc-clang-nested-anon-types
2023-04-03 19:59:59 +02:00
19ff57a6c3
Merge branch 'master' into MemoryOptimizationForGLTFWithSharedAttr
2023-04-03 11:28:10 +02:00
7df4efea44
Fix warning related to inconsistent-missing-destructor-override.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 21:49:38 +08:00
87c309566f
Fix warning related to missing-noreturn.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 18:46:12 +08:00
04066ece8e
Fix warning related to unreachable-code.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 13:02:04 +08:00
1dcb5da1cd
Fix warning related to unreachable-code.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 13:01:22 +08:00
6b54761310
Fix warning related to nested-anon-types.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-04-01 10:30:10 +08:00
4438b3ecc9
Fix Issue #4486 using the fix described by @jianliang79
2023-03-29 18:36:18 +00:00
8ac0af5c58
.
2023-03-26 17:13:16 +02:00
b6ecba9114
fix
2023-03-26 17:03:46 +02:00
83053f3d56
Made usePbrSpecGloss a exportproperty, fixed mat_specular to spec
2023-03-26 16:55:38 +02:00
fa00571049
fixed compilation bug
2023-03-26 14:52:44 +02:00
c9177b7811
Merge branch 'master' into refactor/KHR_material_specular
2023-03-24 21:47:19 +01:00
7095c4f52f
Merge branch 'master' into master
2023-03-23 07:30:49 +01:00
5ddd18d1c7
Add more AMF unit tests
2023-03-22 12:06:30 +02:00
7cc0c06fdb
Merge branch 'assimp:master' into master
2023-03-22 08:30:52 +01:00
cdfdd75a66
FBXConverter : import FbxCamera correctly
...
FbxCamera's default value is correct but its transformed
values are described in each NodeProperties.
2023-03-21 10:35:24 +01:00
e7e4e3100f
Merge branch 'master' into 1-3193
2023-03-20 14:01:35 +01:00
3a69e353f3
Make Blender MVert no field optional
2023-03-20 12:00:20 +02:00
eb3b48e523
Invert logic in build_bone_children_hierarchy.
2023-03-14 09:21:45 -04:00
4c015077b8
Add missing member initializer.
2023-03-13 19:07:14 -04:00
054dacd068
Improved comments.
2023-03-13 19:07:14 -04:00
4b4cb55f22
Fix HL1MDLLoader flattened bone hierarchy.
2023-03-13 19:06:18 -04:00
8176c6a0e4
Adjusting the unit tests to pass new gltf
2023-03-10 18:36:43 +01:00
60cefdd549
Jan's fedback
2023-03-10 12:10:38 +01:00
dfd70b5c10
GLTF Importer: Build a list of the actual vertices so it works well with shared attribute lists
2023-03-09 19:06:58 +01:00
05249353d4
Merge branch 'master' into UseNewMetaDataTypesInFBXConverter
2023-03-08 10:53:00 +01:00
069b3ecdf8
After Kim's addition to meta data types, use it in the FBX converter
2023-03-07 17:44:48 +01:00
44c2785663
Make debug message more professional.
2023-03-07 17:01:08 +01:00
2efd48dee2
disable another debug print message
2023-03-04 14:53:48 +01:00
424f53b4d6
bugfix remove duplicated data.
...
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-03-04 16:25:56 +08:00
e8f0eb930d
Fix loading binary LWO files
2023-02-24 14:40:27 +02:00
3bdc43a216
Add debug logging to LWO node graph generation
2023-02-24 14:40:27 +02:00
657c1d8ad0
Use unique_ptr to store pivot nodes until moved to mapPivot
2023-02-24 14:40:23 +02:00
3bdfecb0ed
Destroy mapPivot nodes as we go
2023-02-24 13:26:34 +02:00
be28f0949b
Whitespace
2023-02-24 13:20:40 +02:00
53c6cc0966
Add a scope so mapPivot is destroyed when no longer used
2023-02-24 13:19:38 +02:00
92f7c50c91
Remove dead code
2023-02-24 13:18:04 +02:00
28d4e394c0
Use std::unique_ptr a bit
2023-02-24 13:17:32 +02:00
eb73464055
Merge branch 'master' into fix-fbx-document-duplicate-id-leak
2023-02-23 10:39:52 +01:00
c8d50dc83f
Merge branch 'master' into patch-2
2023-02-22 21:33:20 +01:00
fa4273ee1f
Fix index out of bounds
2023-02-20 19:56:57 +01:00
f8132bf17c
Fix index out of bounds
2023-02-20 19:50:06 +01:00
53e5f19b14
Use C++ style casts
2023-02-17 11:20:00 -08:00
e4386d3013
Fix implicit conversion errors on macOS
2023-02-16 15:21:43 -08:00
2cd3da4831
Fix a leak in FBXDocument when duplicate object IDs are found
...
When a duplicate ID is encountered, existing LazyObject is overwritten. Previously allocated instance leaks.
This change deletes the previously allocated instance before overwriting the pointer.
2023-02-16 11:21:29 +01:00
Kim Kulling
Marco Feuerstein
sfjohnston
Alex
PencilAmazing
dog
Kim Kulling
emaame
Scott Johnston
Kim Kulling
Florian Born
Jackie9527
Adam Beili
Suhajda Tamás
aniongithub
inhosens
Turo Lamminen
Inho Lee
Marc-Antoine Lortie
Urs Hanselmann
Johan Mattsson
Aaron Jacobs
Anton Vaneev