Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,783 Commits 19 Branches 43 Tags
bugfix/fix_copyrights_in_python
Commit Graph

6877 Commits

Author SHA1 Message Date
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
Kim Kulling
619e09fbec Stepfile: separate generated code. 2018-10-06 08:45:55 +02:00
Kim Kulling
106b139ef3 Stepfile: renaming first generated code. 2018-10-05 19:42:26 +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
35374e777b Merge branch 'step-import' of https://github.com/assimp/assimp into step-import 2018-09-28 18:02:54 +02:00
Kim Kulling
3249409243 Some minor findings. 2018-09-28 18:02:49 +02:00
kimkulling
4003309e7a StepFile: prepare code gen. 2018-09-28 17:06:03 +02:00
kkulling
e38629613c Merge branch 'master' into step-import 2018-09-28 15:59:27 +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
Kim Kulling
29496d877e Merge branch 'master' into master 2018-09-17 19:58:11 +02:00
Kim Kulling
6ee9b07c49 closes https://github.com/assimp/assimp/issues/212: introduce unittest for line-splitter, will validate that the current behaviour is correct. 2018-09-16 17:13:34 +02:00
Kim Kulling
4e357d1ff4 Merge branch 'master' into master 2018-09-13 20:04:41 +02:00
Paul Arden
7911faf130 Fixed problem getting glTF 2.0 camera type, fixes #2138. 2018-09-13 16:04:04 +10:00
Kim Kulling
4f7bacd108 Collada: some reformatting + minor findings. 2018-09-11 20:01:16 +02:00
FRICOTEAUX
d5de32ec1c FBX import: fix import of direct data by vertices + unify node renaming 2018-09-11 16:07:43 +02:00
Kim Kulling
c1ed5e0048 Merge branch 'master' into assbin_test 2018-09-11 11:14:50 +02:00
Kim Kulling
afd47d5ab6 Update AssbinLoader.cpp 
Fix memory leak,
 2018-09-11 09:12:28 +02:00
Kim Kulling
081365df48 Introduce simple export test for assbin. 2018-09-10 22:42:24 +02:00
Turo Lamminen
c3d8464a37 Remove aiCreateAndRegisterDefaultMaterial, it's completely wrong 2018-09-10 16:41:12 +03:00
Kim Kulling
c25a2dfc22 Assbin: add unittest. 2018-09-08 19:15:56 +02:00
Kim Kulling
1c577f66f7 Collada-Exporter: fix some minor findings. 2018-09-07 19:14:52 +02:00
Daniel Löber
2ee09b2528 Correct 3MF displaycolor import 2018-09-05 16:23:47 +02:00