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

7717 Commits (d3ddf8de6034700e6b09a5c272548789c5626de3)

Author SHA1 Message Date
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
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
Robikz 6ac8279977 assimpTargets.cmake: define add_library() with lib type directly 
Instead of using if(ON)/if(OFF) to determine which of the "hardcoded"
add_library(... SHARED ...)  or (... STATIC ...) should be used,
specify a new BUILD_LIB_TYPE variable that is set directly to either
SHARED or STATIC and substituted in the `add_library()` statement
when assimpTargets.cmake.in is configured.

This removes a CMP0012 collision with prior `cmake_policy(VERSION 2.6)`
statement and makes the CMP0012 warning not appear in users' projects.
This problem is mentioned in issue #2685.
 2019-10-06 19:03:13 +02:00
Robikz 0761530e17 Set proper sharedLibraryName for MinGW in installed assimpTargets-*.cmake 
The shared library name for MinGW is the .a library with which we need to
link the built binary. This problem is described in issue #2685.
 2019-10-06 19:03:00 +02:00
Robikz 81d125a2cc dllexport ASSIMP_API in all Windows compilers, not just MSVC 
This fixes a problem mentioned in issue #2685 where the libassimp.dll
compiled with MinGW doesn't export any symbols.
 2019-10-06 19:02:41 +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
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
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
vcebollada 8ca39ade6a
Merge branch 'master' into gltf_mesh_morph_animations 2019-09-25 16:16:32 +01:00
Kim Kulling 6e75d7a839
Merge branch 'master' into fix-multi-uvset-coord 2019-09-25 16:57:24 +02:00
Kim Kulling a75fc4563a
Merge pull request #2669 from theakman2/issue_2668 
Fix: Mismatched new/free in gltf2 importer (fixes #2668)
 2019-09-25 16:56:52 +02:00
Victor Cebollada e0fee3d87b gltf2.0 importer - Support for mesh morph animations added. 
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
 2019-09-25 09:58:23 +01:00
Kim Kulling 12a101124a
Merge branch 'master' into issue_2668 2019-09-24 19:29:40 +02:00
Kim Kulling 2d2889f73f
Merge pull request #2667 from theakman2/issue_2661 
Fix: memory leak in gltf2 importer (fixes #2661)
 2019-09-24 19:28:59 +02:00
Alan b8e53c967f
Merge branch 'master' into issue_2668 2019-09-24 02:21:59 +01:00
Alan d3a79d0cc2
Merge branch 'master' into issue_2661 2019-09-24 02:21:19 +01:00