Commit Graph

354 Commits (fd5d1211f9aa4012127d6a92370fa00f4c49ffe2)

Author SHA1 Message Date
kimkulling f3b6b78d4d small refactorings. 2020-03-09 10:55:32 +01:00
Kim Kulling 03182c21b8 xml-migration amf - next steps. 2020-02-26 22:19:42 +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
Kim Kulling 02df65d541
Merge branch 'master' into pugi_xml 2020-01-28 13:13:47 +01: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
Kim Kulling 02acb3f8c2 Merge branch 'master' into pugi_xml 2020-01-23 21:26:04 +01:00
Kim Kulling a905303764 IrrXml: replaced irrXml by pugixml. 2020-01-23 21:16:10 +01: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
Charlie Gettys 4efa3736ba Actually fix cmake this time 2019-03-27 12:03:39 -04:00
Charlie Gettys d718793163
Fix change to CMakeLists.txt
change CMakeLists.txt to use add_definitions instead of add_compile_definitions on old versions of cmake
2019-03-27 11:43:21 -04:00
Charlie Gettys 769dd42b73
Add compile definition to fix issue
defines MINIZ_USE_UNALIGNED_LOADS_AND_STORES to be 0 to override default of 1 for x86 platforms.
2019-03-27 11:29:40 -04:00
Andy Maloney df6d257633 Fix 3MF importer 2019-03-16 11:55:16 -04:00
Andy Maloney 5ccd7d8c39 Adds a way to select which exporters you want to compile
Mimics the ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT / ASSIMP_BUILD_XXX_IMPORTER code but for exporters.

This works exactly the same way with one exception - ASSIMP_NO_EXPORT still overrides everything and turns off all exporting.

Fixes #2377
2019-03-16 11:40:17 -04:00
Kim Kulling ba6a7383b2 closes https://github.com/assimp/assimp/issues/1650: build irrXml as shared lib. 2019-03-16 09:45:21 +01:00
Rich ard 3a610d3d66 Embed version information under Windows 2019-03-08 15:49:18 +00:00
Marc-Anton Boehm-von Thenen 4d0740a120 [Issue_2340] Proper closing endif()... 2019-02-18 14:15:39 +01:00
Marc-Anton Boehm-von Thenen a94c8bf3f6 [Issue_2340] Wrong precondition layout... missed ANDROID=ON and ASSIMP_ANDROID_JNIIOSYSTEM=OFFvalid constellation 2019-02-18 14:14:27 +01:00
Marc-Anton Boehm-von Thenen c3129e55d2 [Issue_2340] Added ASSIMP_ANDROID_JNIIOSYSTEM precheck to only remain set to ON in proper ANDROID enabled toolchain environment 2019-02-18 14:10:32 +01:00
kimkulling a06133ab52 Update copyrights. 2019-01-30 09:41:39 +01:00
Kim Kulling a04b96ef66 Disable step. 2019-01-20 20:29:23 +01:00
rickomax 35a044bda3 Various additions/fixes (FBX blend-shapes support added)
Added animMesh name assignment at ColladaLoader
Fixed animMesh post-processing on ConvertToLhProcess (blend-shapes weren't being affected by post-processing)
Added WindowsStore define. This is used to change some incompatible WinRT methods
Added FBX blend-shapes and blend-shapes animations support
Added Maya FBX specific texture slots parsing
Added extra FBX metadata parsing
Added GLTF2 vertex color parsing
Fixed IFC-Loader zip-buffer reading rountine
Fixed OBJ file parsing line-breaker bug
Fixed IOStreamBuffer cache over-read bug
Added mName field to aiAnimMesh
Reverted EmissiveFactor, TransparencyFactor and SpecularFactor assignment on FBXConverter. Really, the commit #817 breaks a lot of old code.
2019-01-06 16:37:30 -02:00
sfalexrog af323de741 Use ADD_ASSIMP_IMPORTER for STEP importer 2018-12-04 23:28:50 +03:00
sfalexrog 30d3c8c6a3 Fix CMake target alias typo 2018-12-03 23:22:34 +03:00
Kim Kulling 02359ea369 closes https://github.com/assimp/assimp/issues/2202: put STEPParser out of IFC importer. 2018-11-25 12:00:51 +01:00
d 6d1dee606a integrated DropFaceNormals process (cmake, poststepregistry) 2018-10-29 16:26:50 +01:00
Kim Kulling e84ccaea15 Merge branch 'master' into step-import 2018-10-07 16:22:32 +02:00
Kim Kulling 619e09fbec Stepfile: separate generated code. 2018-10-06 08:45:55 +02:00
Kim Kulling aceaecaed7 StepFile: introduce generated parser code. 2018-10-05 19:41:52 +02:00
dormon b43cf92337 Improved cmake configs for Windows and Linux.
Now the configs follows the standard cmake-package code: see https://cmake.org/cmake/help/v3.12/manual/cmake-packages.7.html

Downstreamer no longer have to manually specify target_include_directories with ${ASSIMP_INCLUDE_DIRS}, target_link_libraries with ${ASSIMP_LIBRARY_DIRS} and so on.

Downstreamer can now use:
find_package(assimp CONFIG REQUIRED)
target_link_libraries(AWESOME_APP PUBLIC assimp::assimp)
and everything should work.

Added assimpTargets.cmake.in
Added assimpTargets-debug.cmake.in
Added assimpTargets-release.cmake.in
Modified CMakeLists.txt
Modified code/CMakeLists.txt - added ALIAS assimp::assimp

Tested on Ubuntu 18.04 and Windows 10
2018-09-30 17:18:18 +02:00
Kim Kulling c75bc99902 Step-Importer: introduce new files. 2018-08-26 19:05:21 +02:00
Seb Bro cb1fc76859
Add TARGET_INCLUDE_DIRECTORIES for assimp target
With `TARGET_INCLUDE_DIRECTORIES` the `assimp` target can directly used in another CMake project, e.g. assimp can be used in a submodule with an `add_subdirectory()` call.
2018-07-04 22:56:35 +02:00
CwTCwT 85b0026c92 issue_1973
added support for CustomData(Layer) to support multiple (texture) UV mappings
added unittest with sample model
2018-06-09 15:45:09 +02:00
Eugene Barnett 908ef3e44a 1740 Issue - Enabling and Disabling importers
-ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT will be respected by the macro
--using local variable ASSIMP_IMPORTER_ENABLED to include or exclude
--an importer
-Fixes individual importer ex: set(ASSIMP_BUILD_FBX_IMPORTER OFF)

-ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT is cached
--if assimp is a child cmake project, need to force cache
--from parent project
--ex: set(ASSIMP_BUILD_ALL_IMPORTERS_BY_DEFAULT CACHE INTERNAL FALSE)
2018-05-05 16:57:59 -04:00
Kim Kulling 4d662c42b3 Add check for SSE2-support. 2018-04-02 10:27:05 +02:00
Kim Kulling 4919d3da2f closes https://github.com/assimp/assimp/issues/1836: make documentation much more clear how to apply global scaling. 2018-03-30 16:58:11 +02:00
Cloud Wu cad11df039 Fix mingw compilation 2018-03-22 16:54:12 +08:00
Marco Di Benedetto 138b990d0a added missing install of pbrmaterial.h 2018-02-24 17:57:42 +01:00
Tommy 242b5d5874 Initial FBX Export Support, sponsored by MyDidimo (mydidimo.com).
Supports:
 * mesh data with normals and uvs
 * lambert and phong materials
 * file textures
 * bones / skeletons
 * skinning

Does not yet support:
 * animations
 * cameras
 * lights
 * embedded textures
2018-02-19 13:53:55 +01:00
Kim Kulling b049933d2f update license dates. 2018-01-28 19:42:05 +01:00
Christian Meurin 86fa0f4524
Merge branch 'master' into master 2018-01-15 19:10:14 -08:00
BuildTools 68db518696 Fix IFC branch merge conflict 2018-01-15 19:00:56 -08:00
Kim Kulling 03b43ee9c3
Merge branch 'master' into ifc_40 2018-01-13 14:40:50 +01:00
Kim Kulling cecab969c6 IFC: introduce new namespace fpr IFC-schema2x3 2018-01-13 10:27:45 +01:00
Kim Kulling 0fff3b1232
Merge branch 'master' into master 2018-01-08 15:36:03 +01:00
Alexis Breust 559bc38e5d Embedding images post-process 2018-01-08 09:26:52 +01:00
Christian Meurin 5ef13e7b38
Merge branch 'master' into master 2018-01-07 11:34:18 -08:00
BuildTools 66171de915 Successful lib build, unit testing still WIP 2018-01-05 16:18:33 -08:00
Kim Kulling c66c7d7ae6 remove ctest to make workspace more readable. 2018-01-03 17:22:07 +01:00
Kim Kulling 8e413ac1e3
Merge branch 'master' into export_3mf 2017-11-27 22:50:17 +01:00
Kim Kulling 3dfca3bc84 3MF: add export to a given archive. 2017-11-27 21:48:33 +01:00
Kim Kulling c22b4acd47 3MF: Export initial commit. 2017-11-20 22:36:17 +01:00
Mika Rautio 4fb5038fb1 Add support for building Mac OS X Framework bundles 2017-11-20 00:10:05 +02:00
Kim Kulling f49de6ecfe closes https://github.com/assimp/assimp/issues/1514: add postprocess step for scaling 2017-10-29 20:28:59 +01:00
Kim Kulling d139b4d180 Merge pull request #1423 from Matter-and-Form/feature/gltf2
glTF 2 Importer + glTF 2 Spec Conformity
2017-09-13 20:01:38 +02:00
Kim Kulling cbedc448c6 closes https://github.com/assimp/assimp/issues/1426: add Defines.h to include folder for install. 2017-09-12 18:59:38 +02:00
Daniel Hritzkiv 63d3655f1b
Duplicate gltfImporter as gltf2Importer; Include glTF2 importer in CMake List 2017-09-11 10:50:36 -04:00
Kim Kulling 44e2ba541f Merge pull request #1363 from jamesgk/gltf2
glTF2 export support
2017-07-29 15:08:52 +02:00