Commit Graph

303 Commits

Author SHA1 Message Date
Andy Maloney
046f50880f {cmake} Prefix assimp options with "ASSIMP_" to avoid pollution when included as a submodule
When libraries are included as submodules in large projects, having an option with a generic name like "BUILD_DOCS" is not very helpful. (e.g. one project I work on includes many libraries as submodules)

It can also clash with options from other libraries which can break things.
2020-03-23 12:35:32 -04:00
Kim Kulling
4210318a34 Merge branch 'master' into enable_vs_warning_all 2020-03-15 10:19:49 +01:00
Kim Kulling
02e5698a38 fix linker issues. 2020-03-09 22:49:32 +01:00
kimkulling
f3b6b78d4d small refactorings. 2020-03-09 10:55:32 +01:00
Adrian Iusca
919ae489fc Merge branch 'master' into master 2020-02-25 23:32:31 +02: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
iamAdrianIusca
f28b087d16 small improvements in the CMakeLists.txt file
If ASSIMP_NO_EXPORT is not defined:
- don't add the macro for the exporters
- don't include the files for all the exporter
- don't display any messages about what exporters are enabled or not
2020-02-21 20:17:38 +02: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
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
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
RichardTea
4337c07e4b Remove explicit setting of macos install_name
Use CMake default behaviour for libassimp

Fixes #2961
2020-01-27 17:08:56 +00: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
RichardTea
ae7a0aa6ef Merge branch 'master' into collada_modeller_metadata 2020-01-02 13:25:04 +00:00
Marc-Antoine Lortie
eed0bd3ef6 Added support to load Half-Life 1 MDL files.
Added code to use Half-Life 1 MDL loader in MDLLoader.cpp.
Added Half-Life 1 MDL loader files to CMakeLists.
Added new options in config.h to use with Half-Life 1 MDL loader.
2019-12-16 10:26:46 -05:00
RichardTea
f498a395e4 Add common metadata to Collada
Also add AI_METADATA_SOURCE_COPYRIGHT common metadata
2019-12-09 14:05:41 +00:00
RichardTea
e668eead19 Some cleanup of M3D support
Wrap the m3d.h header
Note: C++11 support required to use in a threaded environment
Fix export memory leak (although exporter apopears to be unused)
Apply clangformat.
2019-12-03 12:56:21 +00:00
Zoltan Baldaszti
dda46f5f4d Merge branch 'master' into master 2019-11-02 01:14:04 +01:00
bzt
0baec5f0bd Added M3D format support 2019-10-29 14:14:00 +01:00
RevoluPowered
46cdd81d75 Added ArmaturePopulate scale process for all formats 2019-10-27 14:16:39 +00:00
kimkulling
3f38011e86 Fix filter for vs for public headers. 2019-10-11 13:41:13 +02:00
kimkulling
33af183bb8 Cleanup the public headers. 2019-10-11 13:27:36 +02:00
kimkulling
7ff7a5d64e glTF: Try to remove duplicate code. 2019-09-11 17:00:39 +02:00
Kim Kulling
090e896ebf Merge branch 'master' into collada_zae 2019-08-06 21:22:02 +02:00
RichardTea
7fc4cf1552 ASSIMP_BUILD_NO_*_EXPORTER
Full fix for #2557

These macros should be all-caps.
Correct the cmakelists
2019-07-26 22:17:24 +01:00
RichardTea
3016f3a725 Convert Q3BSP Importer to use ZipArchiveIOSystem
Removes duplication, handles large files better
2019-07-25 10:13:53 +01:00
Kim Kulling
41ea607739 Merge branch 'master' into collada_zae 2019-07-20 14:12:18 +02:00
RichardTea
8636d5607c Add ZipArchiveIOSystem to CMake 2019-07-12 11:35:43 +01:00
Kim Kulling
8bf1b9ac5e Update CMakeLists.txt
remove jtimporter
2019-07-11 22:29:30 +02:00
kkulling
b463ddd399 closes https://github.com/assimp/assimp/issues/340: start integrating assimp2json. 2019-07-11 17:37:31 +02:00
Kim Kulling
96f16c7aea closes https://github.com/assimp/assimp/issues/2527: use correct macro for Assimp-exporter. 2019-07-02 19:48:53 +02:00
Kim Kulling
0f66a917e5 Add unittest. 2019-06-24 21:37:53 +02:00
Kim Kulling
26bd54ae0b PostProcesswing: add gen-aabb process to postprocessing. 2019-06-23 20:24:32 +02:00
Rahul Sheth
6c33374491 update install interface location 2019-06-13 22:08:34 -07:00
Rahul Sheth
d00f4f4b3a Build Hunter-compatible config file 2019-06-13 21:34:47 -07:00
Rahul Sheth
a4587e8609 Use hunter to download dependencies if HUNTER_ENABLED is ON 2019-06-13 21:31:24 -07:00
Kim Kulling
ba29b8f1da Merge branch 'master' into patch-1 2019-06-13 13:41:40 +02:00
Kim Kulling
a6e3fc3fd9 Fix case-sensitive folder name for unix platforms. 2019-06-11 20:54:01 +02:00
Kim Kulling
cc10967913 Fix the build. 2019-06-11 20:17:50 +02:00
PK
d448b49ae1 fixed MSVC toolset versions >140
according to https://cmake.org/cmake/help/latest/variable/MSVC14.html the use of the MSVC** flags is deprecated, this change uses the encouraged MSVC_VERSION variable.
2019-06-11 15:16:53 +02:00
Kim Kulling
2da3a38d60 Fix the compile pass, still unresolved symbols. 2019-06-10 23:26:00 +02:00
Kim Kulling
2d985b92c9 Fix references in cmake file. 2019-06-09 18:43:56 +02:00
Kim Kulling
b03b3b9c03 Initial parsing for header and more. 2019-05-24 17:22:54 +02:00
Kim Kulling
81f8ebf2d4 Merge branch 'master' into kimkulling-2449 2019-05-16 17:04:09 +02:00
Kim Kulling
815730c92d Update CMakeLists.txt
closes https://github.com/assimp/assimp/issues/2449: fix uwp handling
2019-05-13 21:49:50 +02:00
Jack Andersen
cb0c47764a Set directory and name properties for installing static lib PDB 2019-05-11 12:11:52 -10:00
Kim Kulling
e108b6f1d2 Merge branch 'master' into fix-mingw-debug-build 2019-05-01 17:04:45 +02:00
RichardTea
836801d37e CMake updates for VS2015/cmake 3.12 onwards
cmake 3.12 adds MSVC_TOOLSET_VERSION to define the version of MSVC toolchain in use
Use that if present instead of if-elseif chain
2019-04-17 09:32:24 +01:00
Charlie Gettys
f7384dec95 Possible fix for #2406. Shouldn't affect other compiled files, but have
not verified this. Also, if anyone tries to debug StepFileGen1.cpp on MinGW,
the debug info may not be there, but I think this is the best we can do.
2019-04-10 09:45:31 -04:00
RichardTea
2a3626577f Merge pull request #2 from assimp/master
Update to Assimp Master 0973f50
2019-04-08 14:06:36 +01:00
Kim Kulling
010afeb1d8 Merge branch 'master' into issue_1650 2019-04-04 12:42:21 +02:00