f86700f6f4
Merge branch 'master' into assimp_resource
2022-05-04 02:12:08 +04:00
1d3d5c4bb6
Rename TextureTypeToString() to aiTextureTypeToString()
...
Closes: https://github.com/assimp/assimp/issues/4493
2022-05-01 13:27:42 +02:00
94ebe71969
Resource script updates
2022-04-30 08:01:15 -07:00
518d50d2e6
Fixes for Windows/MSYS2
2022-04-07 03:07:57 -07:00
a2543e7151
Add properties information on assimp info command line
2022-03-04 17:09:29 +01:00
a1e03e3481
clang-format
2022-03-04 14:31:06 +01:00
50c7301a38
Update copyrights
2022-01-10 21:13:43 +01:00
d44641398f
Add console progresshandler
2021-12-26 11:16:02 +01:00
36c937cc19
Merge branch 'master' into debian-fixes
2021-10-18 09:07:47 +02:00
4caae783ae
Disable dump when export is not supported.
2021-10-17 15:09:44 +02:00
3b8126d26a
Fix spelling mistake
2021-10-08 08:48:01 +02:00
df739f00dd
Merge branch 'master' into issue_3398
2021-08-28 13:56:50 +02:00
3e090b21f5
Fix setup of embedded texture loading
2021-08-28 13:33:25 +02:00
4b1ff645e3
closes https://github.com/assimp/assimp/issues/3398 : Add support for embedded textures
2021-08-12 21:13:07 +02:00
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
0a48a35382
closes https://github.com/assimp/assimp/issues/3971 : fix wrong dependency
2021-06-29 21:22:22 +02:00
77ce4080b6
fix viewer in case of unknown primitives.
2021-05-30 21:54:04 +02:00
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
0b14eb7523
Fix formatter.
2021-04-23 15:30:12 +02:00
cdb6a62cdb
Merge branch 'master' into issue_3678
2021-04-03 10:27:07 +02:00
da0543972b
Fix parsing for AMF-Files.
2021-04-03 10:25:03 +02:00
a812fd1a0a
can modify the rotation of the model when exporting.
2021-03-15 10:23:17 +09:00
37c2d33cc9
Merge branch 'master' into export_with_rotation
2021-03-14 15:32:46 +09:00
16f10a0533
remove debug log
2021-03-12 10:27:33 +09:00
b6dced4b11
export with rotation
2021-03-10 18:06:42 +09:00
6c89631581
closes https://github.com/assimp/assimp/issues/3678 : ensure lowercase
2021-03-09 21:08:28 +01:00
9e8dbd0ca5
Update copyrights to 2021.
2021-02-28 12:17:54 +01:00
79eb9ecc86
Update all minimum cmake req to 3.10
2021-01-29 21:05:46 +01:00
c65f2cb3fb
Remove extra semicolon while GCC being pedantic.
2020-12-13 00:12:44 +05:30
11daed69d3
Fixed overwriting of CMake global output directory variables.
2020-08-07 16:04:39 -04:00
c82f8c0b8f
Remove duplicated code
...
closes https://github.com/assimp/assimp/issues/3183
2020-05-25 20:38:12 +02:00
a1bcca2c99
remove step prototype: does not work this way.
2020-05-07 14:00:40 +02:00
4e16716924
Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting
2020-05-05 10:17:52 +02:00
f8e6512a63
Move format importer and exporter into its won folder.
2020-05-02 15:14:38 +02:00
79af2b1a5c
Merge branch 'master' into kimkulling_dev
2020-04-09 19:55:45 +02:00
3510d85967
Replaced NULL with nullptr for pointers in Assimp viewer.
2020-04-07 10:56:22 -04:00
a73fd6c84c
Update MessageProc.cpp
...
I guess Turol meant this change.
2020-04-04 18:24:19 +02:00
1b0a0675dc
Applied review requested changes - renamed _data to data.
2020-04-04 10:32:29 -04:00
1cb564aa4b
Fixed /W4 compile warnings in Assimp viewer.
2020-04-03 14:36:44 -04:00
6f8d96b57e
Merge branch 'master' into kimkulling_dev
2020-03-23 09:00:41 +01:00
c0ae9b6040
fix invalid check
2020-03-22 14:21:24 +01:00
1529f9518f
Make file formatting comply with POSIX and Unix standards
...
UTF-8, LF, no BOM, and newlines at the end of files
2020-03-21 02:34:12 -04:00
4210318a34
Merge branch 'master' into enable_vs_warning_all
2020-03-15 10:19:49 +01:00
19b40397a9
fix misor findings.
2020-03-11 17:42:10 +01:00
69551e81ed
Merge branch 'enable_vs_warning_all' of https://github.com/assimp/assimp into enable_vs_warning_all
2020-03-11 10:15:25 +01:00
f8757322be
fix warnings
2020-03-11 09:43:55 +01:00
7e7555a91b
fix compiler warnings in tools and test-
2020-03-11 00:43:44 +01:00
957abaa15a
Raised minimum CMake version to 3.0 for assimp_cmd and assimp_view.
...
This is a follow-up to PR #3024 , in which I explained that I would then change the version of CMake to 3.0 in several files to match the changes that were originally made by OP in PR #3008 .
The minimum CMake version have been raised to 3.0 in both assimp_cmd and assimp_view projects.
The same CMake configuration as in PR #3024 was used. All projects from PR #3024 are found in the solution with the current changes. All projects built. All tests were run.
2020-02-26 08:00:49 -05:00
edfaaed56f
Removed uneeded expression in else() and endif() constructs.
...
The following changes were tested against building with a master copy.
For a more detailed report, please read the followings below:
The flags that were checked were the ones checked by default + the following:
ASSIMP_BUILD_ASSIMP_VIEW
ASSIMP_BUILD_SAMPLES
The list of compilable projects in Visual Studio were the following:
- assimp
- assimp_cmd
- assimp_simpleogl
- assimp_simpletextureddirectx11
- assimp_simpletexturedogl
- assimp_viewer
- INSTALL
- IrrXML
- uninstall
- unit
- UpdateAssimpLibsDebugSymbolsAndDLLs
- ZERO_CHECK
- zlib
- zlibstatic
The solution that was generated with the new changes comprised the same number of projects as the one from the master, unmodified. All projects except UpdateAssimpLibsDebugSymbolsAndDLLs were built without any error. All tests were run.
UpdateAssimpLibsDebugSymbolsAndDLLs could not be built because of the reasons explained in issue #3004 .
2020-02-23 07:09:35 -05:00
ada4f51d5b
Merge branch 'master' into kimkulling_dev
2020-02-16 13:10:41 +01:00
hgdagon
IOhannes m zmölnig
Sergio Acereda
Kim Kulling
Kim Kulling
IOhannes m zmölnig
Krishty
Jason C
jaefunk
ethan
Biswapriyo Nath
Marc-Antoine Lortie
kkulling
Aaron Franke
Marc-Antoine Lortie