Commit Graph

417 Commits

Author SHA1 Message Date
Turo Lamminen
219dbbd4af Fix crash of "assimp info" with no parameters 2022-08-17 11:42:32 +03:00
Kim Kulling
4aaa807704 Add dot only when the extension is not empty. 2022-08-06 18:37:12 +02:00
Koekto-code
d109db152c Use winresrc.h for mingw 2022-07-09 15:32:24 +03:00
hgdagon
cd9f417b84 Merge branch 'master' into assimp_resource 2022-05-10 23:19:36 +04: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
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
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
U-DESKTOP-0R560PH\George
63183a048c Minor updates to ASSIMP Viewer 2022-04-30 08:10:47 -07:00
U-DESKTOP-0R560PH\George
94ebe71969 Resource script updates 2022-04-30 08:01:15 -07:00
hgdagon
518d50d2e6 Fixes for Windows/MSYS2 2022-04-07 03:07:57 -07:00
Sergio Acereda
a2543e7151 Add properties information on assimp info command line 2022-03-04 17:09:29 +01:00
Sergio Acereda
a1e03e3481 clang-format 2022-03-04 14:31:06 +01:00
Kim Kulling
50c7301a38 Update copyrights 2022-01-10 21:13:43 +01:00
Kim Kulling
d44641398f Add console progresshandler 2021-12-26 11:16:02 +01:00
Kim Kulling
36c937cc19 Merge branch 'master' into debian-fixes 2021-10-18 09:07:47 +02:00
Kim Kulling
4caae783ae Disable dump when export is not supported. 2021-10-17 15:09:44 +02:00
IOhannes m zmölnig
3b8126d26a Fix spelling mistake 2021-10-08 08:48:01 +02:00
Kim Kulling
df739f00dd Merge branch 'master' into issue_3398 2021-08-28 13:56:50 +02:00
Kim Kulling
3e090b21f5 Fix setup of embedded texture loading 2021-08-28 13:33:25 +02:00
Kim Kulling
4b1ff645e3 closes https://github.com/assimp/assimp/issues/3398: Add support for embedded textures 2021-08-12 21:13:07 +02:00
Krishty
758116b083 removed trailing spaces and tabs from source and text
This commit ignores the “contrib” folder in order to prevent merge conflicts in dependencies, should these be updated via git.
2021-07-29 13:28:51 +02:00
Kim Kulling
0a48a35382 closes https://github.com/assimp/assimp/issues/3971: fix wrong dependency 2021-06-29 21:22:22 +02:00
Kim Kulling
77ce4080b6 fix viewer in case of unknown primitives. 2021-05-30 21:54:04 +02:00
Jason C
200086c4c5 [assimp_view] Make sure ctype calls use unsigned char.
Addresses https://github.com/assimp/assimp/issues/3867 and then some.
2021-05-04 17:31:46 -04:00
Kim Kulling
0b14eb7523 Fix formatter. 2021-04-23 15:30:12 +02:00
Kim Kulling
cdb6a62cdb Merge branch 'master' into issue_3678 2021-04-03 10:27:07 +02:00
Kim Kulling
da0543972b Fix parsing for AMF-Files. 2021-04-03 10:25:03 +02:00
jaefunk
a812fd1a0a can modify the rotation of the model when exporting. 2021-03-15 10:23:17 +09:00
jaefunk
37c2d33cc9 Merge branch 'master' into export_with_rotation 2021-03-14 15:32:46 +09:00
jaefunk
16f10a0533 remove debug log 2021-03-12 10:27:33 +09:00
ethan
b6dced4b11 export with rotation 2021-03-10 18:06:42 +09:00
Kim Kulling
6c89631581 closes https://github.com/assimp/assimp/issues/3678: ensure lowercase 2021-03-09 21:08:28 +01:00
Kim Kulling
9e8dbd0ca5 Update copyrights to 2021. 2021-02-28 12:17:54 +01:00
Kim Kulling
79eb9ecc86 Update all minimum cmake req to 3.10 2021-01-29 21:05:46 +01:00
Biswapriyo Nath
c65f2cb3fb Remove extra semicolon while GCC being pedantic. 2020-12-13 00:12:44 +05:30
Marc-Antoine Lortie
11daed69d3 Fixed overwriting of CMake global output directory variables. 2020-08-07 16:04:39 -04:00
Kim Kulling
c82f8c0b8f Remove duplicated code
closes https://github.com/assimp/assimp/issues/3183
2020-05-25 20:38:12 +02:00
kimkulling
a1bcca2c99 remove step prototype: does not work this way. 2020-05-07 14:00:40 +02:00
kkulling
4e16716924 Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting 2020-05-05 10:17:52 +02:00
Kim Kulling
f8e6512a63 Move format importer and exporter into its won folder. 2020-05-02 15:14:38 +02:00
Kim Kulling
79af2b1a5c Merge branch 'master' into kimkulling_dev 2020-04-09 19:55:45 +02:00
Marc-Antoine Lortie
3510d85967 Replaced NULL with nullptr for pointers in Assimp viewer. 2020-04-07 10:56:22 -04:00
Kim Kulling
a73fd6c84c Update MessageProc.cpp
I guess Turol meant this change.
2020-04-04 18:24:19 +02:00
Marc-Antoine Lortie
1b0a0675dc Applied review requested changes - renamed _data to data. 2020-04-04 10:32:29 -04:00
Marc-Antoine Lortie
1cb564aa4b Fixed /W4 compile warnings in Assimp viewer. 2020-04-03 14:36:44 -04:00
Kim Kulling
6f8d96b57e Merge branch 'master' into kimkulling_dev 2020-03-23 09:00:41 +01:00
Kim Kulling
c0ae9b6040 fix invalid check 2020-03-22 14:21:24 +01:00