Commit Graph

12442 Commits (2521909b8c2a6895eeb838b8aafc65c1777525bc)

Author SHA1 Message Date
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
Jackie9527 437958ef91 bugfix fails to check if point in triangle.
Signed-off-by: Jackie9527 <80555200+Jackie9527@users.noreply.github.com>
2023-02-25 19:40:24 +08:00
Turo Lamminen e8f0eb930d Fix loading binary LWO files 2023-02-24 14:40:27 +02:00
Turo Lamminen 3bdc43a216 Add debug logging to LWO node graph generation 2023-02-24 14:40:27 +02:00
Turo Lamminen 657c1d8ad0 Use unique_ptr to store pivot nodes until moved to mapPivot 2023-02-24 14:40:23 +02:00
Turo Lamminen 3bdfecb0ed Destroy mapPivot nodes as we go 2023-02-24 13:26:34 +02:00
Turo Lamminen be28f0949b Whitespace 2023-02-24 13:20:40 +02:00
Turo Lamminen 53c6cc0966 Add a scope so mapPivot is destroyed when no longer used 2023-02-24 13:19:38 +02:00
Turo Lamminen 92f7c50c91 Remove dead code 2023-02-24 13:18:04 +02:00
Turo Lamminen 28d4e394c0 Use std::unique_ptr a bit 2023-02-24 13:17:32 +02:00
Turo Lamminen bb5a6abae0 Add more LWO files to unit tests 2023-02-24 12:43:06 +02:00
Kim Kulling 46ae8534f7
Merge pull request #4963 from avaneyev/fix-fbx-document-duplicate-id-leak
Fix a leak in FBXDocument when duplicate object IDs are found
2023-02-23 10:53:40 +01:00
Kim Kulling eb73464055
Merge branch 'master' into fix-fbx-document-duplicate-id-leak 2023-02-23 10:39:52 +01:00
Kim Kulling a14696b9ec
Merge pull request #4940 from ockeymm123/master
fix regression in join vertices post process.
2023-02-23 10:39:09 +01:00
Kim Kulling 2c3d52a5a1
Merge branch 'master' into master 2023-02-23 10:15:07 +01:00
Kim Kulling 408c41d687
Merge pull request #4971 from mjunix/patch-2
Fix index out of bounds
2023-02-22 21:47:01 +01:00