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

4274 Commits

Author SHA1 Message Date
Kim Kulling
61ea5a4ac6 Merge branch 'master' into collada_zae_textures_2710 2019-10-27 18:24:16 +01:00
Kim Kulling
120e97e55b Merge branch 'master' into assimp_version_2693 2019-10-27 13:47:59 +01:00
Kim Kulling
93d87c775d Merge branch 'master' into master 2019-10-27 09:00:47 +01:00
Kim Kulling
932acf4350 Merge branch 'master' into fix-gltf-importer-crash 2019-10-23 20:14:38 +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
c350d4f487 Update ColladaExporter.cpp 
Small review findings.
 2019-10-19 12:08:57 +02:00
TGE
075d05e604 Merge branch 'master' into fix_dae_export 2019-10-17 23:52:44 +02:00
RichardTea
51fc0f4ec4 Merge branch 'master' into assimp_version_2693 2019-10-16 10:00:50 +01: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
RichardTea
198bc428fa Fix some warnings in Collada import 2019-10-14 12:15:02 +01:00
RichardTea
6a6ccc0fb0 Rename ConvertPath() to UriDecodePath() 2019-10-14 11:27:34 +01:00
RichardTea
5e84889724 Merge branch 'master' into collada_zae_textures_2710 2019-10-14 10:56:53 +01:00
RichardTea
ce5c71d2e7 Collada ZAE import must convert manifest and image paths 
Moved ConvertPath into ColladaParser and use it when reading all filenames from the XML

Added more EXPECTS to the Collada tests
 2019-10-11 18:57:38 +01:00
RichardTea
059ee0e091 Update assimp legal and version 
Will now report the major and minor versions specified in cmakelists
 2019-10-11 16:28:14 +01: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
Malcolm Tyrrell
3b3e34c36a Fix one byte memory leak. 2019-10-08 15:15:16 +01:00
Malcolm Tyrrell
5a1276032e Add bound checks. 2019-10-08 12:51:08 +01:00
Fabrice Fontaine
32781a566d Fix FBXConverter: use proper 64-bit constant 
Use proper 64-bit constant for CONVERT_FBX_TIME(time) conversion, fixes:

  code/FBXConverter.cpp:2025: error: integer constant is too large for 'long' type
  code/FBXConverter.cpp:2026: error: integer constant is too large for 'long' type
  code/FBXConverter.cpp:2794: error: integer constant is too large for 'long' type
  code/FBXConverter.cpp:2868: error: integer constant is too large for 'long' type
  code/FBXConverter.cpp:2878: error: integer constant is too large for 'long' type
  code/FBXConverter.cpp:2888: error: integer constant is too large for 'long' type

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
[Retrieved from:
https://git.buildroot.net/buildroot/tree/package/assimp/0001-Fix-FBXConverter-use-proper-64-bit-constant.patch]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 2019-10-06 15:42:11 +02:00
Kim Kulling
78cfec41ec Merge branch 'master' into issue_2693 2019-10-06 11:11:22 +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
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
Theak
7a8b7ba88d aiAnimation::mTicksPerSecond for gltf2 imports - should always be 1000.0 2019-09-29 10:09:53 +01: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
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
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
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
Alan
17f55aa67e Merge branch 'master' into issue_2662 2019-09-24 02:20:47 +01:00
Kim Kulling
3b2e0ebfc7 Merge branch 'master' into issue_2661 2019-09-23 16:59:28 +02:00
Jennifer Buehler
aa47a028c8 Fix UV texture coords generation along Z Axis 2019-09-23 11:22:20 +02:00
Theak
61fa619f92 Fix: Mismatched new/free in gltf2 importer (fixes #2668) 2019-09-22 10:24:30 +01:00
Theak
720ac4846b Fix: memory leak in gltf2 importer (fixes #2661) 2019-09-22 10:12:19 +01:00
Theak
0e6478c0d4 Fix: Wrong aiAnimation::mTicksPerSecond for gltf2 imports (fixes #2662) 2019-09-22 09:59:58 +01:00
Kim Kulling
94c488d7ea fix compiler warnings. 2019-09-22 10:15:44 +02:00
Kim Kulling
ef54a00fc4 Use correct escape sequence for unsigned. 2019-09-22 09:12:37 +02:00
Kim Kulling
69087abc56 Ensure that the aiString lenght is 4 bytes independent which platform and add mingw back to appveyor. 2019-09-21 16:36:22 +02:00
ywang
a4092a3234 correct uvset index 2019-09-20 17:53:15 -07:00
escherstair
d4101bbf06 fix regression 2019-09-19 08:07:55 +02:00
escherstair
18bbfdac1a init variable 'base' in initializer list 2019-09-19 08:01:47 +02:00
Kim Kulling
4b9cc1a484 Merge branch 'master' into fix-codacy-issues 2019-09-18 20:32:49 +02:00
Bruno
dbf47f7769 fix issue #2551 2019-09-18 17:54:30 +02:00
escherstair
1abf6d50fe fixed regression #2 2019-09-18 08:31:33 +02:00
escherstair
2194577429 fix regression 2019-09-18 08:25:24 +02:00