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

11711 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim Kulling
e2fa181aa6 Merge branch 'master' of https://github.com/assimp/assimp 2023-02-14 21:10:12 +01:00
Kim Kulling
bfa19f6900 Merge pull request #4946 from assimp/kimkulling/skeleton-doc 
Add skeleton doc
 2023-02-14 21:08:03 +01:00
Kim Kulling
779912e84e Merge branch 'master' into kimkulling/skeleton-doc 2023-02-13 21:29:32 +01:00
Kim Kulling
bb9b583bcf Merge pull request #4945 from jiannanya/MemoryIOStream-override-mark 
the member 'Flush()' need to be marked as override for msvc clang compiling
 2023-02-13 10:03:51 +01:00
Kim Kulling
156a393b84 Fix a typo 2023-02-10 08:07:09 +01:00
Kim Kulling
bde9a6a3c3 Update mesh.h 2023-02-09 22:36:06 +01:00
Kim Kulling
7b3f70a08b Add skeleton doc 2023-02-09 21:12:21 +01:00
jiannanya
2390822baf Fix: the member function 'Flush()' of class 'MemoryIOStream' need to be marked as override for msvc clang compiling 2023-02-09 21:30:48 +08:00
Kim Kulling
4cf1ee98f6 Merge pull request #4943 from assimp/kimkulling/fix_leak_issue-3416 
Fix: Fix memleak when exiting method by exception
 2023-02-08 22:18:01 +01:00
Kim Kulling
b7d08fc8f2 Fix review findings. 2023-02-08 21:48:55 +01:00
Kim Kulling
b170370e5c Fix: Fix memleak when exiting method by exception 2023-02-08 21:29:54 +01:00
Kim Kulling
6332f8a5bc Merge branch 'master' of https://github.com/assimp/assimp 2023-02-08 19:17:17 +01:00
Kim Kulling
dd6bcecf56 Merge pull request #4941 from assimp/kimkulling/cleanup 
Delete .coveralls.yml
 2023-02-07 20:54:41 +01:00
Kim Kulling
0c05682baf Delete .coveralls.yml 2023-02-07 20:02:06 +01:00
Kim Kulling
b58bec39d9 Merge branch 'NeosSharedProject-fix-artifact' 2023-02-05 13:01:47 +01:00
Kim Kulling
ce7b2e571a Merge branch 'fix-artifact' of https://github.com/NeosSharedProject/assimp into NeosSharedProject-fix-artifact 2023-02-05 13:00:52 +01:00
Kim Kulling
487c03f547 Merge pull request #4935 from IOBYTE/master 
ACLoader: add support for reading more than one texture per object
 2023-02-04 19:28:21 +01:00
Kim Kulling
839cd35a54 Merge branch 'master' into master 2023-02-04 19:08:39 +01:00
Kim Kulling
e6877cf20f Merge pull request #4936 from TinyTinni/issue-4871 
Fixes PLY reader when the header ends with \r\n
 2023-02-04 19:08:12 +01:00
Kim Kulling
e9c95d484e Update IOStreamBuffer.h 2023-02-04 18:36:36 +01:00
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
Robert Reif
88ef9eecc1 ACLoader: add support for reading more than one texture per object 2023-02-03 20:29:56 -05: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