Commit Graph

365 Commits (9fb81c3be6dc30139ea32c92046c9794dca0e73e)

Author SHA1 Message Date
Kim Kulling c0ae9b6040 fix invalid check 2020-03-22 14:21:24 +01:00
Kim Kulling 4210318a34
Merge branch 'master' into enable_vs_warning_all 2020-03-15 10:19:49 +01:00
kimkulling 19b40397a9 fix misor findings. 2020-03-11 17:42:10 +01:00
kimkulling 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
kkulling f8757322be fix warnings 2020-03-11 09:43:55 +01:00
Kim Kulling 7e7555a91b fix compiler warnings in tools and test- 2020-03-11 00:43:44 +01: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
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 8c09cd2ef3 Fixed TextureTypeToString defined multiple times.
- Moved TextureTypeToString to it's own file.
- Added new file to CMakeLists.txt.
- Added 6 missing values in TextureTypeToString.
- Added 6 missing aiTextureType enum values in assimp_cmd/Info.cpp.
2020-02-06 13:19:01 -05:00
Marc-Antoine Lortie 2c1c1d846e Renamed WriteDumb.cpp to WriteDump.cpp
This includes as well changes to places referencing WriteDumb.cpp.
2020-01-30 16:40:34 -05:00
Marc-Antoine Lortie ff168d7bc0 Refactored Assxml exporter and dump xml writer.
- Moved AssxmlExporter serialization code in a new file AssxmlFileWriter.cpp/h
- Added new files to CMakeLists.txt
- Replaced string format specifiers %i by %u to match argument type.
- Made a few changes in WriteDumb.cpp to call the new DumpSceneToAssxml function.
2020-01-29 13:44:51 -05:00
Marc-Antoine Lortie 5f30d4c0f8 Added missing cmd writting. 2020-01-28 12:30:09 -05:00
Marc-Antoine Lortie a328c18286 Fixed "printf format not a literal error" in build. 2020-01-28 11:06:17 -05:00
Marc-Antoine Lortie 21edb13ff8 Added missing header for unique_ptr. 2020-01-28 10:55:22 -05:00
Marc-Antoine Lortie 20388d6a4f Refactored Assbin exporter and assimp_cmd binary serialization functions.
- Renamed AssimpExport to AssimpFileWriter.
- Moved AssimpFileWriter to it's own file.
- Added a try catch in WriteBinaryDump to fix a case with memory leak.
- Replaced calls to WriteBinaryDump with AssimpFileWriter.
- Added new AssimpFileWriter files to CMakeLists.txt.
2020-01-28 09:55:05 -05:00
Marc-Antoine Lortie ab284f7996 Fixed enumeral mismatch error in build. 2020-01-26 14:02:16 -05:00
Marc-Antoine Lortie b23c0b0637 Uniformized error codes (return values) in assimp_cmd. 2020-01-26 13:10:21 -05:00
Marc-Antoine Lortie 770c822621 Updated places to achFormatHint referencing array size. 2020-01-23 15:26:49 -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 13586eb073 remove the qt-viewer from the build system. 2019-09-21 18:02:37 +02:00
escherstair c4ce8cec96
prefer prefix ++/-- operators for non-primitive types 2019-09-03 08:02:56 +02:00
Gordon MacPherson fbb34b1de1 ScaleProcess overhauled to improve compatibility with animations and unit conversion.
./assimp Added arguments --gs to assimp command line option to enable global scaling.

No scaling for mScale of 1.0.

Co-Authored-By: K. S. Ernest (iFire) Lee <ernest.lee@chibifire.com>
2019-08-19 17:36:57 +01:00
Kim Kulling cc10967913 Fix the build. 2019-06-11 20:17:50 +02:00
Kim Kulling 85a7f46049
Merge branch 'master' into ParsePostProcessArgs 2019-05-29 00:03:09 +02:00
Rémi Verschelde 5fa750fda0 Fix code files encoding to make them all UTF-8 2019-05-22 10:19:32 +02:00
Alexandre Avenel a60b7696e3 Parse post process arguments when using info tool 2019-05-21 19:39:49 +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
RichardTea 9242a12bf5 Qt5 requires cmake 3.1
Earlier versions are not supported
2019-04-17 09:32:59 +01:00
Charlie Gettys f15f37634d BlenderDNA.h:
* Fix rethrow that would crash the program.
* QUESTION: am I throwing the right exception here.

COBLoader:
* catch exception by const ref
* fix equality checks using strncmp taht weren't actually checking equality

FBXMaterial: Catch exception by const ref (+ Debug log that it's done so)

FBXConverter: Rename local variables to avoid shadowing parameter

ImageExtractor: Remove duplicated/unreachable code

FBXConverter: Another shadowed variable fix

MD5Loader: 2 shadowed variables

IRRLoader: shadowed parameter

StepFileReader.cpp: Shadowed parameter

IRRLoader: remove empty else statement

STLExporter: Throw error instead of silently ignoring unimplemented option

Misc empty blocks removed or debug logging added
2019-03-30 16:08:25 -04:00
kimkulling 61ffe017e8 Fix some coverity findings. 2019-03-14 17:37:28 +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
kimkulling 3f9a25df5a Devil: replace this by header-only lib. 2019-02-07 17:09:05 +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 194b59b3b2
Update Info.cpp
Add a simple check to avoid verbose + silent mode together,
2018-12-22 09:12:10 +01:00
Alexandre Avenel b71b7982b5 Add silent flag to assimp cmd
Add a new command line flag to assimp cmd in order to only display minimal
info when loading a file.

This is especially useful for quick profiling/fuzzing.
2018-12-15 18:07:34 +01:00
Martin Jerabek e8e8578d7f assimp_cmd: fix writing compressed binary assimp format
Also print someting to console when compression fails.
2018-11-26 12:06:08 +01:00
d 95c0deaaff added DropFaceNormals process 2018-10-29 16:23:11 +01:00
Alexandre Avenel b3e858956a Fix #2149 Add flag to embed textures in assimp_cmd 2018-09-21 22:17:12 +02:00
Kim Kulling 0ff4640dcd Remove qt4-support for viewer. 2018-08-19 21:27:08 +02:00
Kim Kulling fe6be58b35 Some cleanups. 2018-08-19 16:51:47 +02:00
Kim Kulling 5a23810d82 Introduce header-only imagelib to make install of qt-viewer simpler. 2018-08-18 11:07:12 +02:00
Kim Kulling e5fa1798f6 closes https://github.com/assimp/assimp/issues/2019: fix the qt-viewer without export. 2018-06-17 20:37:09 +02:00