Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,663 Commits 19 Branches 43 Tags
db72c6ee38e5a87f4aaf255197eb49da2b1fa651
Commit Graph

11663 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthias Möller
db72c6ee38 When "getNextBlock" was called after "getNextLine", the pointer could still on the newline. 
The pointer to a newline could not advance enough, when the line ended with \r\n. The resulting buffer was correct, as the buffer range went from <start> until \r, but that the pointer increased by just 1 could lead to the problem that the next pointer points at \n, which is still part of the newline and therefore, "getNextBlock" got 1 byte too much.

Refs Issue #4871
 2023-02-04 15:16:22 +01:00
Kim Kulling
8c6b3fe69a Merge pull request #4934 from turol/terragen_fix 
Fix Terragen loader
 2023-02-03 11:42:15 +01:00
Turo Lamminen
9453342491 Re-enable Terragen loader unit test 2023-02-03 11:45:11 +02:00
Turo Lamminen
8d405d60d9 Fix Terragen loader 
Fixes e8d2b84017
 2023-02-03 11:44:27 +02:00
Kim Kulling
dbd0ae8f22 Merge pull request #4932 from turol/unit-test-fix 
Unit test warning fixes
 2023-02-03 00:15:48 +01:00
Kim Kulling
14b80f1ac4 Merge branch 'master' into unit-test-fix 2023-02-02 22:05:38 +01:00
Kim Kulling
ea7321aae2 Merge pull request #4898 from shaunrd0/zlib-nobuild 
Don't build zlib if ASSIMP_BUILD_ZLIB=OFF
 2023-02-02 20:45:02 +01:00
Turo Lamminen
a2273df48e Unit test warning fixes 
GCC was warning about possibly uninitialized variables. Initialize them
and use values which are nonzero and distinct from each other and any
real value passed to any set method. This should prevent any false positives
from zero initialization.
 2023-02-02 14:07:16 +02:00
Kim Kulling
213b536282 Merge branch 'master' into zlib-nobuild 2023-02-01 20:24:41 +01:00
Kim Kulling
6999caa683 Merge pull request #4899 from PencilAmazing/PLYcomments#4866 
Fix issue #4866 by continuing to resetting read loop after hitting a comment
 2023-02-01 20:06:59 +01:00
PencilAmazing
feb3e9ff7a Merge branch 'master' into PLYcomments#4866 2023-02-01 13:05:55 -05:00
Kim Kulling
ce2f947eb1 Merge branch 'master' into zlib-nobuild 2023-01-31 22:00:49 +01:00
Kim Kulling
b55e29b915 Merge pull request #4901 from AdamCichocki/JoinVerticesProcessUsedVerticesMask 
Optimized usedVertexIndices in JoinVerticesProcess by using bitmask instead of unordered_set
 2023-01-31 21:25:46 +01:00
Kim Kulling
5caae1a86d Merge branch 'master' into JoinVerticesProcessUsedVerticesMask 2023-01-31 21:03:32 +01:00
Kim Kulling
e4c85645c6 Merge pull request #4910 from assimp/kimkulling/ios_remove_deprecated_lib_issue-4906 
Fix: Remove deprecated dependency.
 2023-01-31 21:02:17 +01:00
Kim Kulling
47303c2d28 Fix:Remove deprecated features from iOS build. 2023-01-31 20:41:18 +01:00
Kim Kulling
5c286b8c13 Fix: Remove deprecated dependency. 2023-01-31 20:12:07 +01:00
Kim Kulling
d2d8b84f83 Merge pull request #4880 from krishty/fix-build-without-armaturepopulate-post-process 
Fix Build Without ArmaturePopulate Post Process Step
 2023-01-31 10:23:44 +01:00
Kim Kulling
d6b8d61066 Merge branch 'master' into JoinVerticesProcessUsedVerticesMask 2023-01-30 20:58:21 +01:00
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