v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,292 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

1372 Commits (kimkulling/remove_unused_header_issue-5247)

Author SHA1 Message Date
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 9ef71fe231
Merge branch 'master' into 5781186265350144 2023-06-14 07:40:47 +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
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 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 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 aed43878ef
Merge branch 'master' into FlorianBorn71-SmallAllocationFixInFBXLoader 2023-05-15 14:28:46 +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
Florian Born d825eb7cf0 Skinning weights i gltf were broken by PR#5003 (vertex remapping) 2023-05-08 20:04:38 +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
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
Kim Kulling 230bee2e34
Merge branch 'master' into msvc-clang-missing-variable-declarations 2023-04-26 11:15:32 +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 1ecb8e9196
Merge branch 'master' into msvc-clang-missing-noreturn 2023-04-25 23:56:39 +02: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 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
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
Kim Kulling 5d841ec9a5 Refactoring: Cleanup post-processing steps. 2023-04-16 18:20:14 +02:00
Adam Beili e193220ad8
Merge branch 'master' into refactor/KHR_material_specular 2023-04-06 02:42:18 +02:00
Suhajda Tamás 3dd08cdd60 Added note 2023-04-05 13:01:38 +02:00
Suhajda Tamás 74509ef8bd Revert "FBXConverter : import FbxCamera correctly" 
This reverts commit cdfdd75a66.
 2023-04-05 12:19:39 +02:00
Jackie9527 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
Jackie9527 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
Jackie9527 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
Jackie9527 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
Jackie9527 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
Kim Kulling 89ccc89298
Merge branch 'master' into fix_pretransform_vertices_with_cameras 2023-04-04 17:21:05 +02:00
Kim Kulling 1733d9f795
Merge branch 'master' into msvc-clang-unreachable-code 2023-04-04 17:02:22 +02:00
Kim Kulling a259277498
Merge branch 'master' into master 2023-04-03 23:54:28 +02:00
Suhajda Tamás 9915e875bf glTF2: Fix incorrect camera position 2023-04-03 23:35:04 +02:00
Kim Kulling 8aa959fa19
Merge branch 'master' into MemoryOptimizationForGLTFWithSharedAttr 2023-04-03 20:48:51 +02:00
Kim Kulling d6885d4025
Merge branch 'master' into msvc-clang-nested-anon-types 2023-04-03 19:59:59 +02:00
Kim Kulling 19ff57a6c3
Merge branch 'master' into MemoryOptimizationForGLTFWithSharedAttr 2023-04-03 11:28:10 +02:00
Jackie9527 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
Jackie9527 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
Jackie9527 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
Jackie9527 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
Jackie9527 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
aniongithub 4438b3ecc9 Fix Issue #4486 using the fix described by @jianliang79 2023-03-29 18:36:18 +00:00
Adam Beili 8ac0af5c58
. 2023-03-26 17:13:16 +02:00
Adam Beili b6ecba9114
fix 2023-03-26 17:03:46 +02:00
Adam Beili 83053f3d56
Made usePbrSpecGloss a exportproperty, fixed mat_specular to spec 2023-03-26 16:55:38 +02:00
Adam Beili fa00571049
fixed compilation bug 2023-03-26 14:52:44 +02:00
Adam Beili c9177b7811
Merge branch 'master' into refactor/KHR_material_specular 2023-03-24 21:47:19 +01:00
inhosens 7095c4f52f
Merge branch 'master' into master 2023-03-23 07:30:49 +01:00
Turo Lamminen 5ddd18d1c7 Add more AMF unit tests 2023-03-22 12:06:30 +02:00
inhosens 7cc0c06fdb
Merge branch 'assimp:master' into master 2023-03-22 08:30:52 +01:00
Inho Lee 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
Kim Kulling e7e4e3100f
Merge branch 'master' into 1-3193 2023-03-20 14:01:35 +01:00
Turo Lamminen 3a69e353f3 Make Blender MVert no field optional 2023-03-20 12:00:20 +02:00
Marc-Antoine Lortie eb3b48e523 Invert logic in build_bone_children_hierarchy. 2023-03-14 09:21:45 -04:00
Marc-Antoine Lortie 4c015077b8 Add missing member initializer. 2023-03-13 19:07:14 -04:00
Marc-Antoine Lortie 054dacd068 Improved comments. 2023-03-13 19:07:14 -04:00
Marc-Antoine Lortie 4b4cb55f22 Fix HL1MDLLoader flattened bone hierarchy. 2023-03-13 19:06:18 -04:00