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

6514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kim Kulling
2e443dc669 Merge branch 'master' into C4267 2018-10-07 20:31:41 +02:00
Kim Kulling
65c07613ea Merge pull request #2174 from Wasabi375/patch-1 
ReadFieldPtrVector should return true when successful
 2018-10-07 20:31:10 +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
Kim Kulling
3ac4494393 Merge pull request #2173 from Gargaj/patch-1 
Fix Blender FOV loading (fixes #1854)
 2018-10-07 18:16:16 +02:00
Gargaj
16bdac5c9e Merge branch 'master' into patch-1 2018-10-07 16:04:11 +02:00
Kim Kulling
07e22fd3fc Merge pull request #2171 from matt77hias/C4244 
Fix: C4244 conversion warning
 2018-10-07 15:56:53 +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
Kim Kulling
e45e4dc736 Merge pull request #2170 from matt77hias/patch-1 
Refactored "../Include/" includes
 2018-10-07 01:38:30 +02:00
Matthias Moulin
be9ed7a8d3 Merge branch 'master' into C4267 2018-10-06 22:17:56 +02:00
Matthias Moulin
0d14cdea2d Merge branch 'master' into C4244 2018-10-06 22:17:33 +02:00
Kim Kulling
5d58c3a0d5 Merge branch 'master' into patch-1 2018-10-06 21:38:06 +02:00
Kim Kulling
97cca1562a Merge pull request #2169 from assimp/kimkulling-patch-2 
Update Build.md
 2018-10-06 20:56:11 +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
716205fde0 Replaced "../Include/" include from irrXMLWrapper.h 2018-10-06 15:22:10 +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
Kim Kulling
f4b1d0bc3c Update Readme.md 
Add link to readme.
 2018-10-06 13:45:09 +02:00
Kim Kulling
a238c5c4b4 Update Build.md 
Prototype for build-doc.
 2018-10-06 13:18:14 +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