Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,753 Commits 19 Branches 43 Tags
93efe4197aff5f46358545dd6b890ca454e8bfcd
Commit Graph

7753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
RevoluPowered
93efe4197a Removed redundant rest matrix and fixed assert compile error 2019-10-27 14:16:39 +00:00
RevoluPowered
6ea97a1282 Updated test cases to test import of names 
This now doesn't overwrite names anymore as this would cause nasty bugs application side.

We can now support these by default without having to handle them as edge cases.
 2019-10-27 14:16:39 +00:00
RevoluPowered
168ae22ad4 Implemented easy armature lookup 
This lets you directly retrieve the node a bone links to and informs you of the armature directly

This also fixes a bug with bone name being made unique which causes them to become not 1:1 what the modeller has imported.
 2019-10-27 14:16:39 +00:00
Kim Kulling
29f7ea0235 Merge pull request #2698 from Zalewa/mingw-fix-2685 
Fix #2685 - library compiled by MinGW is unusable in MinGW.
 2019-10-27 13:47:24 +01:00
Kim Kulling
b8321925c3 Merge branch 'master' into mingw-fix-2685 2019-10-27 10:43:00 +01:00
Kim Kulling
e63123de75 Merge pull request #2697 from ffontaine/master 
Fix FBXConverter: use proper 64-bit constant
 2019-10-27 10:42:33 +01:00
Kim Kulling
93d87c775d Merge branch 'master' into master 2019-10-27 09:00:47 +01:00
Kim Kulling
3bfd06483e Merge pull request #2723 from assimp/kimkulling-patch-1 
Update appveyor.yml
 2019-10-25 17:15:09 +02:00
Kim Kulling
7abc551b47 Merge branch 'master' into kimkulling-patch-1 2019-10-24 20:22:32 +02:00
Kim Kulling
41ab019cbf Update appveyor.yml 
Add missing cmake build target.
 2019-10-23 22:42:19 +02:00
Kim Kulling
bd25cc7c8f Merge pull request #2704 from MalcolmTyrrell/fix-gltf-importer-crash 
Fix gltf importer crash
 2019-10-23 22:39:12 +02:00
Kim Kulling
932acf4350 Merge branch 'master' into fix-gltf-importer-crash 2019-10-23 20:14:38 +02:00
Kim Kulling
31e885a47a Update appveyor.yml 
Reenable VS2013
 2019-10-22 20:24:23 +02:00
Kim Kulling
85bde1122d Merge pull request #2715 from migenius/migenius-fix-vs2013-build 
fix vs2013 build
 2019-10-22 20:23:22 +02:00
Kim Kulling
df3e22d9ba Merge branch 'master' into migenius-fix-vs2013-build 2019-10-21 20:57:29 +02:00
Malcolm Tyrrell
9bc2648615 Merge branch 'master' into fix-gltf-importer-crash 2019-10-21 15:29:18 +01:00
Kim Kulling
3a484d879f Merge pull request #2722 from jherico/patch-1 
Fix CMake import
 2019-10-20 15:15:08 +02:00
Kim Kulling
effdb74a87 Merge branch 'master' into patch-1 2019-10-19 20:54:17 +02:00
Kim Kulling
1dd532d61b Merge pull request #2690 from TGEnigma/fix_dae_export 
ColladaExporter: improve name/id handling
 2019-10-19 20:52:57 +02:00
Kim Kulling
c350d4f487 Update ColladaExporter.cpp 
Small review findings.
 2019-10-19 12:08:57 +02:00
Bradley Austin Davis
fa1dc3b8f1 Fix CMake import 
Using CMake 3.15 & Visual Studio 2019 to build on windows produced a cmake configuration which was unable to be used by clients.  Investigating this I was eventually able to determine this was caused by a mismatch in the target properties.  Specifically, it was setting the TYPE property to STATIC_LIBRARY even though it was building as a SHARED_LIBRARY.  

This in turn was because the if clause on line `if(@BUILD_SHARED_LIBS@)` of this file was evaluating to `if (ON)` which was then not properly evaluated while under the CMake 2.6 policy.  Explicitly setting the `CMP0012` policy to NEW fixes the problem.
 2019-10-18 13:02:32 -07:00
TGE
075d05e604 Merge branch 'master' into fix_dae_export 2019-10-17 23:52:44 +02:00
Paul Arden
e6a051d953 Fix compilation on VS2013 due to compiler bug with brace initialisers. This fixes issue #2678. 2019-10-16 19:06:57 +11:00
ardenpm
8a4c35598e Merge pull request #8 from assimp/master 
Update from upstream master
 2019-10-16 15:22:33 +11:00
Kim Kulling
d3ddf8de60 Merge branch 'master' into mingw-fix-2685 2019-10-12 11:24:33 +02:00
Kim Kulling
799fd74714 Merge pull request #2708 from assimp/cleanup_headers 
Cleanup headers
 2019-10-11 20:34:54 +02:00
Kim Kulling
3c3549a07a Merge branch 'master' into cleanup_headers 2019-10-11 14:25:00 +02:00
Kim Kulling
14f8877a2c Merge pull request #2677 from mdinim/master 
Support Apple naming conventions - shared library
 2019-10-11 13:44:43 +02:00
kimkulling
3f38011e86 Fix filter for vs for public headers. 2019-10-11 13:41:13 +02:00
kimkulling
33af183bb8 Cleanup the public headers. 2019-10-11 13:27:36 +02:00
kkulling
789a2bdd36 Move stuff into def.h 2019-10-11 09:47:31 +02:00
Kim Kulling
f03f744dfc Merge branch 'master' into master 2019-10-10 15:59:12 +02:00
Kim Kulling
3a6648734c Merge pull request #2699 from feniksa/master 
Findassimp.cmake: add hint for lib search path for Linux
 2019-10-09 14:54:07 +02:00
Kim Kulling
2102f7e79c Merge branch 'master' into master 2019-10-09 11:51:16 +02:00
Kim Kulling
927276f1e8 Merge pull request #2706 from assimp/enginmanap-issue_2693 
Enginmanap issue 2693
 2019-10-09 11:50:07 +02:00
Kim Kulling
1c3f734cd6 Merge branch 'master' into issue_2693 2019-10-08 20:25:58 +02:00
Malcolm Tyrrell
3b3e34c36a Fix one byte memory leak. 2019-10-08 15:15:16 +01:00
Malcolm Tyrrell
f8bdb77de1 Remove unneeded file 2019-10-08 14:27:00 +01:00
Malcolm Tyrrell
4cde72b4e6 Add unit tests. 2019-10-08 13:05:05 +01:00
Malcolm Tyrrell
5f8f5c3292 Organize test models better. 2019-10-08 12:51:31 +01:00
Malcolm Tyrrell
5a1276032e Add bound checks. 2019-10-08 12:51:08 +01:00
Malcolm Tyrrell
ce4cb39302 Make example minimal. 2019-10-08 11:46:07 +01:00
Malcolm Tyrrell
8498310fa0 A gltf v2 which exercises all the options. 2019-10-08 11:35:03 +01:00
Malcolm Tyrrell
77ebc53f1f Offset nodes. 2019-10-08 10:44:17 +01:00
Malcolm Tyrrell
1e7d1ffbc2 Add non-indexed unit test. 2019-10-08 10:34:08 +01:00
Maksym Sditanov
63a047119f Findassimp.cmake: add hint for include path's for Linux 
By default, Linux distro installs assimp into /usr/include/assimp

In case of this commit, fix hint path to include default path

Signed-off-by: Maksym Sditanov <msditanov@200volts.com>
 2019-10-07 22:09:44 +03:00
Kim Kulling
ed5d38b975 Merge branch 'master' into master 2019-10-07 20:49:47 +02:00
Maksym Sditanov
b8006cb4c9 Findassimp.cmake: add hint for lib search path for Linux 
Add /usr/lib64 and /usr/lib directory hints to cmake module

libassimp.so library installs in /usr/lib for 32bit or
in /usr/lib64 for 64bit distros.

All linux distros apply custom patch to extend cmake HINTs to
systems /usr/lib and /usr/lib64
(see https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/assimp/files/findassimp-3.3.1.patch)

Signed-off-by: Maksym Sditanov <msditanov@200volts.com>
 2019-10-07 21:41:38 +03:00
Kim Kulling
165b36c1fc Merge pull request #2692 from escherstair/add_VS2013_VS2019 
Add AppVeyor build VS2019
 2019-10-07 15:09:12 +02:00
escherstair
c63f5b2f9e removed unused lines 2019-10-07 11:38:45 +02:00