v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,483 Commits
74 Branches
37 Tags
234 MiB
Commit Graph

6483 Commits (d4b0cd53ea9cfe20bb809c2bf440ea5f98597f14)

Author SHA1 Message Date
Matthias Moulin d4b0cd53ea
Replaced "../Include/" include from FBXDocumentUtil.h 2018-10-06 14:55:20 +02:00
Kim Kulling 85b9e36c2d
Merge pull request #2168 from assimp/issue_2067 
closes https://github.com/assimp/assimp/issues/2067: introduce /bigo…
 2018-10-06 08:34:58 +02:00
Kim Kulling d1f7472242
Update CMakeLists.txt 2018-10-05 21:28:07 +02:00
Kim Kulling 3cf5fbb945
Update CMakeLists.txt 
Fix the switches.
 2018-10-05 20:45:41 +02:00
Kim Kulling f588568c53 closes https://github.com/assimp/assimp/issues/2067: introduce /bigobj compiler flag 2018-10-05 20:20:16 +02:00
Kim Kulling e6b9c8e2a6
Merge pull request #2167 from Starnick/patch-1 
Update AssimpNet redirect
 2018-10-05 19:59:06 +02:00
Nicholas Woodfield dfc38b5e9a
Update AssimpNet redirect 
After the exchange on twitter, I noticed that this readme never actually had a link pointing to the bitbucket repository that I maintain (originally the googlecode one, and then a fork of the googlecode one I didn't know about).

This is very confusing for people who report issues, and I would like them to make sure they can report on a tracker that I keep tabs on.
 2018-10-05 11:34:03 -04:00
Kim Kulling 5ebf81ad3c
Merge pull request #2161 from dormon/master 
Improved cmake configs for Windows and Linux.
 2018-10-04 19:42:53 +02:00
Kim Kulling aab796bc1c
Merge branch 'master' into master 2018-10-02 01:13:13 +02:00
Kim Kulling 382f5fde5f
Merge pull request #2162 from gongminmin/IgnoreHash 
Add IGNORE_GIT_HASH.
 2018-10-02 01:12:30 +02:00
Minmin Gong 4bd57f7577 Add IGNORE_GIT_HASH. 2018-09-30 19:25:43 -07: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 bf347b82ed
Merge pull request #2158 from migenius/migenius-rsws52 
Merge fix to prevent errors when orthographic cameras encountered in glTF 2.0
 2018-09-27 18:18:27 +02:00
Kim Kulling 50a95ad0f2
Merge branch 'master' into migenius-rsws52 2018-09-27 01:04:44 +02:00
Kim Kulling 6f260a4ed5
Merge pull request #2159 from assimp/issue_2154 
closes https://github.com/assimp/assimp/issues/2154: remove redundant…
 2018-09-27 00:01:44 +02:00
Kim Kulling 2dc572167c
Merge branch 'master' into issue_2154 2018-09-26 22:13:29 +02:00
Kim Kulling 4bb410d1d8
Merge pull request #2153 from assimp/kimmi_dev 
INtroduce unittests.
 2018-09-26 22:06:02 +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
Kim Kulling 18879c0952
Merge pull request #2155 from aavenel/Fix2079 
Fix #2079 Memory leak
 2018-09-25 17:42:58 +02:00
Alexandre Avenel 504e5fd5c5 Use unique_ptr for gltf2 textures 2018-09-24 21:28:53 +02:00
Alexandre Avenel 673885a6d3 Add unit test for gltf2 export to obj 2018-09-24 19:10:54 +02:00
Kim Kulling 7d36c12dc4
Merge pull request #2150 from vjf/pyassimp_export_blob 
Added interface to 'aiExportSceneToBlob()' for pyassimp
 2018-09-23 18:13:45 +02:00
Kim Kulling bae96d76a3
Merge branch 'master' into pyassimp_export_blob 2018-09-22 19:08:23 +02:00
Kim Kulling b7bb38247f
Merge pull request #2152 from aavenel/ExposeEmbedTexture 
Fix #2149 Add flag to embed textures in assimp_cmd
 2018-09-22 19:06:44 +02:00
Kim Kulling 08561f875f
Merge branch 'master' into ExposeEmbedTexture 2018-09-22 17:51:17 +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 7865f82082
Merge pull request #1863 from aoowweenn/umw_dev 
Some fixes for MMD PMX file
 2018-09-22 14:15:25 +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 0b77ebbb3e
Merge pull request #1925 from wuxq/fix_gltf2_export_componentType_error 
multi joint has bug  with ReplaceData
 2018-09-22 10:22:45 +02:00
Kim Kulling cc0b3e1249
Merge branch 'master' into fix_gltf2_export_componentType_error 2018-09-22 07:54:10 +02:00
Alexandre Avenel b3e858956a Fix #2149 Add flag to embed textures in assimp_cmd 2018-09-21 22:17:12 +02:00
Kim Kulling d585030310
Merge pull request #2151 from assimp/kimmi_dev 
Kimmi dev
 2018-09-21 21:37:52 +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
Kim Kulling abfc8fd048
Update texture.h 
Fix array init for older compilers.
 2018-09-21 18:51:45 +02:00
Kim Kulling 662f7086e3
Update types.h 
Fix VS2013: array initialization does not work.
 2018-09-21 18:46:30 +02:00
kimkulling f75bf6d99c MAke noexcept compiler-specific. 2018-09-21 16:25:27 +02:00
kimkulling bf1c002b5d Add missing file. 2018-09-21 16:09:24 +02:00