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

4336 Commits (fdd76a6d0bfaaafbc2390939c791ab0af162956f)

Author SHA1 Message Date
RevoluPowered 212bcfe75c Test disable cache 2019-10-27 14:16:39 +00:00
RevoluPowered 9c8d835704 Explicitly use nullptr 2019-10-27 14:16:39 +00:00
RevoluPowered 5d0c63391b Explicitly set the size of the parent node if we have no children 2019-10-27 14:16:39 +00:00
RevoluPowered a30936954e Best to check the number of children before checking the actual array 2019-10-27 14:16:39 +00:00
RevoluPowered 514257f587 Added unit tests for ArmaturePopulate when used (added huestos model to tests) 
Added clear documentation for this too to explain, you need to enable it to make it available

Signed-off-by: RevoluPowered <gordon@gordonite.tech>
 2019-10-27 14:16:39 +00:00
RevoluPowered 46cdd81d75 Added ArmaturePopulate scale process for all formats 2019-10-27 14:16:39 +00:00
RevoluPowered 93efe4197a Removed redundant rest matrix and fixed assert compile error 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 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
Raphael Dümig 2d086fd236 ColladaParser: fix handling of empty XML-elements 2019-10-25 15:23:13 +02:00
Rem 5f58ef82b9 prevent accidental lower casing material names in ReplaceDefaultMaterial 2019-10-25 10:18:27 +03:00
Paul Arden cbd4e8bc22 Fix inconsistent indentation in previous commit. 2019-10-25 12:19:28 +11:00
Paul Arden 822be33408 Move pbrSG glossinessFactor into the correct material extension object. Fixes issue #2724. 2019-10-25 12:17:43 +11: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
Paul Arden 9aa9238e7e Copy texture data before handing on to asset which then handles freeing of the memory. This prevents the memory being released twice which was throwing an error. Fixes issue #2714. 2019-10-18 14:40:41 +11: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
escherstair a5859dd3f4
Merge branch 'master' into fix-codacy-issues 2019-09-18 08:19:44 +02:00
escherstair c0ec5140ee
init variable in initializer list 2019-09-18 08:18:52 +02:00
escherstair 6d4854f12c
init variable in initializer list 2019-09-18 08:15:50 +02:00
escherstair 116dcce0ba
init member in itilializer list 2019-09-18 08:04:46 +02:00
Kim Kulling f7da7d8f67
Merge branch 'master' into kimkullig_dev 2019-09-17 22:01:29 +02:00
Kim Kulling 2edcf82f5a add missing include. 2019-09-17 21:58:46 +02:00
Kim Kulling 8b95479bb0 closes https://github.com/assimp/assimp/issues/2598: introduce getEpsilon 2019-09-15 19:25:37 +02:00
PascalGilbraith 7f7918957a
Issue 2603 
Normal face indices added to end of already resized vector, so normal faces did not match position faces.
Use vector index rather than push.
 2019-09-15 13:05:04 +01:00
Kim Kulling 2be0eba1ab put one in comments because the file seems to be corrupt. 2019-09-14 19:32:47 +02:00
Kim Kulling 79056da4be closes https://github.com/assimp/assimp/issues/2613 : merge glTF2 patch. 2019-09-14 09:12:08 +02:00
Kim Kulling a1254f067e
closes https://github.com/assimp/assimp/issues/2627 - fix typo 
Remove code from ai_assert test, will be removed in release versions.
 2019-09-13 12:05:29 +02:00
Kim Kulling 3bd63c006f Merge branch 'gltf_add_ortho_cam' of https://github.com/assimp/assimp into gltf_add_ortho_cam 2019-09-12 20:27:53 +02:00
Kim Kulling a25a1f0772 fix the build. 2019-09-12 20:27:35 +02:00
Kim Kulling f10bd72100
Merge branch 'master' into gltf_add_ortho_cam 2019-09-12 00:30:06 +02:00
Kim Kulling f9c6fed190 Add a camera unittest. 2019-09-11 22:34:53 +02:00
Kim Kulling f67c18d41a introduce inline helper. 2019-09-11 22:21:20 +02:00
kimkulling 7ff7a5d64e glTF: Try to remove duplicate code. 2019-09-11 17:00:39 +02:00
escherstair 0307327999
Merge branch 'master' into fix-codacy-issues 2019-09-11 10:06:16 +02:00
Kim Kulling 28d0300dbe
Merge branch 'master' into gltf_add_ortho_cam 2019-09-11 09:32:14 +02:00
Kim Kulling d91eebf347 Add ortho camera. 2019-09-10 22:13:54 +02:00
escherstair b9cff2a019
prefer prefix ++/-- operators for non-primitive types 2019-09-10 07:54:07 +02:00
escherstair db55ba4908
possible inefficient checking for 'tlist' emptiness 2019-09-09 15:00:28 +02:00
RevoluPowered ddc26e1c46 Added maya stingray support for textures 2019-09-08 19:15:27 +01:00
RevoluPowered da97f1be79 Implemented basic PBR materials into assimp. 
This adds the following texture types:
- BASE_COLOR
- NORMAL_CAMERA
- EMISSION_COLOR
- METALNESS
- DIFFUSE_ROUGHNESS

This is the first small change required.
We only support maya right now.
 2019-09-08 19:15:27 +01:00
Kim Kulling ad2dd2dc18
Merge branch 'master' into fix-codacy-issues 2019-09-08 12:08:01 +02:00
Kim Kulling 5d8482dae6
Merge branch 'master' into master 2019-09-07 18:53:26 +02:00
Kim Kulling f8bcd7cb40
Merge branch 'master' into thomasbiang-fix_issue_joinIdenticalVertices_notNeeded 2019-09-07 10:02:20 +02:00
Kim Kulling 336ae0e55a Merge branch 'fix_issue_joinIdenticalVertices_notNeeded' of https://github.com/thomasbiang/assimp into thomasbiang-fix_issue_joinIdenticalVertices_notNeeded 2019-09-07 09:58:07 +02:00
Kim Kulling 3546403284
Merge branch 'master' into crash_in_ai_mesh_desctuctor 2019-09-06 20:45:16 +02:00
escherstair 570b3838c9
Merge branch 'master' into fix-codacy-issues 2019-09-06 13:20:00 +02:00
escherstair 91706a1f6e
prefer prefix ++/-- operators for non-primitive types 2019-09-06 11:29:52 +02:00
escherstair d177c722b1
prefer prefix ++/-- operators for non-primitive types 2019-09-06 11:28:38 +02:00
escherstair eb8479a95e
possible inefficient checking for 'tlist' emptiness 2019-09-06 11:19:27 +02:00
Kim Kulling 6661e7047a
Merge branch 'master' into unicode_fix 2019-09-06 08:59:21 +02:00
RumbleballTheReal 22bd047db5
Added VertexColors to FBX exporter (one channel) 
Works properly with Blender (custom importer) and UnrealEngine (Official SDK)
 2019-09-05 23:44:54 +02:00
Mike Samsonov b271091c64 fix division by zero 2019-09-05 11:44:02 +01:00
Mike Samsonov 4029fe5e46 alloc-dealloc-mismatch 2019-09-05 11:44:02 +01:00
Mike Samsonov 9adc4e87fa alloc-dealloc-mismatch 2019-09-05 11:44:02 +01:00