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

12457 Commits (97cbecb859375625fae43059db696a439b159a0c)

Author SHA1 Message Date
Kim Kulling 6e1959f061
Merge pull request #4991 from Jackie9527/1-4489 
upgrade stb_image to v2.28.
 2023-03-10 16:20:36 +01:00
Kim Kulling c9539f67e3
Merge branch 'master' into 1-4489 2023-03-10 16:10:51 +01:00
Florian Born 60cefdd549 Jan's fedback 2023-03-10 12:10:38 +01:00
Kim Kulling e308474163
Merge pull request #5004 from assimp/kimkulling/capi-cleanup 
C-API: Code cleanup
 2023-03-10 11:42:33 +01:00
Kim Kulling ffd222334f
Fix: Remove buggy namespace declaration 2023-03-10 09:00:37 +01:00
Kim Kulling 2f7882cb8d
Update: Small code cleanup 2023-03-10 08:49:58 +01:00
Kim Kulling 63dae0a7f2
Fix: Add security asserts. 2023-03-10 08:48:11 +01:00
Kim Kulling c82a6d05b0
Code cleanup 2023-03-10 08:43:12 +01:00
Florian Born 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
Kim Kulling 0ed957f70a
Merge pull request #4978 from Jackie9527/draco_1.5.6 
upgrade draco to 1.5.6
 2023-03-09 14:09:30 +01:00
Kim Kulling 348e672567
Merge branch 'master' into draco_1.5.6 2023-03-09 13:45:44 +01:00
Turo Lamminen f3767a4eb2 Use unordered_map for subdivision process edge map 2023-03-09 14:33:43 +02:00
Turo Lamminen b534584198 Improve unit tests which load subdivision models 2023-03-09 14:33:43 +02:00
Kim Kulling 980e156251
Merge branch 'master' into draco_1.5.6 2023-03-08 13:52:38 +01:00
Kim Kulling 366243f7ef
Merge pull request #4999 from FlorianBorn71/UseNewMetaDataTypesInFBXConverter 
After Kim's addition to meta data types, use it in the FBX converter
 2023-03-08 11:54:29 +01:00
Kim Kulling 05249353d4
Merge branch 'master' into UseNewMetaDataTypesInFBXConverter 2023-03-08 10:53:00 +01:00
Kim Kulling 8476a2c832
Merge pull request #4994 from urshanselmann/master 
remove debug message from MemoryIOStream
 2023-03-08 10:17:26 +01:00
Kim Kulling 8c9580cfd3
Merge branch 'master' into UseNewMetaDataTypesInFBXConverter 2023-03-07 21:32:37 +01:00
Urs Hanselmann 8fb83af079
Merge branch 'master' into master 2023-03-07 19:45:45 +01:00
Kim Kulling 3a73ce37e4
Merge pull request #4986 from assimp/kimkulling/fix_sample_utf8_encoding 
Fix: Use C++17 compliant utf8 encoding.
 2023-03-07 19:27:06 +01:00
Kim Kulling 4f48348af8 Fix: Move c++ include to c++ section 2023-03-07 18:55:18 +01:00
Florian Born 069b3ecdf8 After Kim's addition to meta data types, use it in the FBX converter 2023-03-07 17:44:48 +01:00
Kim Kulling 44c2785663
Make debug message more professional. 2023-03-07 17:01:08 +01:00
Kim Kulling 5082c940d0 Fix: Replace back_inserter usage. 2023-03-06 21:13:40 +01:00
Kim Kulling 8171e041fa Update utf82utf16. 2023-03-06 20:56:09 +01:00
Kim Kulling c089f11768 Update utf82utf16. 2023-03-06 19:56:11 +01:00
Kim Kulling c305b50f13
Merge branch 'master' into draco_1.5.6 2023-03-05 18:44:26 +01:00
Urs Hanselmann dcb89cf107 fix scan_printf script error code handling 2023-03-04 15:00:43 +01:00
Urs Hanselmann 2efd48dee2 disable another debug print message 2023-03-04 14:53:48 +01:00
Urs Hanselmann 4fa433c8ff improve scan_printf ci script error message 2023-03-04 14:52:49 +01:00
Urs Hanselmann 1520aff680 fix scan_printf script in linux bash 2023-03-04 14:41:10 +01:00
Urs Hanselmann 74c406dd26 add ci script to scan for unexpected printf statements 2023-03-04 14:27:58 +01:00
Jackie9527 424f53b4d6 bugfix remove duplicated data. 
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
 2023-03-04 16:25:56 +08:00
Urs Hanselmann 011382424b remove debug message from MemoryIOStream (used by public Importer::ReadFileFromMemory method) 2023-03-03 19:31:50 +01:00
Kim Kulling 7916f87404
Merge branch 'master' into kimkulling/fix_sample_utf8_encoding 2023-03-02 23:35:54 +01:00
Jackie9527 a0c29202be Add build options to fix issues with clang 15. 
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
 2023-03-02 21:12:35 +08:00
Jackie9527 02a4276924 upgrade stb_image to v2.28. 
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
 2023-03-02 09:11:54 +08:00
Kim Kulling 6ed433d011
Merge pull request #4989 from Jackie9527/SimpleTexturedDirectx11-build-error-with-VS2022 
Fix build error when building SimpleTexturedDirectx11 with VS2022.
 2023-03-01 22:21:33 +01:00
Kim Kulling b82c193dfd Merge branch 'kimkulling/fix_sample_utf8_encoding' of https://github.com/assimp/assimp into kimkulling/fix_sample_utf8_encoding 2023-03-01 21:41:28 +01:00
Kim Kulling 1092f0d94e Fix:Use correct encoding 2023-03-01 21:40:45 +01:00
Jackie9527 09dd0d0c2e Fix build error when building SimpleTexturedDirectx11 with VS2022. 
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
 2023-03-01 15:08:02 +08:00
Jackie9527 f7f54036f2 bugfix the three vertices are collinear when converting a polygon to a triangle. 
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
 2023-03-01 14:26:04 +08:00
Jackie9527 39efe4c832 upgrade draco to 1.5.6 
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
 2023-03-01 09:43:40 +08:00
Kim Kulling 534ee288c5
Update UTFConverter.h 2023-02-28 23:28:24 +01:00
Kim Kulling 60da5e7e96
Update UTFConverter.cpp 2023-02-28 23:27:46 +01:00
Kim Kulling 7f2760fe2f
Merge branch 'master' into kimkulling/fix_sample_utf8_encoding 2023-02-28 21:54:35 +01:00
Kim Kulling a1aace74e5 Fix: Use C++17 compliant utf8 encoding. 2023-02-28 21:53:18 +01:00
FeeshWyvern f9fcf33aaa Bug fix: We should not be accessing `mPrivate` according to structs.Scene and fixes a crash when `mPrivate` points to invalid data. 2023-02-27 20:06:05 -08:00
FeeshWyvern 94d9773548 Bug fix: Correctly set the name of the attributes. PR #3940 did not seem to update in Master? 2023-02-27 20:02:34 -08:00
Kim Kulling 90333340d6
Merge pull request #4977 from turol/lwo-fixes 
LWO fixes
 2023-02-27 16:10:27 +01:00