238 Commits

Author SHA1 Message Date
Kim Kulling
1092f0d94e Fix:Use correct encoding 2023-03-01 21:40:45 +01:00
Krishty
3d3e856925 Trim Trailing Whitespace 2023-01-16 09:12:35 +01:00
Kim Kulling
b3c7bdbdd6 Add check for wall switch from cmake 2022-09-17 18:16:42 +02: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
bfb46ca5ef Fix protocol type. 2022-05-03 17:16:25 +02:00
U-DESKTOP-0R560PH\George
63183a048c Minor updates to ASSIMP Viewer 2022-04-30 08:10:47 -07:00
hgdagon
518d50d2e6 Fixes for Windows/MSYS2 2022-04-07 03:07:57 -07:00
Kim Kulling
50c7301a38 Update copyrights 2022-01-10 21:13:43 +01: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
da0543972b Fix parsing for AMF-Files. 2021-04-03 10:25:03 +02: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
Aaron Franke
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
Marc-Antoine Lortie
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
Marc-Antoine Lortie
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
Kim Kulling
ada4f51d5b Merge branch 'master' into kimkulling_dev 2020-02-16 13:10:41 +01:00
Marc-Antoine Lortie
be4fe131d5 Made changes to write compiled binaries to a common directory.
The following changes were tested with the following projects:

- assimp DLL
- unit tests
- tools/assimp_cmd
- tools/assimp viewer
- samples/SimpleOpenGL
- samples/SimpleTexturedDirectx11
- samples/SimpleTexturedOpenGL

For each program listed above, the results were tested when (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR) is true and false.

Also, the "lib" in SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/lib") was changed to "bin" to allow DLLs to be written to executables/launchables programs directory.
2020-02-15 13:10:11 -05:00
Marc-Antoine Lortie
4e7e47bd43 Updated copyright dates.
Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, assimp team".

Changed copyright end year to 2020 in every reference "Copyright (c) 2006-XXXX, ASSIMP Development Team".

Changed copyright end year to 2020 in LICENCE.rtf.

Changed copyright end year in CMakeFiles.txt files and any other places referencing Assimp with a copyright start and end year.
2020-01-20 08:53:12 -05:00
Kim Kulling
40d882af4f fix irrreader leak. 2020-01-16 20:25:47 +01:00
Kim Kulling
cc10967913 Fix the build. 2019-06-11 20:17:50 +02:00
Rémi Verschelde
5fa750fda0 Fix code files encoding to make them all UTF-8 2019-05-22 10:19:32 +02:00
RichardTea
b515f04ce6 assimp_view is ANSI (MBCS) only
It should really be ported to UNICODE at some point, however I do not have the DirectX9 SDK so cannot confirm whether such a port is working.
2019-04-17 10:48:14 +01:00
kkulling
0dc2e9197a Fix compiler warnings. 2019-03-13 14:40:02 +01:00
Kim Kulling
ae41ae3211 closes https://github.com/assimp/assimp/issues/305': fix viewer 2019-02-18 21:43:45 +01:00
Kim Kulling
1e35ea3bc8 Merge branch 'master' into sec_issues 2019-02-06 11:27:53 +01:00
Kim Kulling
6e39c22554 Fix potential security issues. 2019-02-05 22:05:52 +01:00
Kim Kulling
afb779e59d remove dead code 2019-02-05 00:36:07 +01:00
Kim Kulling
f5ef078834 fix openfiledialog in modelviewer. 2019-02-04 22:15:15 +01:00
kimkulling
4347ce4311 Some more findings. 2019-01-31 17:24:08 +01:00
kimkulling
de02fb2129 Fix review findings. 2019-01-30 16:07:40 +01:00