Commit Graph

4215 Commits

Author SHA1 Message Date
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
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
Mike Samsonov
873a358ce4 A crash in the aiMesh descructor 2019-09-05 11:44:02 +01:00
Ryan McCampbell
eb762e654e Removed WindowsStore checks 2019-09-03 23:13:44 -04:00
Ryan McCampbell
a16906686f Fixed type conversion warnings 2019-09-03 21:06:48 -04:00
Kim Kulling
50820e48b9 Merge branch 'master' into fix-codacy-issues 2019-09-03 21:54:59 +02:00
Ryan McCampbell
a8822a2b29 Cleaned up formatting in DefaultIOSystem.cpp 2019-09-03 11:18:01 -04:00
Ryan McCampbell
0685e415ad removed extra null character in Utf8ToWide and WideToUtf8 2019-09-03 11:18:01 -04:00
Ryan McCampbell
6c65b5b549 Cleaned up unicode code and removed fixed-size buffers 2019-09-03 11:18:01 -04:00
Ryan McCampbell
727cf0c49f Fixed unicode on windows 2019-09-03 11:18:01 -04:00
escherstair
ceacad237f prefer prefix ++/-- operators for non-primitive types 2019-09-03 08:00:12 +02:00
escherstair
33e71ee8df prefer prefix ++/-- operators for non-primitive types 2019-09-03 07:59:17 +02:00
escherstair
75993ad653 prefer prefix ++/-- operators for non-primitive types 2019-09-03 07:57:58 +02:00
escherstair
53d795c1c9 possible inefficient checking for 'tlist' emptiness 2019-09-03 07:57:08 +02:00
escherstair
ec1930478c prefer prefix ++/-- operators for non-primitive types 2019-09-03 07:56:37 +02:00
escherstair
c1d4ed7873 prefer prefix ++/-- operators for non-primitive types 2019-09-03 07:55:27 +02:00
Kim Kulling
0f18ec9e2c Merge branch 'master' into accessibleIsVerbose 2019-09-02 20:47:04 +02:00
Kim Kulling
b34f9839f1 Merge branch 'master' into fix-missing-scale-data 2019-08-31 12:42:40 +02:00
Malcolm Tyrrell
01d0f06d3a Make IsVerbose accessible outside the exporter 2019-08-30 11:42:23 +01:00
escherstair
de51122639 fix regression 2019-08-29 12:09:56 +02:00
escherstair
2d0d2374c1 fix ColladaLoader::findMesh() declaration 2019-08-29 12:00:44 +02:00
escherstair
89079ead12 prefer prefix ++/-- operators for non-primitive types 2019-08-29 11:44:41 +02:00
escherstair
946d64282b fix inefficient checking for 'url' emptiness 2019-08-29 10:58:01 +02:00