Commit Graph

11598 Commits (288d49b7219e34c6b29ade936ff369b94cbc7450)

Author SHA1 Message Date
Kim Kulling 58af6ba9db
Fix compier warning 2022-05-14 09:59:07 +02:00
Kim Kulling deb1698cbe
Fixed formattings. 2022-05-14 09:56:38 +02:00
motazmuhammad 78dbef8711
Merge branch 'master' into master 2022-05-13 20:15:55 +01:00
motazmuhammad 36d730fc4e add more comments 2022-05-13 20:10:19 +01:00
motazmuhammad 5d8b1649a4 Revert "use unordered_set to accelerate the vertix merging"
This reverts commit 0ffb91fbf1.
2022-05-13 19:59:16 +01:00
Kim Kulling 1b3e9e4e01 Add testmodel 2022-05-13 19:44:14 +02:00
Kim Kulling e284fe67b8 Adapt file for skeleton unittest 2022-05-13 19:43:46 +02:00
motazmuhammad 0ffb91fbf1 use unordered_set to accelerate the vertix merging 2022-05-13 18:14:49 +01:00
Kim Kulling f44a94e118
Merge pull request #4510 from hgdagon/assimp_resource
[Feedback needed]Resource script updates
2022-05-12 11:30:39 +02:00
Kim Kulling 9e4fc9a40c
Merge branch 'master' into assimp_resource 2022-05-12 10:38:03 +02:00
Kim Kulling 16b7b35b04
Merge pull request #4484 from RedSkittleFox/MMD_Fixes
MMD (pmx) fixes
2022-05-12 10:36:40 +02:00
Kim Kulling 0f780fe141
Merge branch 'master' into MMD_Fixes 2022-05-12 10:00:00 +02:00
Kim Kulling eeb524a76b
Merge pull request #4525 from Skylion007/skylion007/assimp-perf-clang-tidy
Clang-Tidy performance fixes (make values const-ref where needed).
2022-05-12 09:56:19 +02:00
Aaron Gokaslan 787fcc160a Clang-Tidy performance fixes 2022-05-11 14:03:45 -04:00
hgdagon cd9f417b84
Merge branch 'master' into assimp_resource 2022-05-10 23:19:36 +04:00
Kim Kulling ff43768d24
Merge pull request #4524 from assimp/kimkulling/update-readme
Add badge to show open issue in percentage
2022-05-10 10:00:01 +02:00
Kim Kulling 31c9a8b0ed
Add badge to show open issue in percentage 2022-05-10 09:15:57 +02:00
Kim Kulling 6c943471f9
Merge pull request #4511 from hgdagon/assimp_viewer
[Fedback needed]Minor updates to ASSIMP Viewer
2022-05-09 21:33:33 +02:00
hgdagon 7338833f3b
Merge branch 'master' into assimp_viewer 2022-05-07 18:04:18 +04:00
hgdagon 85d47dc359
Merge branch 'master' into assimp_resource 2022-05-07 18:03:44 +04:00
Kim Kulling 25118d230e
Merge pull request #4509 from hgdagon/assimp_warnings_as_errors
Add an option to treat warnings as errors
2022-05-06 19:41:06 +02:00
Kim Kulling 39f5b723f3
Merge branch 'master' into assimp_warnings_as_errors 2022-05-06 19:28:17 +02:00
Kim Kulling 1f68f66162
Merge pull request #4514 from ALittleStardust/master
Update pugixml dependency to  v1.12.1
2022-05-06 13:43:58 +02:00
ALittleStardust 7bda8b7a77
Updated pugixml to version 1.12.1 2022-05-06 13:39:05 +07:00
hgdagon f86700f6f4
Merge branch 'master' into assimp_resource 2022-05-04 02:12:08 +04:00
hgdagon 1c2caec2bd
Reverted copyright text back to static text
Windres handles it just fine, with the intended result, but RC doesn't seem to like it.
2022-05-03 14:45:24 -07:00
hgdagon 26ab3ce480
Update assimp_view.rc
Removed dead link and updated copyright string in the About dialog.
2022-05-03 14:16:51 -07:00
hgdagon e59326a738
Merge branch 'master' into assimp_viewer 2022-05-04 00:44:53 +04:00
hgdagon 936cc791f2
Move `ASSIMP_WARNINGS_AS_ERRORS` check 2022-05-03 13:01:20 -07:00
hgdagon e1f0f50010
Update CMakeLists.txt 2022-05-03 12:57:45 -07:00
hgdagon 18bfbaeee1
Actually set `ASSIMP_WARNINGS_AS_ERRORS` to ON by default
Whoops....
2022-05-03 12:31:09 -07:00
hgdagon e97e7574ae
Merge branch 'master' into assimp_warnings_as_errors 2022-05-03 23:24:52 +04:00
hgdagon 4faae3d0e9
Updated build options in Build.md 2022-05-03 12:24:34 -07:00
hgdagon 209c302f56
Merged `ASSIMP_WARNINGS_AS_ERRORS` and `ASSIMP_WARNINGS_MAX`
And set it ON by default.
2022-05-03 12:23:33 -07:00
Kim Kulling abfb26ab6f
Merge pull request #4508 from hgdagon/master
Fixed library names for MinGW/MSYS2
2022-05-03 17:48:22 +02:00
Kim Kulling 3dd2dbd916
Merge branch 'master' into master 2022-05-03 17:19:06 +02:00
Kim Kulling f4b1a23010
Merge branch 'master' into assimp_viewer 2022-05-03 17:18:05 +02:00
Kim Kulling bfb46ca5ef
Fix protocol type. 2022-05-03 17:16:25 +02:00
Kim Kulling e8abb0fc1c
Merge pull request #4512 from umlaeute/aiTextureTypeToString
Rename TextureTypeToString() to aiTextureTypeToString()
2022-05-02 10:14:41 +02:00
IOhannes m zmölnig 1d3d5c4bb6 Rename TextureTypeToString() to aiTextureTypeToString()
Closes: https://github.com/assimp/assimp/issues/4493
2022-05-01 13:27:42 +02:00
Kim Kulling d5c798f325 Fix leak 2022-04-30 21:02:48 +02:00
hgdagon bf32c4c408
Fixed `ASSIMP_WARNINGS_MAX` reference 2022-04-30 08:40:48 -07:00
U-DESKTOP-0R560PH\George a7e2b3ad30 Fixed library names for MinGW/MSYS2 2022-04-30 08:14:16 -07:00
U-DESKTOP-0R560PH\George 63183a048c Minor updates to ASSIMP Viewer 2022-04-30 08:10:47 -07:00
U-DESKTOP-0R560PH\George 694dc8a0c3 Add an option to treat warnings as errors 2022-04-30 08:08:34 -07:00
U-DESKTOP-0R560PH\George 94ebe71969 Resource script updates 2022-04-30 08:01:15 -07:00
Kim Kulling 64a6968254 Add skeleton generation to aiScene 2022-04-28 21:43:02 +02:00
Kim Kulling 0afb594f40 Generate container for skeleton during FBX-Import 2022-04-28 21:19:10 +02:00
Kim Kulling 6cdd1d3cc6 Generate container for skeleton during FBX-Import 2022-04-28 21:12:26 +02:00
Kim Kulling 461370946c
Merge pull request #4506 from assimp/kimkulling/remove_deprecated_readme_issue4505
Delete README
2022-04-28 10:41:37 +02:00