Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,520 Commits 19 Branches 43 Tags
d166e1fd73cbfca5bdd3f23f11d78c2a0cc63721
Commit Graph

3683 Commits

Author SHA1 Message Date
Kim Kulling
d166e1fd73 Merge branch 'master' into Manage_PCloud_in_Filters 2018-10-09 11:56:39 +02:00
Kim Kulling
27c9461aad Update SplitLargeMeshes.cpp 
Fix typo.
 2018-10-09 11:56:30 +02:00
Kim Kulling
1c672f4c9d Update SplitLargeMeshes.cpp 
Fix clang compile error ( unneeded enum parhesis ) and fix some minor findings.
 2018-10-08 21:06:48 +02:00
Kim Kulling
2e443dc669 Merge branch 'master' into C4267 2018-10-07 20:31:41 +02:00
Burkhard Mittelbach
afbdb043b0 ReadFieldPtrVector should return true when successful 2018-10-07 19:11:34 +02:00
Kim Kulling
4c5c172ee2 Merge branch 'master' into C4267 2018-10-07 18:16:44 +02:00
Gargaj
16bdac5c9e Merge branch 'master' into patch-1 2018-10-07 16:04:11 +02:00
Gargaj
6af016d149 Fix Blender FOV loading 2018-10-07 15:34:44 +02:00
Kim Kulling
c355412348 Merge branch 'master' into C4244 2018-10-07 14:29:39 +02:00
Matthias Moulin
c90eda983d Fix: C4267 2018-10-06 16:31:58 +02:00
Matthias Moulin
b4425d8e36 Fix: C4267 2018-10-06 16:30:38 +02:00
Matthias Moulin
e7da1c634d Fix: C4244 conversion warning 2018-10-06 16:28:10 +02:00
Matthias Moulin
239c59d715 Fixed include: IFCReaderGen_4 instead of IFCReaderGen4 2018-10-06 16:12:58 +02:00
Matthias Moulin
88c173a6f4 Replaced "../Include/" include from glTFAsset.h 2018-10-06 15:20:28 +02:00
Matthias Moulin
47fcbfd369 Replaced "../Include/" include from glTF2Asset.h 2018-10-06 15:19:56 +02:00
Matthias Moulin
7061493ead Replaced "../Include/" include from HMPFileData.h 2018-10-06 15:16:40 +02:00
Matthias Moulin
d7bcd58174 Replaced "../Include/" include from MD4FileData.h 2018-10-06 15:15:43 +02:00
Matthias Moulin
8bb4b57d1d Replaced "../Include/" include from HMPFileData.h 2018-10-06 15:11:47 +02:00
Matthias Moulin
91a805a082 Update HalfLifeFileData.h 2018-10-06 15:05:18 +02:00
Matthias Moulin
463a7e8016 Replaced "../Include/" include from MD3FileData.h 2018-10-06 15:02:58 +02:00
Matthias Moulin
99fc989af7 Replaced "../Include/" include from MDLFileData.h 2018-10-06 15:01:42 +02:00
Matthias Moulin
d9a7ed19a8 Replaced "../Include/" include from 3DSHelper.h 2018-10-06 14:59:20 +02:00
Matthias Moulin
531f30302f Replaced "../Include/" include from 3DSHelper.h 2018-10-06 14:58:06 +02:00
Matthias Moulin
d4b0cd53ea Replaced "../Include/" include from FBXDocumentUtil.h 2018-10-06 14:55:20 +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
50a95ad0f2 Merge branch 'master' into migenius-rsws52 2018-09-27 01:04:44 +02:00
Kim Kulling
2dc572167c Merge branch 'master' into issue_2154 2018-09-26 22:13:29 +02:00
Kim Kulling
35a727a3e4 closes https://github.com/assimp/assimp/issues/2154: remove redundant file from source folder. 2018-09-26 21:37:02 +02:00
Kim Kulling
74db0e906b Fix some minor findings. 2018-09-26 21:19:40 +02:00
Kim Kulling
ea0f074933 Merge branch 'kimmi_dev' of https://github.com/assimp/assimp into kimmi_dev 2018-09-26 20:53:37 +02:00
Kim Kulling
9c8e6f2127 Fix overflow by face allocation. 2018-09-26 20:52:59 +02:00
Kim Kulling
5d091c4591 Merge branch 'master' into kimmi_dev 2018-09-26 19:15:58 +02:00
ardenpm
586c812eee Merge pull request #5 from assimp/master 
Merge commits from head master.
 2018-09-26 15:44:41 +10:00
Kim Kulling
07362fdd35 Merge branch 'kimmi_dev' of https://github.com/assimp/assimp into kimmi_dev 2018-09-25 20:16:28 +02:00
Kim Kulling
6146ff818c Enable coveralls for export tests. 2018-09-25 20:15:48 +02:00
Alexandre Avenel
504e5fd5c5 Use unique_ptr for gltf2 textures 2018-09-24 21:28:53 +02:00
Kim Kulling
72aa49c54f Merge branch 'master' into kimmi_dev 2018-09-22 15:52:22 +02:00
Kim Kulling
9f6238f3af INtroduce unittests. 2018-09-22 15:50:40 +02:00
Kim Kulling
56392cc02f Update MMDPmxParser.cpp 
Fix encoding for readstrings.
 2018-09-22 12:50:23 +02:00
Kim Kulling
d42f9a3226 Update MMDImporter.cpp 
Reformattings
 2018-09-22 12:46:38 +02:00
Kim Kulling
02c4b7f1bc Merge branch 'master' into umw_dev 2018-09-22 10:24:09 +02:00
Kim Kulling
cc0b3e1249 Merge branch 'master' into fix_gltf2_export_componentType_error 2018-09-22 07:54:10 +02:00
Kim Kulling
24b42274fb Update MDCFileData.h 
Fix build by remove not supported initializer for array.
 2018-09-21 20:13:35 +02:00
Kim Kulling
3a38c2c067 Update MDLFileData.h 
Remove not supported array initialization.
 2018-09-21 19:43:19 +02:00
Kim Kulling
e129d88825 Update ASEParser.h 
Fix not supported array initialization.
 2018-09-21 19:26:41 +02:00
Kim Kulling
2017e50e7b Update AMFImporter_Node.hpp 
Fix invalid array initialization.
 2018-09-21 18:59:47 +02:00
kimkulling
f75bf6d99c MAke noexcept compiler-specific. 2018-09-21 16:25:27 +02:00
kimkulling
f818a909e5 Fix static-code-analysis findings. 2018-09-21 16:07:09 +02:00
arkeon7
6cea62142c Merge branch 'master' into Manage_PCloud_in_Filters 2018-09-20 10:34:55 +02:00
Arkeon
9eeaf19eab Allow findDegenerate and SplitLargeMesh to pass point clouds models. 
Otherwise the model is removed or crash
 2018-09-20 10:31:32 +02:00