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

7725 Commits (85bde1122d8ec8adf44b2787778f9c7e2861f3f1)

Author SHA1 Message Date
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
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 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
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
escherstair 128602f29b
fixed fatal error 2019-10-07 10:12:40 +02:00
escherstair 97e060c428
added CMAKE_GENERATOR_PLATFORM 2019-10-07 09:34:02 +02:00
Kim Kulling ecd413c86c
Update utVersion.cpp 
Fix the unittests as well.
 2019-10-06 20:19:59 +02:00
Kim Kulling c443092c44
Merge branch 'master' into add_VS2013_VS2019 2019-10-06 11:12:15 +02:00
Kim Kulling 78cfec41ec
Merge branch 'master' into issue_2693 2019-10-06 11:11:22 +02:00
Kim Kulling d2476e9cda
Merge pull request #2675 from vcebollada/gltf_mesh_morph_animations 
gltf2.0 importer - Support for mesh morph animations added.
 2019-10-06 09:08:24 +02:00
Engin Manap afec2e2c49
Fix #2693 aiGetVersionMajor return wrong version 
The 2 constants MinorVersion and MajorVersion are updated for 5.0
 2019-10-05 19:23:02 +02:00
Chris Weermann (TGE) 38153748ab ColladaExporter: use actual mesh names when available 2019-10-02 19:18:48 +02:00
escherstair f2a70ad10c
remove VS2013 build 2019-10-02 10:43:06 +02:00
escherstair d0e8f5ca32
add cmake generators for VS2013 and VS2019 2019-10-02 10:30:50 +02:00
escherstair 19fddb0861
Merge branch 'master' into add_VS2013_VS2019 2019-10-02 10:24:52 +02:00
escherstair 9c326e6989
Add AppVeyor build VS2013 and VS2019 2019-10-02 10:21:56 +02:00
Chris Weermann (TGE) c08a78f7c6 ColladaExporter: improve name/id handling 2019-10-02 01:32:53 +02:00
vcebollada 6550b1df61
Merge branch 'master' into gltf_mesh_morph_animations 2019-10-01 08:04:46 +01:00
Kim Kulling 09d80ff478
Merge pull request #2666 from theakman2/issue_2662 
Fix: Wrong aiAnimation::mTicksPerSecond for gltf2 imports (fixes #2662)
 2019-09-30 23:10:24 +02:00
Kim Kulling ec74f6603b
Merge branch 'master' into issue_2662 2019-09-30 22:10:45 +02:00
vcebollada 42ff3f1633
Merge branch 'master' into gltf_mesh_morph_animations 2019-09-30 13:38:33 +01:00
Kim Kulling c480b65291
Merge pull request #2680 from grdowns/vcpkg-instructions 
Add vcpkg installation instructions
 2019-09-29 14:36:18 +02:00
Theak 7a8b7ba88d aiAnimation::mTicksPerSecond for gltf2 imports - should always be 1000.0 2019-09-29 10:09:53 +01:00
grdowns 8101bc6a77 Add vcpkg installation instructions 2019-09-26 17:46:26 -07:00
vcebollada 5018af995b
Merge branch 'master' into gltf_mesh_morph_animations 2019-09-26 11:33:33 +01:00
Kim Kulling 2757297b4f
Merge branch 'master' into issue_2662 2019-09-26 09:55:16 +02:00
Kim Kulling 0e85872951
Merge pull request #2663 from thomasbiang/fix-multi-uvset-coord 
fix issue textureCoords are messed up for multiple uvset
 2019-09-26 08:55:47 +02:00
Dániel Molnár ae3236f481 Support Apple naming conventions - shared library 2019-09-25 18:03:26 +02:00