Commit Graph

243 Commits

Author SHA1 Message Date
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
7557fdbb72 Fix install for builds with MSVC compiler and NMake.
The CMake variable "MSVC" and the related versioned variables indicate that the
Visual Studio compiler is used but when using that compiler and the "NMake
Makefiles JOM" build generator the files it tried to install weren't in the
expected Debug folder.
2017-07-29 07:45:25 -04:00
jamesgk
d7cbbaf23e Compile with glTF2 export option (currently same as glTF1 output) 2017-07-25 17:34:03 -07:00
Patrick Dähne
457dff1bf1 X3D importer: Implemented support for binary X3D files 2017-07-11 19:28:40 +02:00
Kim Kulling
afb2f3036e OpenDDLParser: latest greatest. 2017-06-25 13:21:36 +02:00
Kim Kulling
612ac234c5 SceneCombiner: move header for scenecombiner to public folder. 2017-06-21 14:21:16 +02:00
Kim Kulling
d7e13e67c4 Utf8: integrate new lib. 2017-06-17 19:38:47 +02:00
Kim Kulling
febf94f6aa Merge pull request #1212 from aoowweenn/umw_dev
MikuMikuDance Format
2017-05-17 12:01:46 +02:00
VennGrayDog
3d05df2d3e Fix location of config.h 2017-05-14 15:09:31 -04:00
Squareys
cfb867b5e7 Fix config.h not being found during install 2017-05-09 21:51:49 +02:00
Kim Kulling
a2b8d66a86 Update license info. 2017-05-09 19:57:36 +02:00
Helio Chissini de Castro
4a0171bd82 - Apply mechanism to decide use for IrrXML external or internal
Several distributions usually decide for shared external libraries
instead of an usual embedded, for security reasons, duplicatiion issues.
This change enable the possibility to set SYSTEM_IRRXML=ON for detect
and build against a system installed irrxml.
By default, the internal copy is compiled.

Changes on build:
- Added a FindIrrXML cmake module.
- Moved the source recipe for proper CMakeLists inside contrib directory
- Includes aren't path based anymore, using the provided INCLUDE_DIR
- Compiler option are grouped in a singled entry on main CMakeLists

Note: Current internal assimp irrXML is older than upstream irrlicht 1.8.4.
To enable usage of this version, code need to be patched.
2017-04-29 08:10:44 +02:00