PencilAmazing
527d110917
Merge branch 'master' into PLYcomments#4866
2023-01-30 09:35:57 -05:00
krishty
df28e7830f
Merge branch 'master' into fix-build-without-armaturepopulate-post-process
2023-01-29 01:14:33 +01:00
Kim Kulling
77e34eedc0
Merge pull request #4904 from tellypresence/update-morph-documentation
...
Update morph mesh documentation now that gltf known to work
2023-01-27 10:03:34 +01:00
Steve M
eff13f6a40
Update morph mesh documentation now that gltf known to work
2023-01-25 20:52:25 -08:00
Shaun Reed
ffbeb2db18
CI
2023-01-25 17:46:10 -05:00
Shaun Reed
37903f8ed2
Don't build zlib if ASSIMP_BUILD_ZLIB=OFF
2023-01-25 17:46:10 -05:00
PencilAmazing
6dc12f57a2
Merge branch 'master' into PLYcomments#4866
2023-01-23 21:50:26 -05:00
Kim Kulling
3e7121e1cc
Merge pull request #4892 from lsnoel/fixLHNormals
...
Correctly consider aiProcess_FlipWindingOrder and aiProcess_MakeLeftHanded when generating normals
2023-01-24 00:16:21 +01:00
Kim Kulling
57054415cf
Merge branch 'master' into fixLHNormals
2023-01-24 00:04:49 +01:00
Kim Kulling
8463242449
Merge pull request #4889 from krishty/fix-msvc-emplace-warnings
...
Fix MSVC Warnings With “emplace_back()”
2023-01-24 00:04:21 +01:00
PencilAmazing
4d733d80f1
Merge branch 'master' into PLYcomments#4866
2023-01-23 15:56:04 -05:00
Kim Kulling
b31c04e37c
Merge branch 'master' into fix-msvc-emplace-warnings
2023-01-23 21:37:41 +01:00
Kim Kulling
4d5e47a870
Merge pull request #4888 from krishty/clean-up-ctors-dtors
...
Tidy Up Constructors and Destructors
2023-01-23 21:37:08 +01:00
Kim Kulling
f830d7998e
Merge branch 'master' into clean-up-ctors-dtors
2023-01-23 21:21:34 +01:00
Kim Kulling
a7c4399c26
Merge pull request #4887 from krishty/remove-stray-semicolon
...
Remove Stray Semicolon
2023-01-23 20:26:10 +01:00
PencilAmazing
cb8320945d
Fix issue #4866 by continuing to resetting read loop after hitting a comment
2023-01-23 14:18:50 -05:00
Kim Kulling
036f2b3771
Merge branch 'master' into remove-stray-semicolon
2023-01-23 20:06:43 +01:00
Kim Kulling
a9ce8a967d
Merge pull request #4886 from shimaowo/fix_gltf2_camera_fov
...
Fix: fix incorrect math for calculating the horizontal FOV of a perspective camera in gltf2 import #4435
2023-01-23 20:06:06 +01:00
Kim Kulling
3e20502e0f
Merge branch 'master' into fix_gltf2_camera_fov
2023-01-23 19:14:42 +01:00
Kim Kulling
ff9b6c8d79
Merge pull request #4885 from krishty/replace-variables-with-literals
...
Replace Variables With Literals
2023-01-23 19:10:15 +01:00
Kim Kulling
3bd2f788f6
Merge branch 'master' into replace-variables-with-literals
2023-01-23 18:55:20 +01:00
AdamCichocki
5ed09b7ab6
usedVertexIndicesMask is now based on vector<boo> instead of vector<uint>
2023-01-23 16:39:06 +01:00
AdamCichocki
72b178b9fc
Optimized usedVertexIndices by using bitmask instead of unordered_set
2023-01-23 14:51:02 +01:00
Kim Kulling
cff81568f3
Merge pull request #4884 from krishty/remove-useless-virtual
...
Remove Useless “virtual”
2023-01-22 20:40:36 +01:00
Kim Kulling
f2f967b8ba
Merge branch 'master' into remove-useless-virtual
2023-01-22 20:25:45 +01:00
Kim Kulling
c48507beea
Merge pull request #4882 from krishty/trim-whitespace
...
Trim Trailing Whitespace
2023-01-22 17:17:53 +01:00
Kim Kulling
f8bc8293ce
Update FBXMeshGeometry.h
2023-01-22 16:48:45 +01:00
Kim Kulling
303c30668f
Merge branch 'master' into trim-whitespace
2023-01-22 16:37:43 +01:00
Kim Kulling
bf57eef8f2
Merge pull request #4897 from assimp/kimkulling/ensure_initializer_exists
...
Ensure initializer exists
2023-01-20 20:38:30 +01:00
Kim Kulling
7ad36b8925
Merge branch 'master' into kimkulling/ensure_initializer_exists
2023-01-20 20:01:41 +01:00
Kim Kulling
43d336311e
Merge pull request #4896 from assimp/kimkulling/remove_Zi_flag_msvc_issue-4845
...
Remove /Zi compiler flag for MSVC, release config
2023-01-20 20:00:51 +01:00
Kim Kulling
5ed01bcfa3
Ensure initializer exists
...
- Fixing a Codaxy finding.
2023-01-20 20:00:36 +01:00
Kim Kulling
9e1de3ec6e
Remove /Zi compiler flag for MSVC, release config
...
- closes https://github.com/assimp/assimp/issues/4845
2023-01-20 19:45:45 +01:00
Kim Kulling
288d49b721
Merge pull request #4895 from assimp/kimkulling/make_remove_empty_bones_optional_issue-4840
...
Update LimitBoneWeightsProcess.cpp
2023-01-20 19:33:41 +01:00
Kim Kulling
81cf1369db
Set correct number of bones in mesh instance
2023-01-20 19:20:06 +01:00
Kim Kulling
ab0a119626
Update LimitBoneWeightsProcess.cpp
...
- Removing empty bones only if AI_CONFIG_IMPORT_REMOVE_EMPTY_BONES is enabled.
- closes https://github.com/assimp/assimp/issues/4840
2023-01-20 19:14:04 +01:00
lsnoel
8d1256f472
Comments about winding order fix for gen normals
2023-01-20 14:55:06 +00:00
Kim Kulling
d331a7e5d4
Merge branch 'master' into fix-build-without-armaturepopulate-post-process
2023-01-20 13:52:13 +01:00
lsnoel
eb5d3c51e8
Correctly consider aiProcess_FlipWindingOrder AND aiProcess_MakeLeftHanded when generating normals
2023-01-19 16:46:29 +00:00
Krishty
72f360710a
Fix MSVC Warnings With “emplace_back()”
...
Several places in the code call `std::vector<aiVector3D>.emplace_back(0, 0, 0)`. The constructor of `aiVector3D` actually expects arguments of the type `ai_real`, (alias of `float` if compiling without `ASSIMP_DOUBLE_PRECISION`) but the literal `0` is of type `int`.
`emplace_back()` does support promotion, but `int` to `float` is a potentially lossy conversion. tl;dr: On warning level 4, MSVC spits out a very deeply nested `warning C4244: 'argument': conversion from '_Ty' to 'TReal', possible loss of data with _Ty=int and TReal=ai_real`.
2023-01-18 00:08:38 +01:00
shimaowo
20acfeaf97
Merge branch 'master' into fix_gltf2_camera_fov
2023-01-17 14:39:54 -08:00
Kim Kulling
67eae8ee5a
Merge pull request #4878 from MMory/f-FixWhitespaceBetweenTagAndNum
...
Fix #4877
2023-01-17 20:04:47 +01:00
shimaowo
b298b79a46
add missing parens
2023-01-17 10:53:41 -08:00
Martin Mory
7f6e96747b
Merge branch 'master' into f-FixWhitespaceBetweenTagAndNum
2023-01-17 13:32:39 +01:00
Kim Kulling
d640a89035
Merge pull request #4879 from krishty/fix-build-with-m3d-import-only
...
Fix #4262 Build With M3D Import Only
2023-01-17 12:14:23 +01:00
Martin Mory
a89d5c7cea
Merge branch 'master' into f-FixWhitespaceBetweenTagAndNum
2023-01-17 12:10:46 +01:00
Kim Kulling
e9f95e5ab6
Merge branch 'master' into fix-build-with-m3d-import-only
2023-01-17 11:22:00 +01:00
Kim Kulling
6a8f169103
Merge pull request #4872 from drbct/fixJoinVerticesProcess
...
Generalize JoinVerticesProcess for multiple UV and color channels
2023-01-17 11:05:57 +01:00
Kim Kulling
19dec716d3
Merge branch 'master' into fixJoinVerticesProcess
2023-01-17 09:11:43 +01:00
Krishty
36305cf987
Tidy Up Constructors and Destructors
...
This commit does not add or remove c’tors or d’tors, so it is *not* ABI-breaking.
If a c’tor/d’tor does nothing else than the default behavior, this commit replaces it with “= default”.
If an initializer list entry does nothing else than the default behavior, this commit removes it. First and foremost, remove default c’tor calls of base classes (always called by the compiler if no other base c’tor is explicitly called) and c’tor calls of members with complex types (e.g. “std::vector”).
In a few instances, user-defined copy c’tors / move c’tors / assignment operators / move assignment operators were replaced with “= default”, too. I only did this if I had a clear understanding of what’s going on.
2023-01-16 21:47:11 +01:00