Commit Graph

218 Commits (658fec3e61cdb5c2eed66b1d6d3747b85d97565d)

Author SHA1 Message Date
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
kimkulling a06133ab52 Update copyrights. 2019-01-30 09:41:39 +01:00
Kim Kulling 3e45acbf4e
Merge branch 'master' into review 2018-06-16 09:10:41 +02:00
Kim Kulling 339cc2e951 Some review findings. 2018-05-31 20:15:13 +02:00
Kim Kulling 1b71c2fd34
Merge branch 'master' into assimpviewer_dev 2018-05-13 10:41:16 +02:00
kimkulling 60d803f490 Some minor fixes of typos and formatting issues. 2018-05-09 09:51:05 +02:00
Jean-Louis 5a5db25df6 Fix AssimpView build
- Use std::min/max instead of min/max macro in windef.h
- Use mmsytem.h instead of timeapi.h with MinGW
2018-05-08 00:28:53 +02:00
kimkulling 8626b185fb Fix misused log macros + compiler warnings. 2018-04-26 16:38:42 +02:00
Kim Kulling b049933d2f update license dates. 2018-01-28 19:42:05 +01:00
Kim Kulling ebaa8be106 fix findings. 2018-01-23 13:02:13 +01:00
Kim Kulling 98c053a9b9 Fix textures 2018-01-23 13:02:03 +01:00
BuildTools 6a76959f5b "s, <s, and >s oh my... 2018-01-06 21:20:45 -08:00
BuildTools 0c4c66be50 I assume too much about header paths... 2018-01-06 21:00:11 -08:00
BuildTools 123fb1d009 ../../code header path oversight fixed 2018-01-06 20:50:01 -08:00
Unknown 12dbbd4ce9 Misc. typos
Some are doxy comments, some are just trivial source comment typos. 
Found using `codespell -q 3 --skip="./contrib" -I ../assimp-whitelist.txt`
whereby whitelist contained:
```
childs
iff
lod
nto
ot
whitespaces
```
2017-11-09 17:19:26 -05:00
Jared Mulconry 059a32654e Addressed warnings generated on MSVC across x86 and x64. 2017-09-24 19:29:43 +10:00
Kim Kulling 9d69a12532 Merge branch 'master' of https://github.com/assimp/assimp 2017-06-01 16:22:25 +02:00
Kim Kulling cab6cdf7b2 Viewer: fix the build. 2017-06-01 16:21:23 +02:00
Kim Kulling a2b8d66a86 Update license info. 2017-05-09 19:57:36 +02:00
Andy Maloney b64882f4c7 Fix spelling 2017-04-11 16:33:13 -04:00
Jared Mulconry 745f754310 Fixed build warnings on MSVC14 x64 in the Message Proc source. 2016-11-20 12:04:50 +11:00